diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-02-17 00:10:43 -0800 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2018-02-17 14:47:23 +0000 |
| commit | 6be0444caf472125fd765107be5b04c6c50dc928 (patch) | |
| tree | 67f89ad5441f395638d89cab80c4dc780b0ce073 /wiretap | |
| parent | 49e331c4cec96a1ca2637eed48f67553bc53a5b9 (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 'wiretap')
| -rw-r--r-- | wiretap/Makefile.am | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index 9051991674..1bf03c887b 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -24,7 +24,6 @@ include $(top_srcdir)/Makefile.am.inc AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) -DWS_BUILD_DLL $(GLIB_CFLAGS) \ $(PCAP_CFLAGS) -noinst_LTLIBRARIES = libwiretap_generated.la lib_LTLIBRARIES = libwiretap.la # C source files that are part of the Wiretap source; this includes only @@ -182,26 +181,18 @@ GENERATED_HEADER_FILES = \ # All the generated files. GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES) -#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) \ version_info.c # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html libwiretap_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ -libwiretap_la_LIBADD = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS) +libwiretap_la_LIBADD = ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS) -libwiretap_la_DEPENDENCIES = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la - -libwiretap_generated_la_SOURCES = \ - $(GENERATED_C_FILES) - -libwiretap_generated_la_CFLAGS = $(AM_CFLAGS) +libwiretap_la_DEPENDENCIES = ${top_builddir}/wsutil/libwsutil.la subpkgincludedir = $(pkgincludedir)/wiretap |