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 --- plugins/m2m/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'plugins/m2m') diff --git a/plugins/m2m/Makefile.am b/plugins/m2m/Makefile.am index e60b5f41f4..9299675484 100644 --- a/plugins/m2m/Makefile.am +++ b/plugins/m2m/Makefile.am @@ -32,6 +32,10 @@ m2m_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) +m2m_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) + +m2m_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) + m2m_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ -- cgit v1.2.1