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 /codecs | |
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 'codecs')
-rw-r--r-- | codecs/Makefile.am | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/codecs/Makefile.am b/codecs/Makefile.am index 50111154c2..0505d3c295 100644 --- a/codecs/Makefile.am +++ b/codecs/Makefile.am @@ -22,7 +22,8 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc -AM_CPPFLAGS += -DWS_BUILD_DLL +AM_CPPFLAGS = -DWS_BUILD_DLL $(INCLUDEDIRS) $(WS_CPPFLAGS) \ + $(GLIB_CFLAGS) $(SBC_CFLAGS) lib_LTLIBRARIES = libwscodecs.la @@ -35,12 +36,10 @@ libwscodecs_la_SOURCES = \ $(LIBWSCODECS_SRC) \ $(noinst_HEADERS) -libwscodecs_la_CFLAGS = $(AM_CFLAGS) $(SBC_CFLAGS) - # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html libwscodecs_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ -libwscodecs_la_LIBADD = $(top_builddir)/wsutil/libwsutil.la $(SBC_LIBS) +libwscodecs_la_LIBADD = $(top_builddir)/wsutil/libwsutil.la $(GLIB_LIBS) $(SBC_LIBS) libwscodecs_la_DEPENDENCIES = $(top_builddir)/wsutil/libwsutil.la |