From a2371bd6c937e5c3d282849aeb3fba96db1ca356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Thu, 3 Mar 2016 07:14:34 +0000 Subject: Revert "autotools: Use explicit zlib dependency build flags" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2bded0b66137a2f1c8b69911d91903a24f8a2624. Change-Id: Ic898c65df4daaa395eb010e0286d97509346d43a Reviewed-on: https://code.wireshark.org/review/14318 Reviewed-by: João Valverde --- wiretap/Makefile.am | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'wiretap') 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 -- cgit v1.2.3