diff options
author | Martyn Russell <martyn@lanedo.com> | 2010-10-26 10:19:43 +0100 |
---|---|---|
committer | Martyn Russell <martyn@lanedo.com> | 2010-10-27 15:16:56 +0100 |
commit | 678b1872658f55f8630c1712e2312ee11d3547c1 (patch) | |
tree | 97d229c76ecdb4f3cb0cb059354006f3ed81f5ca | |
parent | eb9e834539c957c5a5216ada651abccd9a342b06 (diff) | |
download | tracker-678b1872658f55f8630c1712e2312ee11d3547c1.tar.gz |
build: Use AM_CPPFLAGS now INCLUDES is deprecated
43 files changed, 58 insertions, 58 deletions
diff --git a/docs/reference/libtracker-client/Makefile.am b/docs/reference/libtracker-client/Makefile.am index 7cd8ef283..f6c9cacf6 100644 --- a/docs/reference/libtracker-client/Makefile.am +++ b/docs/reference/libtracker-client/Makefile.am @@ -28,7 +28,7 @@ IGNORE_HFILES = \ # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. -INCLUDES = \ +AM_CPPFLAGS = \ -DTRACKER_COMPILATION \ -I$(top_srcdir)/src \ $(LIBTRACKER_CLIENT_CFLAGS) diff --git a/docs/reference/libtracker-extract/Makefile.am b/docs/reference/libtracker-extract/Makefile.am index 26bc9872e..a960379a9 100644 --- a/docs/reference/libtracker-extract/Makefile.am +++ b/docs/reference/libtracker-extract/Makefile.am @@ -26,7 +26,7 @@ IGNORE_HFILES = # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. -INCLUDES = \ +AM_CPPFLAGS = \ -DTRACKER_COMPILATION \ -I$(top_srcdir)/src \ $(LIBTRACKER_EXTRACT_CFLAGS) diff --git a/docs/reference/libtracker-miner/Makefile.am b/docs/reference/libtracker-miner/Makefile.am index 1cd9b13ff..25c541e9e 100644 --- a/docs/reference/libtracker-miner/Makefile.am +++ b/docs/reference/libtracker-miner/Makefile.am @@ -37,7 +37,7 @@ IGNORE_HFILES= \ # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. -INCLUDES = \ +AM_CPPFLAGS = \ -DTRACKER_COMPILATION \ -I$(top_srcdir)/src \ $(LIBTRACKER_MINER_CFLAGS) diff --git a/docs/reference/libtracker-sparql/Makefile.am b/docs/reference/libtracker-sparql/Makefile.am index 9a2288cf6..31279007c 100644 --- a/docs/reference/libtracker-sparql/Makefile.am +++ b/docs/reference/libtracker-sparql/Makefile.am @@ -26,7 +26,7 @@ IGNORE_HFILES = # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. -INCLUDES = \ +AM_CPPFLAGS = \ -DTRACKER_COMPILATION \ -I$(top_srcdir)/src \ $(LIBTRACKER_SPARQL_CFLAGS) diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am index 09dfaf6d0..713027f60 100644 --- a/docs/tools/Makefile.am +++ b/docs/tools/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl noinst_PROGRAMS = ontology-graph ttl2sgml -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -DTOP_SRCDIR=\"$(top_srcdir)\" \ -I$(top_srcdir)/src \ diff --git a/examples/class-signal/Makefile.am b/examples/class-signal/Makefile.am index d7ef1a885..76a8b0cf1 100644 --- a/examples/class-signal/Makefile.am +++ b/examples/class-signal/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ $(LIBTRACKER_SPARQL_CFLAGS) diff --git a/examples/libtracker-extract/Makefile.am b/examples/libtracker-extract/Makefile.am index 24e8a90af..bf630ab55 100644 --- a/examples/libtracker-extract/Makefile.am +++ b/examples/libtracker-extract/Makefile.am @@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl module_flags = -module -avoid-version -no-undefined modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/extract-modules -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ diff --git a/examples/libtracker-miner/Makefile.am b/examples/libtracker-miner/Makefile.am index 02956d716..c24afaf6d 100644 --- a/examples/libtracker-miner/Makefile.am +++ b/examples/libtracker-miner/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -DSHAREDIR=\""$(datadir)"\" \ -I$(top_srcdir)/src \ diff --git a/src/libstemmer/Makefile.am b/src/libstemmer/Makefile.am index cbd37b4d4..934727f32 100644 --- a/src/libstemmer/Makefile.am +++ b/src/libstemmer/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ -DSHAREDIR=\""$(datadir)"\" diff --git a/src/libtracker-bus/Makefile.am b/src/libtracker-bus/Makefile.am index 4b531c2b9..846e97bf7 100644 --- a/src/libtracker-bus/Makefile.am +++ b/src/libtracker-bus/Makefile.am @@ -2,10 +2,10 @@ include $(top_srcdir)/Makefile.decl modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules -INCLUDES = \ - $(BUILD_CFLAGS) \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src \ +AM_CPPFLAGS = \ + $(BUILD_CFLAGS) \ + -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ $(LIBTRACKER_BUS_CFLAGS) modules_LTLIBRARIES = libtracker-bus.la diff --git a/src/libtracker-client/Makefile.am b/src/libtracker-client/Makefile.am index a95cf1363..4e86c8e14 100644 --- a/src/libtracker-client/Makefile.am +++ b/src/libtracker-client/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -DLOCALEDIR=\""$(localedir)"\" \ -I$(top_srcdir)/src \ diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am index 102cdd2ae..c72423bc4 100644 --- a/src/libtracker-common/Makefile.am +++ b/src/libtracker-common/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -DSHAREDIR=\""$(datadir)"\" \ -I$(top_srcdir)/src \ diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am index 027286ba3..2150499dd 100644 --- a/src/libtracker-data/Makefile.am +++ b/src/libtracker-data/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -DSHAREDIR=\""$(datadir)"\" \ -I$(top_srcdir)/src \ diff --git a/src/libtracker-direct/Makefile.am b/src/libtracker-direct/Makefile.am index ca5e2b0d4..0df346f1c 100644 --- a/src/libtracker-direct/Makefile.am +++ b/src/libtracker-direct/Makefile.am @@ -2,10 +2,10 @@ include $(top_srcdir)/Makefile.decl modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules -INCLUDES = \ - $(BUILD_CFLAGS) \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src \ +AM_CPPFLAGS = \ + $(BUILD_CFLAGS) \ + -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ $(LIBTRACKER_DIRECT_CFLAGS) modules_LTLIBRARIES = libtracker-direct.la diff --git a/src/libtracker-extract/Makefile.am b/src/libtracker-extract/Makefile.am index 1e5e2701a..7ebc1ebcf 100644 --- a/src/libtracker-extract/Makefile.am +++ b/src/libtracker-extract/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -DSHAREDIR=\""$(datadir)"\" \ -I$(top_srcdir)/src \ diff --git a/src/libtracker-fts/Makefile.am b/src/libtracker-fts/Makefile.am index a87d93f2b..70c2f46cd 100644 --- a/src/libtracker-fts/Makefile.am +++ b/src/libtracker-fts/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ -DNDEBUG \ diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am index 7dc662c34..fcf483a56 100644 --- a/src/libtracker-miner/Makefile.am +++ b/src/libtracker-miner/Makefile.am @@ -5,7 +5,7 @@ include $(top_srcdir)/Makefile.decl # $(libtracker_miner_monitor_sources) include Makefile-shared-sources.decl -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -DSHAREDIR=\""$(datadir)"\" \ -DDBUS_SERVICES_DIR=\""$(DBUS_SERVICES_DIR)"\" \ @@ -69,7 +69,7 @@ libtracker_miner_@TRACKER_API_VERSION@_la_SOURCES += \ libtracker_miner_@TRACKER_API_VERSION@_la_LIBADD += \ $(GNOME_KEYRING_LIBS) -INCLUDES += \ +AM_CPPFLAGS += \ $(GNOME_KEYRING_CFLAGS) else libtracker_miner_@TRACKER_API_VERSION@_la_SOURCES += \ @@ -83,7 +83,7 @@ libtracker_miner_@TRACKER_API_VERSION@_la_SOURCES += \ libtracker_miner_@TRACKER_API_VERSION@_la_LIBADD += \ $(NETWORK_MANAGER_LIBS) -INCLUDES += \ +AM_CPPFLAGS += \ $(NETWORK_MANAGER_CFLAGS) else libtracker_miner_@TRACKER_API_VERSION@_la_SOURCES += \ diff --git a/src/libtracker-sparql/Makefile.am b/src/libtracker-sparql/Makefile.am index 72c3b3a10..b25ca6fac 100644 --- a/src/libtracker-sparql/Makefile.am +++ b/src/libtracker-sparql/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -DSPARQL_MODULES_DIR=\""$(modulesdir)"\" \ -I$(top_srcdir)/src \ diff --git a/src/miners/flickr/Makefile.am b/src/miners/flickr/Makefile.am index 91926ca5d..619863292 100644 --- a/src/miners/flickr/Makefile.am +++ b/src/miners/flickr/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -DSHAREDIR=\""$(datadir)"\" \ -DLOCALEDIR=\""$(localedir)"\" \ diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am index fad7350cb..cdf403abd 100644 --- a/src/miners/fs/Makefile.am +++ b/src/miners/fs/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -DSHAREDIR=\""$(datadir)"\" \ -DLOCALEDIR=\""$(localedir)"\" \ @@ -33,7 +33,7 @@ tracker_miner_fs_LDADD = \ $(TRACKER_MINER_FS_LIBS) if HAVE_MEEGOTOUCH -INCLUDES += $(MEEGOTOUCH_CFLAGS) +AM_CPPFLAGS += $(MEEGOTOUCH_CFLAGS) tracker_miner_fs_SOURCES += tracker-miner-applications-meego.cpp tracker_miner_fs_LDADD += $(MEEGOTOUCH_LIBS) endif diff --git a/src/miners/rss/Makefile.am b/src/miners/rss/Makefile.am index a4772904b..edc8fc770 100644 --- a/src/miners/rss/Makefile.am +++ b/src/miners/rss/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -DSHAREDIR=\""$(datadir)"\" \ -DLOCALEDIR=\""$(localedir)"\" \ diff --git a/src/plugins/evolution/Makefile.am b/src/plugins/evolution/Makefile.am index 80f888398..efd3c0732 100644 --- a/src/plugins/evolution/Makefile.am +++ b/src/plugins/evolution/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ diff --git a/src/plugins/nautilus/Makefile.am b/src/plugins/nautilus/Makefile.am index bf2c54182..18274ce65 100644 --- a/src/plugins/nautilus/Makefile.am +++ b/src/plugins/nautilus/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ diff --git a/src/tracker-control/Makefile.am b/src/tracker-control/Makefile.am index 356245400..5bc6d5c59 100644 --- a/src/tracker-control/Makefile.am +++ b/src/tracker-control/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -DLOCALEDIR=\""$(localedir)"\" \ -I$(top_srcdir)/src \ diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am index b4e7ca431..a498848af 100644 --- a/src/tracker-extract/Makefile.am +++ b/src/tracker-extract/Makefile.am @@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl module_flags = -module -avoid-version -no-undefined modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/extract-modules -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ @@ -12,7 +12,7 @@ INCLUDES = \ $(TRACKER_EXTRACT_CFLAGS) if HAVE_LIBSTREAMANALYZER -INCLUDES += $(LIBSTREAMANALYZER_CFLAGS) +AM_CPPFLAGS += $(LIBSTREAMANALYZER_CFLAGS) endif # NOTE: @@ -211,7 +211,7 @@ libextract_msoffice_la_LIBADD = \ # PDF libextract_pdf_la_SOURCES = tracker-extract-pdf.cpp -libextract_pdf_la_CPPFLAGS = $(POPPLER_CFLAGS) +libextract_pdf_la_CXXFLAGS = $(POPPLER_CFLAGS) libextract_pdf_la_LDFLAGS = $(module_flags) libextract_pdf_la_LIBADD = \ $(top_builddir)/src/libtracker-extract/libtracker-extract-@TRACKER_API_VERSION@.la \ @@ -333,8 +333,6 @@ tracker_extract_SOURCES = \ tracker-main.h \ tracker-albumart-generic.h -tracker_extract_CFLAGS = - tracker_extract_LDADD = \ $(top_builddir)/src/libtracker-extract/libtracker-extract-@TRACKER_API_VERSION@.la \ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ @@ -343,6 +341,8 @@ tracker_extract_LDADD = \ $(BUILD_LIBS) \ $(TRACKER_EXTRACT_LIBS) +tracker_extract_CFLAGS = $(AM_CPPFLAGS) + if HAVE_LIBGSF tracker_extract_SOURCES += tracker-gsf.c tracker-gsf.h tracker_extract_CFLAGS += $(LIBGSF_CFLAGS) @@ -356,12 +356,12 @@ endif if HAVE_GDKPIXBUF tracker_extract_SOURCES += tracker-albumart-pixbuf.c -tracker_extract_CFLAGS += $(GDKPIXBUF_CFLAGS) +tracker_extract_CPPFLAGS = $(GDKPIXBUF_CFLAGS) tracker_extract_LDADD += $(GDKPIXBUF_LIBS) else if HAVE_QT -INCLUDES += $(QT_CFLAGS) tracker_extract_SOURCES += tracker-albumart-qt.cpp +tracker_extract_CPPFLAGS = $(QT_CFLAGS) tracker_extract_LDADD += $(QT_LIBS) else tracker_extract_SOURCES += tracker-albumart-dummy.c diff --git a/src/tracker-preferences/Makefile.am b/src/tracker-preferences/Makefile.am index 50aa6309f..821852c12 100644 --- a/src/tracker-preferences/Makefile.am +++ b/src/tracker-preferences/Makefile.am @@ -9,7 +9,7 @@ desktop_DATA = tracker-preferences.desktop pkgdata_DATA = tracker-preferences.ui -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ diff --git a/src/tracker-status-icon/Makefile.am b/src/tracker-status-icon/Makefile.am index 21eb5c9cb..c0a6f767c 100644 --- a/src/tracker-status-icon/Makefile.am +++ b/src/tracker-status-icon/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am index 04716a39b..0da06ae24 100644 --- a/src/tracker-store/Makefile.am +++ b/src/tracker-store/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -DSHAREDIR=\""$(datadir)"\" \ -DLOCALEDIR=\""$(localedir)"\" \ diff --git a/src/tracker-utils/Makefile.am b/src/tracker-utils/Makefile.am index 009875641..30e9c38c8 100644 --- a/src/tracker-utils/Makefile.am +++ b/src/tracker-utils/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -DLOCALEDIR=\""$(localedir)"\" \ -I$(top_srcdir)/src \ diff --git a/src/tracker-writeback/Makefile.am b/src/tracker-writeback/Makefile.am index 47a4b6182..18a0d467a 100644 --- a/src/tracker-writeback/Makefile.am +++ b/src/tracker-writeback/Makefile.am @@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl module_flags = -module -avoid-version -no-undefined modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/writeback-modules -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ diff --git a/tests/common/Makefile.am b/tests/common/Makefile.am index ba23fc967..e92a80823 100644 --- a/tests/common/Makefile.am +++ b/tests/common/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl noinst_LTLIBRARIES = libtracker-testcommon.la -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD) \ -DTEST_TEXT=\""$(top_srcdir)"/tests/libtracker-common/non-utf8.txt\" \ $(LIBTRACKER_COMMON_CFLAGS) diff --git a/tests/functional-tests/ipc/Makefile.am b/tests/functional-tests/ipc/Makefile.am index e1f9ec2af..fec8f53bd 100644 --- a/tests/functional-tests/ipc/Makefile.am +++ b/tests/functional-tests/ipc/Makefile.am @@ -10,7 +10,7 @@ noinst_PROGRAMS = \ test-class-signal-performance \ test-update-array-performance -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ diff --git a/tests/libtracker-client/Makefile.am b/tests/libtracker-client/Makefile.am index 0a9fec01d..5e9b878f4 100644 --- a/tests/libtracker-client/Makefile.am +++ b/tests/libtracker-client/Makefile.am @@ -5,7 +5,7 @@ noinst_PROGRAMS = $(TEST_PROGS) TEST_PROGS += \ tracker-test -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/tests/common \ diff --git a/tests/libtracker-common/Makefile.am b/tests/libtracker-common/Makefile.am index 1858c5bbf..b12647b24 100644 --- a/tests/libtracker-common/Makefile.am +++ b/tests/libtracker-common/Makefile.am @@ -8,7 +8,7 @@ TEST_PROGS += \ tracker-file-utils \ tracker-utils -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/tests/common \ diff --git a/tests/libtracker-data/Makefile.am b/tests/libtracker-data/Makefile.am index 37991167a..d1689079c 100644 --- a/tests/libtracker-data/Makefile.am +++ b/tests/libtracker-data/Makefile.am @@ -33,7 +33,7 @@ TEST_PROGS += \ tracker-db-journal \ tracker-db-dbus -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -DTOP_SRCDIR=\"$(abs_top_srcdir)\" \ -DTOP_BUILDDIR=\"$(abs_top_builddir)\" \ diff --git a/tests/libtracker-extract/Makefile.am b/tests/libtracker-extract/Makefile.am index 5ce8dfa78..899a3d30b 100644 --- a/tests/libtracker-extract/Makefile.am +++ b/tests/libtracker-extract/Makefile.am @@ -6,7 +6,7 @@ TEST_PROGS += \ tracker-test-utils \ tracker-test-xmp -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ diff --git a/tests/libtracker-fts/Makefile.am b/tests/libtracker-fts/Makefile.am index cd699877d..40ae72c38 100644 --- a/tests/libtracker-fts/Makefile.am +++ b/tests/libtracker-fts/Makefile.am @@ -12,7 +12,7 @@ TEST_PROGS += \ tracker-fts-test \ tracker-parser-test -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ diff --git a/tests/libtracker-miner/Makefile.am b/tests/libtracker-miner/Makefile.am index aa345a02e..28f896348 100644 --- a/tests/libtracker-miner/Makefile.am +++ b/tests/libtracker-miner/Makefile.am @@ -14,7 +14,7 @@ TEST_PROGS += \ tracker-thumbnailer-test \ tracker-monitor-test -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -DTEST \ -DLIBEXEC_PATH=\""$(libexecdir)"\" \ diff --git a/tests/libtracker-sparql/Makefile.am b/tests/libtracker-sparql/Makefile.am index 6f4ace65d..1003a3b87 100644 --- a/tests/libtracker-sparql/Makefile.am +++ b/tests/libtracker-sparql/Makefile.am @@ -5,7 +5,7 @@ noinst_PROGRAMS = $(TEST_PROGS) TEST_PROGS += \ tracker-test -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ diff --git a/tests/tracker-steroids/Makefile.am b/tests/tracker-steroids/Makefile.am index f9a4d2464..718cc6c54 100644 --- a/tests/tracker-steroids/Makefile.am +++ b/tests/tracker-steroids/Makefile.am @@ -5,7 +5,7 @@ noinst_PROGRAMS = $(TEST_PROGS) TEST_PROGS += \ tracker-test -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ diff --git a/utils/mtp/Makefile.am b/utils/mtp/Makefile.am index d1cad0ac3..3d6a26220 100644 --- a/utils/mtp/Makefile.am +++ b/utils/mtp/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.decl -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ diff --git a/utils/playlists/Makefile.am b/utils/playlists/Makefile.am index 600d160e4..8a6688eac 100644 --- a/utils/playlists/Makefile.am +++ b/utils/playlists/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl noinst_PROGRAMS = playlist2ttl -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ $(TOTEM_PL_PARSER_CFLAGS) diff --git a/utils/services/Makefile.am b/utils/services/Makefile.am index 2e7920af6..d3b407734 100644 --- a/utils/services/Makefile.am +++ b/utils/services/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl noinst_PROGRAMS = ontology-validator data-validator -INCLUDES = \ +AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ |