aboutsummaryrefslogtreecommitdiffstats
path: root/epan/Makefile.am
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2018-02-17 00:10:43 -0800
committerMichael Mann <mmann78@netscape.net>2018-02-17 14:47:23 +0000
commit6be0444caf472125fd765107be5b04c6c50dc928 (patch)
tree67f89ad5441f395638d89cab80c4dc780b0ce073 /epan/Makefile.am
parent49e331c4cec96a1ca2637eed48f67553bc53a5b9 (diff)
Don't make separate libXXX_generated libraries.
We no longer use different compiler flags for generated and non-generated files, so we don't need to put them into separate libraries and then add the files from the generated library into the main library. Change-Id: Idbd35510ccb8c9107b4de4199c8b1bcaa6f7a060 Reviewed-on: https://code.wireshark.org/review/25831 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/Makefile.am')
-rw-r--r--epan/Makefile.am32
1 files changed, 10 insertions, 22 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am
index 7732d1554f..a6629c0246 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -34,10 +34,9 @@ AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) \
$(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) $(LIBGEOIP_CFLAGS) \
$(LZ4_CFLAGS) $(KRB5_CFLAGS) $(SNAPPY_CFLAGS) $(LIBXML2_CFLAGS)
-noinst_LTLIBRARIES = libwireshark_generated.la
lib_LTLIBRARIES = libwireshark.la
-LIBWIRESHARK_SRC = \
+LIBWIRESHARK_NONGENERATED_SRC = \
addr_and_mask.c \
addr_resolv.c \
address_types.c \
@@ -156,8 +155,8 @@ LIBWIRESHARK_GENERATED_SRC = \
$(LIBWIRESHARK_GENERATED_C_FILES) \
$(NODIST_LIBWIRESHARK_GENERATED_C_FILES)
-LIBWIRESHARK_ALL_SRC = \
- $(LIBWIRESHARK_SRC) \
+LIBWIRESHARK_SRC = \
+ $(LIBWIRESHARK_NONGENERATED_SRC) \
$(LIBWIRESHARK_GENERATED_SRC)
LIBWIRESHARK_INCLUDES_PUBLIC = \
@@ -288,15 +287,16 @@ subpkgincludedir = $(pkgincludedir)/epan
subpkginclude_HEADERS = $(LIBWIRESHARK_INCLUDES_PUBLIC)
-#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.
libwireshark_la_SOURCES = \
- $(LIBWIRESHARK_SRC) \
+ $(LIBWIRESHARK_NONGENERATED_SRC) \
+ $(LIBWIRESHARK_GENERATED_C_FILES) \
$(LIBWIRESHARK_INCLUDES_PRIVATE) \
version_info.c
+nodist_libwireshark_la_SOURCES = \
+ $(NODIST_LIBWIRESHARK_GENERATED_C_FILES) \
+ $(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES)
+
libwireshark_la_CPPFLAGS = $(AM_CPPFLAGS) -DWS_BUILD_DLL
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
@@ -310,7 +310,6 @@ endif
# Add the object files for missing routines, if any.
#
libwireshark_la_LIBADD = \
- libwireshark_generated.la \
crypt/libairpdcap.la \
ftypes/libftypes.la \
dfilter/libdfilter.la \
@@ -334,7 +333,6 @@ libwireshark_la_LIBADD = \
@GLIB_LIBS@
libwireshark_la_DEPENDENCIES = \
- libwireshark_generated.la \
crypt/libairpdcap.la \
ftypes/libftypes.la \
dfilter/libdfilter.la \
@@ -345,16 +343,6 @@ libwireshark_la_DEPENDENCIES = \
${top_builddir}/wsutil/libwsutil.la \
${top_builddir}/wiretap/libwiretap.la
-libwireshark_generated_la_SOURCES = \
- $(LIBWIRESHARK_GENERATED_C_FILES) \
- $(LIBWIRESHARK_GENERATED_HEADER_FILES)
-
-nodist_libwireshark_generated_la_SOURCES = \
- $(NODIST_LIBWIRESHARK_GENERATED_C_FILES) \
- $(NODIST_LIBWIRESHARK_GENERATED_HEADER_FILES)
-
-libwireshark_generated_la_CFLAGS = $(AM_CFLAGS)
-
EXTRA_DIST = \
.editorconfig \
diam_dict.l \
@@ -445,4 +433,4 @@ endif
checkapi:
$(AM_V_GEN)$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g termoutput -build \
-sourcedir=$(srcdir) \
- $(LIBWIRESHARK_SRC)
+ $(LIBWIRESHARK_NONGENERATED_SRC)