diff options
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 |