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 /wiretap/Makefile.am | |
| 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 'wiretap/Makefile.am')
| -rw-r--r-- | wiretap/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index bd65b2ba37..d716817767 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -24,7 +24,7 @@ include $(top_srcdir)/Makefile.am.inc ACLOCAL_AMFLAGS = `../aclocal-flags` -AM_CPPFLAGS += -DWS_BUILD_DLL +AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) -DWS_BUILD_DLL $(GLIB_CFLAGS) noinst_LTLIBRARIES = libwiretap_generated.la lib_LTLIBRARIES = libwiretap.la @@ -52,6 +52,7 @@ libwiretap_la_SOURCES = \ libwiretap_generated_la_SOURCES = \ $(GENERATED_C_FILES) + libwiretap_generated_la_CFLAGS = $(GENERATED_CFLAGS) EXTRA_DIST = \ @@ -63,6 +64,7 @@ EXTRA_DIST = \ $(GENERATED_FILES) libwiretap_la_LIBADD = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la $(GLIB_LIBS) + libwiretap_la_DEPENDENCIES = libwiretap_generated.la ${top_builddir}/wsutil/libwsutil.la k12text_lex.h : k12text.c |