From f0fb79d534c4276d30838bb25fc624e3eabce83c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Fri, 19 Feb 2016 08:20:35 +0000 Subject: autotools: Use pkg-config autoconf macros for GLib/GTK MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- codecs/Makefile.am | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'codecs') 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 -- cgit v1.2.3