summaryrefslogtreecommitdiff
path: root/epan/dissectors/dcerpc
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2016-02-19 08:20:35 +0000
committerJoão Valverde <j@v6e.pt>2016-02-21 07:51:55 +0000
commitf0fb79d534c4276d30838bb25fc624e3eabce83c (patch)
tree7996dc2491e63b2d7e8d737543976cc3a00ff644 /epan/dissectors/dcerpc
parent8b46cbbceb51f86ccc2efb487cf66024b9174ab4 (diff)
downloadwireshark-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 'epan/dissectors/dcerpc')
-rw-r--r--epan/dissectors/dcerpc/Makefile.am4
1 files changed, 3 insertions, 1 deletions
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