autotools: Use pkg-config autoconf macros for GLib/GTK

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 <j@v6e.pt>

10 files changed, 28 insertions, 11 deletions

diff --git a/epan/Makefile.am b/epan/Makefile.am
index f61866b67c..fa0d5edc7f 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -40,8 +40,10 @@ DIST_SUBDIRS = $(SUBDIRS) $(wslua_dist_dir)
 
 ACLOCAL_AMFLAGS = `../aclocal-flags`
 
-AM_CPPFLAGS += -I$(builddir)/wslua $(LUA_CFLAGS) $(LIBGNUTLS_CFLAGS) \
-	$(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) $(LIBGEOIP_CFLAGS) $(KRB5_CFLAGS)
+AM_CPPFLAGS = $(INCLUDEDIRS) -I$(builddir)/wslua $(WS_CPPFLAGS) \
+	$(GLIB_CFLAGS) $(LUA_CFLAGS) $(LIBGNUTLS_CFLAGS) \
+	$(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS) $(LIBGEOIP_CFLAGS) \
+	$(KRB5_CFLAGS)
 
 noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la
 lib_LTLIBRARIES = libwireshark.la
@@ -55,11 +57,13 @@ libwireshark_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
 libwireshark_la_SOURCES = \
 	$(LIBWIRESHARK_SRC)	\
 	$(LIBWIRESHARK_INCLUDES)
+
 libwireshark_la_CPPFLAGS = $(AM_CPPFLAGS) -DWS_BUILD_DLL
 
 libwireshark_generated_la_SOURCES = \
 	$(LIBWIRESHARK_GENERATED_C_FILES) \
 	$(LIBWIRESHARK_GENERATED_HEADER_FILES)
+
 libwireshark_generated_la_CFLAGS = $(GENERATED_CFLAGS)
 
 nodist_libwireshark_generated_la_SOURCES = \
diff --git a/epan/compress/Makefile.am b/epan/compress/Makefile.am
index 967334e826..f0d8b84e9e 100644
--- a/epan/compress/Makefile.am
+++ b/epan/compress/Makefile.am
@@ -22,6 +22,8 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS)
+
 noinst_LTLIBRARIES = liblzxpress.la
 
 CLEANFILES = \
diff --git a/epan/crypt/Makefile.am b/epan/crypt/Makefile.am
index ad0bad3803..c8da5b7c03 100644
--- a/epan/crypt/Makefile.am
+++ b/epan/crypt/Makefile.am
@@ -22,6 +22,8 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS)
+
 noinst_LTLIBRARIES = libairpdcap.la
 
 CLEANFILES = \
diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am
index 9d54e2f973..e364c2429d 100644
--- a/epan/dfilter/Makefile.am
+++ b/epan/dfilter/Makefile.am
@@ -22,7 +22,8 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
-AM_CPPFLAGS += -I$(top_srcdir)/epan -I$(lemon_srcdir)
+AM_CPPFLAGS = $(INCLUDEDIRS) -I$(top_srcdir)/epan -I$(lemon_srcdir) \
+	$(WS_CPPFLAGS) $(GLIB_CFLAGS)
 
 noinst_LTLIBRARIES = libdfilter_generated.la libdfilter.la
 
@@ -54,6 +55,7 @@ libdfilter_la_SOURCES = $(NONGENERATED_C_FILES) $(NONGENERATED_HEADER_FILES)
 libdfilter_generated_la_SOURCES = \
 	$(GENERATED_C_FILES)	\
 	$(GENERATED_HEADER_FILES)
+
 libdfilter_generated_la_CFLAGS = $(GENERATED_CFLAGS)
 
 nodist_libdfilter_generated_la_SOURCES = \
@@ -61,6 +63,7 @@ nodist_libdfilter_generated_la_SOURCES = \
 	$(NODIST_GENERATED_HEADER_FILES)
 
 libdfilter_la_LIBADD = libdfilter_generated.la
+
 libdfilter_la_DEPENDENCIES = libdfilter_generated.la
 
 EXTRA_DIST = \
diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am
index 964d0f350d..9538d33d05 100644
--- a/epan/dissectors/Makefile.am
+++ b/epan/dissectors/Makefile.am
@@ -21,13 +21,15 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
-AM_CPPFLAGS += -I$(top_srcdir)/epan $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS)
+AM_CPPFLAGS = $(INCLUDEDIRS) -I$(top_srcdir)/epan $(WS_CPPFLAGS) \
+	$(GLIB_CFLAGS) $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS)
 
 noinst_LTLIBRARIES = libdirtydissectors.la libfiledissectors.la libdissectors.la
 
 libdirtydissectors_la_SOURCES = \
 	$(DIRTY_ASN1_DISSECTOR_SRC) \
 	$(DIRTY_CORBA_IDL_DISSECTOR_SRC)
+
 libdirtydissectors_la_CFLAGS = $(GENERATED_CFLAGS)
 
 libfiledissectors_la_SOURCES = \
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
diff --git a/epan/ftypes/Makefile.am b/epan/ftypes/Makefile.am
index 1246769e9f..96a586f2ad 100644
--- a/epan/ftypes/Makefile.am
+++ b/epan/ftypes/Makefile.am
@@ -21,7 +21,8 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
-AM_CPPFLAGS += -I$(top_srcdir)/epan
+AM_CPPFLAGS = $(INCLUDEDIRS) -I$(top_srcdir)/epan $(WS_CPPFLAGS) \
+	$(GLIB_CFLAGS) $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS)
 
 noinst_LTLIBRARIES = libftypes.la
 
@@ -35,8 +36,6 @@ MAINTAINERCLEANFILES = \
 
 libftypes_la_SOURCES = $(NONGENERATED_C_FILES) $(NONGENERATED_HEADER_FILES)
 
-libftypes_la_LIBADD = @GLIB_LIBS@
-
 EXTRA_DIST = \
 	Makefile.common		\
 	Makefile.nmake
diff --git a/epan/nghttp2/Makefile.am b/epan/nghttp2/Makefile.am
index 54d964b7b0..931fc0e8e6 100644
--- a/epan/nghttp2/Makefile.am
+++ b/epan/nghttp2/Makefile.am
@@ -22,7 +22,8 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
-AM_CPPFLAGS += $(LIBNGHTTP2_CFLAGS)
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(LIBNGHTTP2_CFLAGS) \
+	$(GLIB_CFLAGS)
 
 noinst_LTLIBRARIES = libnghttp2.la
 
diff --git a/epan/wmem/Makefile.am b/epan/wmem/Makefile.am
index 0b46b6a5e0..2b56a3849d 100644
--- a/epan/wmem/Makefile.am
+++ b/epan/wmem/Makefile.am
@@ -22,7 +22,8 @@
 include Makefile.common
 include $(top_srcdir)/Makefile.am.inc
 
-AM_CPPFLAGS += $(LIBWMEM_CFLAGS)
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(LIBWMEM_CFLAGS) \
+	$(GLIB_CFLAGS)
 
 noinst_LTLIBRARIES = libwmem.la
 
diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am
index fca56d132f..48b20925c1 100644
--- a/epan/wslua/Makefile.am
+++ b/epan/wslua/Makefile.am
@@ -21,7 +21,8 @@
 
 include $(top_srcdir)/Makefile.am.inc
 
-AM_CPPFLAGS += $(LUA_CFLAGS)
+AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(LUA_CFLAGS) \
+	$(GLIB_CFLAGS)
 
 noinst_LTLIBRARIES = libwslua.la