diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-12-05 01:49:22 -0800 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-12-05 12:08:52 +0000 |
| commit | b56f53884be3bab935058b2bbbb4da0b8bbbe7f6 (patch) | |
| tree | a03a91e0be6188dad8ce6b436f68ac94207dd57f /wiretap/Makefile.am | |
| parent | 4d337f421389e901bf1d4246f9ecb2f7b363aef0 (diff) | |
| download | wireshark-b56f53884be3bab935058b2bbbb4da0b8bbbe7f6.tar.gz | |
Build Flex-generated files with "warnings are errors".
We shouldn't be getting warnings at this point.
Change-Id: I363a48546cb8d916425f42962ae1697d52ed9a29
Reviewed-on: https://code.wireshark.org/review/12436
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'wiretap/Makefile.am')
| -rw-r--r-- | wiretap/Makefile.am | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index 51af38caa3..071c7c393f 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -25,15 +25,14 @@ ACLOCAL_AMFLAGS = `../aclocal-flags` include Makefile.common -noinst_LTLIBRARIES = libwiretap_generated.la lib_LTLIBRARIES = libwiretap.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html libwiretap_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ -AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL +AM_CFLAGS =-DWS_BUILD_DLL if HAVE_WARNINGS_AS_ERRORS -AM_NON_GENERATED_CFLAGS += -Werror +AM_CFLAGS += -Werror endif AM_CPPFLAGS = -I$(srcdir)/.. @@ -41,25 +40,17 @@ AM_CPPFLAGS = -I$(srcdir)/.. CLEANFILES = \ libwiretap.a \ libwiretap.la \ - libwiretap_generated.a \ - libwiretap_generated.la \ *~ MAINTAINERCLEANFILES = \ $(GENERATED_FILES) \ Makefile.in -#Since code generated by lex may trigger gcc warnings, we are now generating two -#libraries. A single library is generated with the lex code without the barrier -#"stop on warning". An other library is generated from the remaining source -#files with the "stop on warning" barrier. libwiretap_la_SOURCES = \ - $(NONGENERATED_C_FILES) \ - $(NONGENERATED_HEADER_FILES) -libwiretap_la_CFLAGS = $(AM_NON_GENERATED_CFLAGS) - -libwiretap_generated_la_SOURCES = \ - $(GENERATED_C_FILES) + $(NONGENERATED_C_FILES) \ + $(NONGENERATED_HEADER_FILES) \ + $(GENERATED_C_FILES) \ + $(GENERATED_HEADER_FILES) EXTRA_DIST = \ README.airmagnet \ @@ -69,8 +60,8 @@ EXTRA_DIST = \ $(GENERATOR_FILES) \ $(GENERATED_FILES) -libwiretap_la_LIBADD = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS) -libwiretap_la_DEPENDENCIES = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la +libwiretap_la_LIBADD = ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS) +libwiretap_la_DEPENDENCIES = ${top_builddir}/wsutil/libwsutil.la RUNLEX = $(top_srcdir)/tools/runlex.sh |