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/dissectors | |
| 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/dissectors')
| -rw-r--r-- | epan/dissectors/Makefile.am | 4 | ||||
| -rw-r--r-- | epan/dissectors/dcerpc/Makefile.am | 4 |
2 files changed, 6 insertions, 2 deletions
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 |