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 /epan/dfilter | |
| 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 'epan/dfilter')
| -rw-r--r-- | epan/dfilter/Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
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 = \ |