Skip to content

Commit

Permalink
Use -Werror except for explicitly listed dirty dissectors.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
guyharris committed Feb 17, 2018
1 parent 0ac5c79 commit 5f0d506
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Makefile.am.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion epan/dfilter/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down
2 changes: 1 addition & 1 deletion epan/dissectors/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion plugins/epan/mate/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion plugins/epan/wimaxasncp/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion ui/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down
2 changes: 1 addition & 1 deletion wiretap/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 5f0d506

Please sign in to comment.