From cff117c09a1914adae130aea8ff5596d95356903 Mon Sep 17 00:00:00 2001 From: Martyn Russell Date: Mon, 25 Oct 2010 15:12:24 +0100 Subject: examples: Cleaned up CFLAGS/LIBS --- examples/class-signal/Makefile.am | 18 +++++++++--------- examples/libtracker-extract/Makefile.am | 9 ++++----- 2 files changed, 13 insertions(+), 14 deletions(-) (limited to 'examples') diff --git a/examples/class-signal/Makefile.am b/examples/class-signal/Makefile.am index 8774fce2e..6c96931c0 100644 --- a/examples/class-signal/Makefile.am +++ b/examples/class-signal/Makefile.am @@ -1,20 +1,20 @@ include $(top_srcdir)/Makefile.decl INCLUDES = \ - -I$(top_srcdir)/src/libtracker-sparql \ - -I$(top_srcdir)/src \ - $(WARN_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(GLIB2_CFLAGS) \ - $(GIO_CFLAGS) \ + $(BUILD_CFLAGS) \ + -I$(top_srcdir)/src \ + $(DBUS_CFLAGS) \ + $(GLIB2_CFLAGS) \ + $(GIO_CFLAGS) \ $(GTHREAD_CFLAGS) noinst_PROGRAMS = class-signal class_signal_SOURCES = class-signal.c -class_signal_LDADD = \ +class_signal_LDADD = \ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \ - $(GIO_LIBS) \ - $(GLIB2_LIBS) \ + $(BUILD_LIBS) \ + $(GIO_LIBS) \ + $(GLIB2_LIBS) \ $(DBUS_LIBS) diff --git a/examples/libtracker-extract/Makefile.am b/examples/libtracker-extract/Makefile.am index 5337eaafe..68f114643 100644 --- a/examples/libtracker-extract/Makefile.am +++ b/examples/libtracker-extract/Makefile.am @@ -4,11 +4,10 @@ module_flags = -module -avoid-version -no-undefined modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/extract-modules INCLUDES = \ + $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ - $(WARN_CFLAGS) \ - $(GLIB2_CFLAGS) \ - $(GCOV_CFLAGS) + $(GLIB2_CFLAGS) noinst_LTLIBRARIES = libextract-mockup.la @@ -17,6 +16,6 @@ libextract_mockup_la_LDFLAGS = $(module_flags) libextract_mockup_la_LIBADD = \ $(top_builddir)/src/libtracker-extract/libtracker-extract-@TRACKER_API_VERSION@.la \ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ - $(GLIB2_LIBS) \ - $(GCOV_LIBS) + $(BUILD_LIBS) \ + $(GLIB2_LIBS) -- cgit v1.2.1