From 952cbd7902acda684fc2c6c06e17d54af5ecb225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Mayer?= Date: Fri, 7 Aug 2009 18:47:56 +0000 Subject: [PATCH] * Tue May 26 2009 cmorve69@yahoo.es - made it compile with --as-needed This patch was taken from the opensuse wireshark.spec file. No thanks go to the author and the package maintainers of this package for not sending this upstream - it would have made it into 1.2.0. svn path=/trunk/; revision=29326 --- epan/Makefile.am | 4 +++- wiretap/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/epan/Makefile.am b/epan/Makefile.am index aa1d448552..68fbc1a7f6 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -141,6 +141,7 @@ libwireshark_la_LIBADD = \ dissectors/libdirtydissectors.la $(wslua_lib) $(wspython_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 = \ @@ -148,7 +149,8 @@ libwireshark_la_DEPENDENCIES = \ libwireshark_asmopt.la crc/libcrc.la crypt/libairpdcap.la \ ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \ dissectors/libdirtydissectors.la $(wslua_lib) $(wspython_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) diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index c431e6cc11..e025aeca6d 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -68,7 +68,7 @@ EXTRA_DIST = \ $(GENERATOR_FILES) \ $(GENERATED_FILES) -libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS) ${top_builddir}/wsutil/libwsutil.la +libwiretap_la_LIBADD = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS) RUNLEX = $(top_srcdir)/tools/runlex.sh