diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-02-19 08:20:35 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-02-21 07:51:55 +0000 |
| commit | f0fb79d534c4276d30838bb25fc624e3eabce83c (patch) | |
| tree | 7996dc2491e63b2d7e8d737543976cc3a00ff644 /wsutil | |
| parent | 8b46cbbceb51f86ccc2efb487cf66024b9174ab4 (diff) | |
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>
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
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 = |