osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Use -Werror except for explicitly listed dirty dissectors. 

Use AM_CFLAGS for everything except for libdirtydissectors in
epan/dissectors.  Rename GENERATED_CFLAGS/GENERATED_CXXFLAGS to
DIRTY_CFLAGS/DIRTY_CXXFLAGS, as it doesn't apply to all generated files.

Change-Id: I702b53e185d6972c08d68ef31c05df7b03669daa
Reviewed-on: https://code.wireshark.org/review/25829
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2018-02-16 17:22:23 -08:00
parent 0ac5c797fe
commit 5f0d50690a
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am.inc
View File

@ -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)

2
epan/dfilter/Makefile.am
View File

@ -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) \

2
epan/dissectors/Makefile.am
View File

@ -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)

2
plugins/epan/mate/Makefile.am
View File

@ -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)

2
plugins/epan/wimaxasncp/Makefile.am
View File

@ -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)

2
ui/Makefile.am
View File

@ -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) \

2
wiretap/Makefile.am
View File

@ -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