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 /ui | |
| parent | 8b46cbbceb51f86ccc2efb487cf66024b9174ab4 (diff) | |
| download | wireshark-f0fb79d534c4276d30838bb25fc624e3eabce83c.tar.gz | |
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 'ui')
| -rw-r--r-- | ui/Makefile.am | 4 | ||||
| -rw-r--r-- | ui/cli/Makefile.am | 3 | ||||
| -rw-r--r-- | ui/gtk/Makefile.am | 3 | ||||
| -rw-r--r-- | ui/qt/Makefile.am | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/ui/Makefile.am b/ui/Makefile.am index 6c6e98db04..01c44dbc7c 100644 --- a/ui/Makefile.am +++ b/ui/Makefile.am @@ -23,8 +23,8 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc -AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES) \ - -DDOC_DIR=\"$(docdir)\" +AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) -DDOC_DIR=\"$(docdir)\" \ + $(GLIB_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES) noinst_LIBRARIES = libui.a libui_dirty.a diff --git a/ui/cli/Makefile.am b/ui/cli/Makefile.am index 3242543d41..4e723bd49b 100644 --- a/ui/cli/Makefile.am +++ b/ui/cli/Makefile.am @@ -22,7 +22,8 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc -AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES) +AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS) \ + $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES) noinst_LIBRARIES = libcliui.a diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am index 4abaa5402b..3c9fc159a4 100644 --- a/ui/gtk/Makefile.am +++ b/ui/gtk/Makefile.am @@ -22,7 +22,8 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc -AM_CPPFLAGS += $(PORTAUDIO_INCLUDES) +AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GTK_CFLAGS) \ + $(PORTAUDIO_INCLUDES) CLEANFILES = \ libgtkui.a \ diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am index bf9f8c82e5..6263fcec1e 100644 --- a/ui/qt/Makefile.am +++ b/ui/qt/Makefile.am @@ -22,7 +22,7 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc -AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(Qt_CFLAGS) +AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS) $(Qt_CFLAGS) noinst_LIBRARIES = libqtui.a |