diff options
| -rw-r--r-- | Makefile.am.inc | 4 | ||||
| -rw-r--r-- | epan/dfilter/Makefile.am | 2 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/epan/mate/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/epan/wimaxasncp/Makefile.am | 2 | ||||
| -rw-r--r-- | ui/Makefile.am | 2 | ||||
| -rw-r--r-- | wiretap/Makefile.am | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am.inc b/Makefile.am.inc index 8561380e81..eaec6ddf1c 100644 --- a/Makefile.am.inc +++ b/Makefile.am.inc @@ -33,11 +33,11 @@ INCLUDEDIRS = -I$(top_srcdir) AM_CFLAGS = $(WERROR) $(WS_CFLAGS) -GENERATED_CFLAGS = $(WS_CFLAGS) +DIRTY_CFLAGS = $(WS_CFLAGS) AM_CXXFLAGS = $(WERROR) $(WS_CXXFLAGS) -GENERATED_CXXFLAGS = $(WS_CXXFLAGS) +DIRTY_CXXFLAGS = $(WS_CXXFLAGS) AM_LDFLAGS = $(WS_LDFLAGS) diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am index b3880f3f3b..4afe4da7d2 100644 --- a/epan/dfilter/Makefile.am +++ b/epan/dfilter/Makefile.am @@ -120,7 +120,7 @@ libdfilter_generated_la_SOURCES = \ $(GENERATED_C_FILES) \ $(GENERATED_HEADER_FILES) -libdfilter_generated_la_CFLAGS = $(GENERATED_CFLAGS) +libdfilter_generated_la_CFLAGS = $(AM_CFLAGS) nodist_libdfilter_generated_la_SOURCES = \ $(NODIST_GENERATED_C_FILES) \ diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am index a6aecd496a..9fdc8097e0 100644 --- a/epan/dissectors/Makefile.am +++ b/epan/dissectors/Makefile.am @@ -1897,7 +1897,7 @@ libdirtydissectors_la_SOURCES = \ $(DIRTY_ASN1_DISSECTOR_SRC) \ $(DIRTY_CORBA_IDL_DISSECTOR_SRC) -libdirtydissectors_la_CFLAGS = $(GENERATED_CFLAGS) +libdirtydissectors_la_CFLAGS = $(DIRTY_CFLAGS) libfiledissectors_la_SOURCES = \ $(FILE_DISSECTOR_SRC) diff --git a/plugins/epan/mate/Makefile.am b/plugins/epan/mate/Makefile.am index 786d4a5d65..b8953c85fb 100644 --- a/plugins/epan/mate/Makefile.am +++ b/plugins/epan/mate/Makefile.am @@ -89,7 +89,7 @@ nodist_mate_la_SOURCES = \ mate_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) -mate_la_CFLAGS = $(GENERATED_CFLAGS) $(PLUGIN_CFLAGS) +mate_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) mate_la_LDFLAGS = $(PLUGIN_LDFLAGS) diff --git a/plugins/epan/wimaxasncp/Makefile.am b/plugins/epan/wimaxasncp/Makefile.am index 4443b15883..ffb745cd69 100644 --- a/plugins/epan/wimaxasncp/Makefile.am +++ b/plugins/epan/wimaxasncp/Makefile.am @@ -74,7 +74,7 @@ nodist_wimaxasncp_la_SOURCES = \ wimaxasncp_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) -wimaxasncp_la_CFLAGS = $(GENERATED_CFLAGS) $(PLUGIN_CFLAGS) +wimaxasncp_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) wimaxasncp_la_LDFLAGS = $(PLUGIN_LDFLAGS) diff --git a/ui/Makefile.am b/ui/Makefile.am index c273d59aad..7b52e815c0 100644 --- a/ui/Makefile.am +++ b/ui/Makefile.am @@ -153,7 +153,7 @@ libui_a_SOURCES = \ libui_generated_a_SOURCES = $(GENERATED_FILES) -libui_generated_a_CFLAGS = $(GENERATED_CFLAGS) +libui_generated_a_CFLAGS = $(AM_CFLAGS) EXTRA_DIST = \ $(GENERATOR_FILES) \ diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index 71be63a3f8..9051991674 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -201,7 +201,7 @@ libwiretap_la_DEPENDENCIES = libwiretap_generated.la ${top_builddir}/wsutil/libw libwiretap_generated_la_SOURCES = \ $(GENERATED_C_FILES) -libwiretap_generated_la_CFLAGS = $(GENERATED_CFLAGS) +libwiretap_generated_la_CFLAGS = $(AM_CFLAGS) subpkgincludedir = $(pkgincludedir)/wiretap |