summaryrefslogtreecommitdiff
path: root/epan/Makefile.am
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2006-04-23 18:50:58 +0000
committerGuy Harris <guy@alum.mit.edu>2006-04-23 18:50:58 +0000
commit9b639bacaad3e2745a8e14cd9eaf31b5199f7a81 (patch)
tree2f454e679dbe6242ae63585b6303dbfc568746ac /epan/Makefile.am
parent8dd0e707229bc30abdcd3e89bcc1f089ea8cd41c (diff)
downloadwireshark-9b639bacaad3e2745a8e14cd9eaf31b5199f7a81.tar.gz
From Diego Petteno: link the shared libethereal against the ADNS
library. If that's not done, it leaves to ethereal or other binaries using it the job of linking adns within them. This behaviour is unreliable and breaks when using the --as-needed flag for GNU ld (version 2.16 or better 2.17). svn path=/trunk/; revision=17969
Diffstat (limited to 'epan/Makefile.am')
-rw-r--r--epan/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am
index 5b0ba0cb0e..8a15c7edb1 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -84,7 +84,7 @@ MAINTAINERCLEANFILES = \
#
# Add the object files for missing routines, if any.
#
-libethereal_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la
+libethereal_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la @ADNS_LIBS@
libethereal_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la
tvbtest: tvbtest.o tvbuff.o except.o strutil.o