From f0fb79d534c4276d30838bb25fc624e3eabce83c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Fri, 19 Feb 2016 08:20:35 +0000 Subject: autotools: Use pkg-config autoconf macros for GLib/GTK MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove mostly obsolete aclocal macros. Make GTK build flags a strict superset of GLib flags. Use GTK build variables for GTK GUI and GLib elsewhere. Add dependency flags explicitly instead of using WS_CPPFLAGS. Some minor improvements and fixes for missing/unnecessary variables (no impact on our test builds). Change-Id: I3e1f067a875f79d6516c1fa7af986f17a7a6b671 Reviewed-on: https://code.wireshark.org/review/14005 Reviewed-by: João Valverde --- wsutil/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'wsutil') diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index f718f42d5e..8711c108e6 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -23,11 +23,12 @@ include $(top_srcdir)/Makefile.am.inc ACLOCAL_AMFLAGS = `../aclocal-flags` -AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) -DWS_BUILD_DLL \ +AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) -DWS_BUILD_DLL \ -DTOP_SRCDIR=\"$(abs_top_srcdir)\" \ -DDATAFILE_DIR=\"$(pkgdatadir)\" \ -DEXTCAP_DIR=\"$(extcapdir)\" \ - -DPLUGIN_INSTALL_DIR=\"$(plugindir)\" + -DPLUGIN_INSTALL_DIR=\"$(plugindir)\" \ + $(GLIB_CFLAGS) $(LIBGCRYPT_CFLAGS) # Optional headers for ABI checking wsutil_optional_abi_includes = -- cgit v1.2.3