From d7006cebbb5eea34aea8f5fd3470b7f4265d0625 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sat, 5 Dec 2015 17:12:50 +0000 Subject: Revert "Build Flex-generated files with "warnings are errors"." This reverts commit b56f53884be3bab935058b2bbbb4da0b8bbbe7f6. Sadly, we *do* get warnings at this point with older versions of Flex, such as the one on the 32-bit OS X buildbot. Change-Id: I9aec1a16e9f2e1bbcfaac3dffdabdd89af5815e3 Reviewed-on: https://code.wireshark.org/review/12443 Reviewed-by: Guy Harris --- wiretap/Makefile.am | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'wiretap/Makefile.am') diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index 071c7c393f..51af38caa3 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -25,14 +25,15 @@ 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_CFLAGS =-DWS_BUILD_DLL +AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL if HAVE_WARNINGS_AS_ERRORS -AM_CFLAGS += -Werror +AM_NON_GENERATED_CFLAGS += -Werror endif AM_CPPFLAGS = -I$(srcdir)/.. @@ -40,17 +41,25 @@ 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) \ - $(GENERATED_C_FILES) \ - $(GENERATED_HEADER_FILES) + $(NONGENERATED_C_FILES) \ + $(NONGENERATED_HEADER_FILES) +libwiretap_la_CFLAGS = $(AM_NON_GENERATED_CFLAGS) + +libwiretap_generated_la_SOURCES = \ + $(GENERATED_C_FILES) EXTRA_DIST = \ README.airmagnet \ @@ -60,8 +69,8 @@ EXTRA_DIST = \ $(GENERATOR_FILES) \ $(GENERATED_FILES) -libwiretap_la_LIBADD = ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS) -libwiretap_la_DEPENDENCIES = ${top_builddir}/wsutil/libwsutil.la +libwiretap_la_LIBADD = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS) +libwiretap_la_DEPENDENCIES = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la RUNLEX = $(top_srcdir)/tools/runlex.sh -- cgit v1.2.1