* 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

diff --git a/epan/Makefile.am b/epan/Makefile.am
index aa1d448552eda289b5a9ca1ff5646874432efd8f..68fbc1a7f6e2446e2c0b3c49ca629a0ef416dde1 100644 (file)
--- 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 c431e6cc110f462c60673cf86bdd231ba5993380..e025aeca6d0c4b973e3f2927869e641171bae85c 100644 (file)
--- 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