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 --- epan/dissectors/dcerpc/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'epan/dissectors/dcerpc') diff --git a/epan/dissectors/dcerpc/Makefile.am b/epan/dissectors/dcerpc/Makefile.am index 2333c4bb09..a15169a8f7 100644 --- a/epan/dissectors/dcerpc/Makefile.am +++ b/epan/dissectors/dcerpc/Makefile.am @@ -20,6 +20,8 @@ include $(top_srcdir)/Makefile.am.inc +AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS) + EXTRA_DIST = \ CMakeLists.txt \ Makefile.inc \ @@ -47,7 +49,7 @@ bin_PROGRAMS = idl2wrs idl2wrs_SOURCES = idl2wrs.c -idl2wrs_LDADD = @GLIB_LIBS@ +idl2wrs_LDADD = $(GLIB_LIBS) # # Editor modelines - https://www.wireshark.org/tools/modelines.html -- cgit v1.2.1