aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
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 /wiretap
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 'wiretap')
-rw-r--r--wiretap/Makefile.am9
1 files changed, 2 insertions, 7 deletions
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 3be75a7545..d716817767 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -24,8 +24,7 @@ include $(top_srcdir)/Makefile.am.inc
ACLOCAL_AMFLAGS = `../aclocal-flags`
-AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) -DWS_BUILD_DLL $(GLIB_CFLAGS) \
- $(ZLIB_CFLAGS)
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) -DWS_BUILD_DLL $(GLIB_CFLAGS)
noinst_LTLIBRARIES = libwiretap_generated.la
lib_LTLIBRARIES = libwiretap.la
@@ -64,11 +63,7 @@ EXTRA_DIST = \
$(GENERATOR_FILES) \
$(GENERATED_FILES)
-libwiretap_la_LIBADD = \
- libwiretap_generated.la \
- ${top_builddir}/wsutil/libwsutil.la \
- $(GLIB_LIBS) \
- $(ZLIB_LIBS)
+libwiretap_la_LIBADD = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS)
libwiretap_la_DEPENDENCIES = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la