aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorJoão Valverde <j@v6e.pt>2016-03-03 07:14:34 +0000
committerJoão Valverde <j@v6e.pt>2016-03-03 07:14:53 +0000
commita2371bd6c937e5c3d282849aeb3fba96db1ca356 (patch)
treed750f8c7e62cbff99dba888257baeba112f0ec4a /Makefile.am
parentbfe5e10043c5f31d8360b07bed543a26154eb01c (diff)
Revert "autotools: Use explicit zlib dependency build flags"
This reverts commit 2bded0b66137a2f1c8b69911d91903a24f8a2624. Change-Id: Ic898c65df4daaa395eb010e0286d97509346d43a Reviewed-on: https://code.wireshark.org/review/14318 Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am24
1 files changed, 8 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am
index 55088956df..c6a44a130c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -518,8 +518,7 @@ text2pcap_CFLAGS = $(GENERATED_CFLAGS)
# Libraries with which to link text2pcap.
text2pcap_LDADD = \
wsutil/libwsutil.la \
- @GLIB_LIBS@ \
- @ZLIB_LIBS@
+ @GLIB_LIBS@
mergecap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
@@ -527,8 +526,7 @@ mergecap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
mergecap_LDADD = \
wiretap/libwiretap.la \
wsutil/libwsutil.la \
- @GLIB_LIBS@ \
- @ZLIB_LIBS@
+ @GLIB_LIBS@
capinfos_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
@@ -537,8 +535,7 @@ capinfos_LDADD = \
wiretap/libwiretap.la \
wsutil/libwsutil.la \
@GLIB_LIBS@ \
- @LIBGCRYPT_LIBS@ \
- @ZLIB_LIBS@
+ @LIBGCRYPT_LIBS@
captype_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
@@ -546,8 +543,7 @@ captype_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
captype_LDADD = \
wiretap/libwiretap.la \
wsutil/libwsutil.la \
- @GLIB_LIBS@ \
- @ZLIB_LIBS@
+ @GLIB_LIBS@
editcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
@@ -555,8 +551,7 @@ editcap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
editcap_LDADD = \
wiretap/libwiretap.la \
wsutil/libwsutil.la \
- @GLIB_LIBS@ \
- @ZLIB_LIBS@
+ @GLIB_LIBS@
reordercap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
@@ -564,8 +559,7 @@ reordercap_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
reordercap_LDADD = \
wiretap/libwiretap.la \
wsutil/libwsutil.la \
- @GLIB_LIBS@ \
- @ZLIB_LIBS@
+ @GLIB_LIBS@
randpkt_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
@@ -579,8 +573,7 @@ randpkt_LDADD = \
@SOCKET_LIBS@ \
@NSL_LIBS@ \
@C_ARES_LIBS@ \
- @ADNS_LIBS@ \
- @ZLIB_LIBS@
+ @ADNS_LIBS@
dftest_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
@@ -637,8 +630,7 @@ dumpcap_LDADD = \
@SYSTEMCONFIGURATION_FRAMEWORKS@ \
@COREFOUNDATION_FRAMEWORKS@ \
@LIBCAP_LIBS@ \
- @LIBNL_LIBS@ \
- @ZLIB_LIBS@
+ @LIBNL_LIBS@
#
# Build the version string