SHA256
1
0
forked from pool/wireshark
wireshark/wireshark-1.2.0-asneeded.patch

32 lines
1.1 KiB
Diff

--- epan/Makefile.am
+++ epan/Makefile.am
@@ -130,6 +130,7 @@
dissectors/libdirtydissectors.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \
@C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \
@KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \
+ ${top_builddir}/wiretap/libwiretap.la @GLIB_LIBS@ \
${top_builddir}/wsutil/libwsutil.la -lm
libwireshark_la_DEPENDENCIES = \
@@ -137,7 +138,8 @@
libwireshark_asmopt.la crc/libcrc.la crypt/libairpdcap.la \
ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \
dissectors/libdirtydissectors.la $(wslua_lib) \
- ${top_builddir}/wsutil/libwsutil.la
+ ${top_builddir}/wsutil/libwsutil.la \
+ ${top_builddir}/wiretap/libwiretap.la
#EXTRA_PROGRAMS = reassemble_test
#reassemble_test_LDADD = $(GLIB_LIBS)
--- wiretap/Makefile.am
+++ wiretap/Makefile.am
@@ -68,7 +68,7 @@
$(GENERATOR_FILES) \
$(GENERATED_FILES)
-libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS) ${top_builddir}/wsutil/libwsutil.la
+libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS) ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS)
RUNLEX = $(top_srcdir)/tools/runlex.sh