diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2016-10-21 18:43:06 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-10-22 17:38:13 +0000 |
| commit | ce9405b00b0bc49fef5a21f984251a1e0065580b (patch) | |
| tree | 632cc1b69176a148de1cf2c4f9d0ccbdceb45e0a | |
| parent | 28bbd565917d59b20458e5de783096bc332c1965 (diff) | |
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>
| -rw-r--r-- | Makefile.am | 47 |
1 files changed, 16 insertions, 31 deletions
diff --git a/Makefile.am b/Makefile.am index a52bfc5e40..67f23ddbdf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 \ |