Link libwireshark and wiretap against libwsutil. That was the original intent

of adding libwsutil but somehow I missed it/got it wrong.  This should solve
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1677#c18

Also remove the _DEPENDENCIES lines in epan and wiretap (as was done in the
top-level Makefile in rev 25930) so that automake will automatically figure out
the dependencies for us.

Since the those 2 libraries now link against libwsutil, don't make every
executable link against the library.  (If this works I think we can
significantly trim the list of libraries the executables link against and just
let the libraries pull in what they need--which is, apparently, the point of
the --as-needed flag: http://www.gentoo.org/proj/en/qa/asneeded.xml ).

svn path=/trunk/; revision=26218

3 files changed, 4 insertions, 19 deletions

diff --git a/Makefile.am b/Makefile.am
index 29580b12a6..269ca471cf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -310,7 +310,6 @@ wireshark_LDADD = \
 	codecs/libcodec.a		\
 	wiretap/libwiretap.la		\
 	epan/libwireshark.la		\
-	wsutil/libwsutil.la		\
 	@INET_PTON_LO@			\
 	@INET_NTOP_LO@			\
 	@SSL_LIBS@ 			\
@@ -338,7 +337,6 @@ tshark_LDADD = \
 	$(wireshark_optional_objects)	\
 	wiretap/libwiretap.la		\
 	epan/libwireshark.la		\
-	wsutil/libwsutil.la		\
 	@INET_PTON_LO@			\
 	@INET_NTOP_LO@			\
 	@SSL_LIBS@			\
@@ -367,7 +365,6 @@ rawshark_LDADD = \
 	$(wireshark_optional_objects)	\
 	wiretap/libwiretap.la		\
 	epan/libwireshark.la		\
-	wsutil/libwsutil.la		\
 	@INET_PTON_LO@			\
 	@INET_NTOP_LO@			\
 	@SSL_LIBS@			\
@@ -393,31 +390,26 @@ text2pcap_optional_objects = @STRERROR_O@ @STRPTIME_O@
 text2pcap_LDADD = \
 	$(text2pcap_optional_objects)	\
 	wiretap/libwiretap.la		\
-	wsutil/libwsutil.la		\
 	@GLIB_LIBS@ -lm
 
 # Libraries with which to link mergecap.
 mergecap_LDADD = \
 	wiretap/libwiretap.la		\
-	wsutil/libwsutil.la		\
 	@GLIB_LIBS@
 
 # Libraries with which to link capinfos.
 capinfos_LDADD = \
 	wiretap/libwiretap.la		\
-	wsutil/libwsutil.la		\
 	@GLIB_LIBS@
 
 # Libraries with which to link editcap.
 editcap_LDADD = \
 	wiretap/libwiretap.la		\
-	wsutil/libwsutil.la		\
 	@GLIB_LIBS@
 
 # Libraries with which to link randpkt.
 randpkt_LDADD = \
 	wiretap/libwiretap.la		\
-	wsutil/libwsutil.la		\
 	@GLIB_LIBS@ -lm			\
 	@PCAP_LIBS@			\
 	@SOCKET_LIBS@			\
@@ -429,7 +421,6 @@ randpkt_LDADD = \
 dftest_LDADD = \
 	$(wireshark_optional_objects)	\
 	wiretap/libwiretap.la		\
-	wsutil/libwsutil.la		\
 	epan/libwireshark.la		\
 	@SSL_LIBS@			\
 	$(plugin_ldadd)			\
@@ -448,7 +439,6 @@ dftest_LDADD = \
 # Libraries with which to link dumpcap.
 dumpcap_LDADD = \
 	wiretap/libwiretap.la		\
-	wsutil/libwsutil.la		\
 	@INET_NTOP_LO@			\
 	@GLIB_LIBS@			\
 	@PCAP_LIBS@			\
diff --git a/epan/Makefile.am b/epan/Makefile.am
index e8cf6f0cab..2564f1faf8 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -127,13 +127,9 @@ libwireshark_la_LIBADD = \
 	libwireshark_asmopt.la crypt/libairpdcap.la ftypes/libftypes.la \
 	dfilter/libdfilter.la dissectors/libdissectors.la \
 	dissectors/libdirtydissectors.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \
-	@C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ @KRB5_LIBS@ \
-	@SSL_LIBS@ @LIBSMI_LDFLAGS@ -lm
-libwireshark_la_DEPENDENCIES = \
-	@INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la \
-	libwireshark_asmopt.la crypt/libairpdcap.la ftypes/libftypes.la \
-	dfilter/libdfilter.la dissectors/libdissectors.la \
-	dissectors/libdirtydissectors.la $(wslua_lib)
+	@C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \
+	@KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ \
+	${top_builddir}/wsutil/libwsutil.la -lm
 
 #EXTRA_PROGRAMS = reassemble_test
 #reassemble_test_LDADD = $(GLIB_LIBS)
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 07929cb17b..17ed580b1d 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -68,8 +68,7 @@ EXTRA_DIST = \
 	$(GENERATOR_FILES) 	\
 	$(GENERATED_FILES)
 
-libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS)
-libwiretap_la_DEPENDENCIES = libwiretap_generated.la
+libwiretap_la_LIBADD = libwiretap_generated.la $(GLIB_LIBS) ${top_builddir}/wsutil/libwsutil.la
 
 RUNLEX = $(top_srcdir)/tools/runlex.sh