diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-09-16 19:24:25 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-09-16 19:24:25 +0000 |
| commit | 98fd7b71dfc0b8e34862c57b77c30168907520d4 (patch) | |
| tree | 517ab2aaea19520c8b94a121617ceff2d3fab799 /wiretap/Makefile.am | |
| parent | d934f6786d943f2abe1b286d3c7fa3b70f6fd94f (diff) | |
| download | wireshark-98fd7b71dfc0b8e34862c57b77c30168907520d4.tar.gz wireshark-98fd7b71dfc0b8e34862c57b77c30168907520d4.tar.bz2 wireshark-98fd7b71dfc0b8e34862c57b77c30168907520d4.zip | |
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
Diffstat (limited to 'wiretap/Makefile.am')
| -rw-r--r-- | wiretap/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
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 |