osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

cleanup: move extra libs to EPAN_EXTRA_LIBS 

Every program linking with epan lib added some extra dependencies.
Keep these in EPAN_EXTRA_LIBS.

Change-Id: I3fac0974ef6a46675d35ee7b9862674923369b67
Reviewed-on: https://code.wireshark.org/review/18356
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Jakub Zawadzki 2016-10-21 18:43:06 +02:00 committed by Anders Broman
parent 28bbd56591
commit ce9405b00b
1 changed files with 16 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Makefile.am
View File

@ -440,6 +440,14 @@ else
EXTRALINKFLAGS = -export-dynamic
endif
EPAN_EXTRA_LIBS = \
@SSL_LIBS@ \
@C_ARES_LIBS@ \
@KRB5_LIBS@ \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@
# Libraries and plugin flags with which to link wireshark.
#
# GTK_CFLAGS/GTK_LIBS is a strict superset of GLIB_CFLAGS/GLIB_LIBS
@ -454,17 +462,12 @@ wireshark_common_ldadd = \
wiretap/libwiretap.la \
epan/libwireshark.la \
wsutil/libwsutil.la \
@SSL_LIBS@ \
$(plugin_ldadd) \
@PCAP_LIBS@ \
@C_ARES_LIBS@ \
@KRB5_LIBS@ \
@APPLICATIONSERVICES_FRAMEWORKS@ \
@SYSTEMCONFIGURATION_FRAMEWORKS@ \
@COREFOUNDATION_FRAMEWORKS@ \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@ \
$(EPAN_EXTRA_LIBS) \
@LIBNL_LIBS@
if HAVE_Qt
@ -519,17 +522,12 @@ tshark_LDADD = \
wiretap/libwiretap.la \
epan/libwireshark.la \
wsutil/libwsutil.la \
@SSL_LIBS@ \
$(plugin_ldadd) \
@GLIB_LIBS@ \
@PCAP_LIBS@ \
@C_ARES_LIBS@ \
@KRB5_LIBS@ \
${EPAN_EXTRA_LIBS} \
@SYSTEMCONFIGURATION_FRAMEWORKS@ \
@COREFOUNDATION_FRAMEWORKS@ \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@
@COREFOUNDATION_FRAMEWORKS@
tfshark_SOURCES = \
$(SHARK_COMMON_SRC) \
@ -547,15 +545,12 @@ tfshark_LDADD = \
wiretap/libwiretap.la \
epan/libwireshark.la \
wsutil/libwsutil.la \
@SSL_LIBS@ \
$(plugin_ldadd) \
@GLIB_LIBS@ \
@PCAP_LIBS@ \
@KRB5_LIBS@ \
${EPAN_EXTRA_LIBS} \
@SYSTEMCONFIGURATION_FRAMEWORKS@ \
@COREFOUNDATION_FRAMEWORKS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@
@COREFOUNDATION_FRAMEWORKS@
rawshark_SOURCES = \
$(SHARK_COMMON_SRC) \
@ -573,17 +568,12 @@ rawshark_LDADD = \
wiretap/libwiretap.la \
epan/libwireshark.la \
wsutil/libwsutil.la \
@SSL_LIBS@ \
$(plugin_ldadd) \
@GLIB_LIBS@ \
@PCAP_LIBS@ \
@C_ARES_LIBS@ \
@KRB5_LIBS@ \
${EPAN_EXTRA_LIBS} \
@SYSTEMCONFIGURATION_FRAMEWORKS@ \
@COREFOUNDATION_FRAMEWORKS@ \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@
@COREFOUNDATION_FRAMEWORKS@
text2pcap_SOURCES = \
text2pcap.c \
@ -691,15 +681,10 @@ dftest_LDADD = \
wiretap/libwiretap.la \
wsutil/libwsutil.la \
epan/libwireshark.la \
@SSL_LIBS@ \
$(plugin_ldadd) \
@GLIB_LIBS@ \
@PCAP_LIBS@ \
@C_ARES_LIBS@ \
@KRB5_LIBS@ \
@LIBGCRYPT_LIBS@ \
@LIBGNUTLS_LIBS@ \
@LIBSMI_LDFLAGS@
${EPAN_EXTRA_LIBS}
echld_test_SOURCES = \
echld_test.c \