diff options
27 files changed, 14 insertions, 61 deletions
diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am index c450fed51..69b1b4261 100644 --- a/docs/tools/Makefile.am +++ b/docs/tools/Makefile.am @@ -6,11 +6,7 @@ INCLUDES = \ $(BUILD_CFLAGS) \ -DTOP_SRCDIR=\"$(top_srcdir)\" \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/libtracker-sparql \ - -I$(top_srcdir)/src/libtracker-data \ -I$(top_builddir)/src \ - -I$(top_builddir)/src/libtracker-sparql \ - -I$(top_builddir)/src/libtracker-data \ $(GLIB2_CFLAGS) \ $(GIO_CFLAGS) \ $(DBUS_CFLAGS) diff --git a/docs/tools/ontology-graph.c b/docs/tools/ontology-graph.c index 99ae73a9d..0d93b309e 100644 --- a/docs/tools/ontology-graph.c +++ b/docs/tools/ontology-graph.c @@ -18,8 +18,9 @@ */ #include <glib-object.h> -#include <gio/gio.h> #include <glib/gprintf.h> +#include <gio/gio.h> + #include <libtracker-data/tracker-data.h> #define RDF_PREFIX TRACKER_RDF_PREFIX diff --git a/examples/libtracker-extract/Makefile.am b/examples/libtracker-extract/Makefile.am index 878d44ed7..5337eaafe 100644 --- a/examples/libtracker-extract/Makefile.am +++ b/examples/libtracker-extract/Makefile.am @@ -6,7 +6,6 @@ modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/extract-modules INCLUDES = \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ - -I$(top_builddir)/src/libtracker-sparql \ $(WARN_CFLAGS) \ $(GLIB2_CFLAGS) \ $(GCOV_CFLAGS) diff --git a/examples/libtracker-miner/Makefile.am b/examples/libtracker-miner/Makefile.am index 541654c4a..d0de8d5bb 100644 --- a/examples/libtracker-miner/Makefile.am +++ b/examples/libtracker-miner/Makefile.am @@ -5,7 +5,6 @@ INCLUDES = \ -DSHAREDIR=\""$(datadir)"\" \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ - -I$(top_builddir)/src/libtracker-client \ $(GLIB2_CFLAGS) \ $(GIO_CFLAGS) \ $(DBUS_CFLAGS) diff --git a/src/libtracker-bus/Makefile.am b/src/libtracker-bus/Makefile.am index d3627e5a8..4b531c2b9 100644 --- a/src/libtracker-bus/Makefile.am +++ b/src/libtracker-bus/Makefile.am @@ -5,9 +5,7 @@ modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules INCLUDES = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/libtracker-sparql \ -I$(top_builddir)/src \ - -I$(top_builddir)/src/libtracker-sparql \ $(LIBTRACKER_BUS_CFLAGS) modules_LTLIBRARIES = libtracker-bus.la @@ -40,7 +38,7 @@ vapi_sources = \ tracker-bus-fd-update.vapi libtracker-bus.vala.stamp: $(libtracker_bus_la_VALASOURCES) $(vapi_sources) - $(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 -H tracker-bus.h --vapi tracker-bus.vapi $^ + $(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --includedir=libtracker-bus --pkg gio-2.0 --pkg dbus-glib-1 -H tracker-bus.h --vapi tracker-bus.vapi $^ $(AM_V_GEN)touch $@ BUILT_SOURCES = libtracker-bus.vala.stamp diff --git a/src/libtracker-client/Makefile.am b/src/libtracker-client/Makefile.am index f114ddb4f..a95cf1363 100644 --- a/src/libtracker-client/Makefile.am +++ b/src/libtracker-client/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = \ $(BUILD_CFLAGS) \ -DLOCALEDIR=\""$(localedir)"\" \ -I$(top_srcdir)/src \ - -I$(top_builddir)/src/libtracker-client \ + -I$(top_builddir)/src \ $(LIBTRACKER_CLIENT_CFLAGS) lib_LTLIBRARIES = libtracker-client-@TRACKER_API_VERSION@.la diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am index 316426e18..027286ba3 100644 --- a/src/libtracker-data/Makefile.am +++ b/src/libtracker-data/Makefile.am @@ -5,8 +5,6 @@ INCLUDES = \ -DSHAREDIR=\""$(datadir)"\" \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ - -I$(top_srcdir)/src/libtracker-sparql \ - -I$(top_builddir)/src/libtracker-sparql \ $(LIBTRACKER_DATA_CFLAGS) \ $(UNICODE_SUPPORT_CFLAGS) @@ -70,7 +68,7 @@ vapi_sources = \ libtracker-data.vapi libtracker-data.vala.stamp: $(libtracker_data_la_VALASOURCES) $(vapi_sources) - $(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) -H tracker-sparql-query.h --vapi tracker-sparql-query.vapi --pkg gio-2.0 $^ + $(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --includedir=libtracker-data -H tracker-sparql-query.h --vapi tracker-sparql-query.vapi --pkg gio-2.0 $^ touch $@ libtracker_data_la_LDFLAGS = \ diff --git a/src/libtracker-direct/Makefile.am b/src/libtracker-direct/Makefile.am index ed22dc74f..ca5e2b0d4 100644 --- a/src/libtracker-direct/Makefile.am +++ b/src/libtracker-direct/Makefile.am @@ -5,8 +5,6 @@ modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/sparql-modules INCLUDES = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/libtracker-sparql \ - -I$(top_srcdir)/src/libtracker-data \ -I$(top_builddir)/src \ $(LIBTRACKER_DIRECT_CFLAGS) @@ -33,7 +31,7 @@ vapi_sources = \ $(top_srcdir)/src/libtracker-data/tracker-sparql-query.vapi libtracker-direct.vala.stamp: $(libtracker_direct_la_VALASOURCES) $(vapi_sources) - $(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg dbus-glib-1 -H tracker-direct.h --vapi tracker-direct.vapi $^ + $(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --includedir=libtracker-direct --pkg gio-2.0 --pkg dbus-glib-1 -H tracker-direct.h --vapi tracker-direct.vapi $^ $(AM_V_GEN)touch $@ BUILT_SOURCES = libtracker-direct.vala.stamp diff --git a/src/libtracker-extract/Makefile.am b/src/libtracker-extract/Makefile.am index 882fea583..1e5e2701a 100644 --- a/src/libtracker-extract/Makefile.am +++ b/src/libtracker-extract/Makefile.am @@ -5,7 +5,6 @@ INCLUDES = \ -DSHAREDIR=\""$(datadir)"\" \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ - -I$(top_builddir)/src/libtracker-sparql \ $(LIBTRACKER_EXTRACT_CFLAGS) \ $(LIBIPTCDATA_CFLAGS) \ $(LIBEXIF_CFLAGS) \ diff --git a/src/libtracker-sparql/Makefile.am b/src/libtracker-sparql/Makefile.am index 894fad5a2..72c3b3a10 100644 --- a/src/libtracker-sparql/Makefile.am +++ b/src/libtracker-sparql/Makefile.am @@ -40,7 +40,7 @@ vapi_sources = \ $(top_srcdir)/src/vapi/glib-2.0-fixes.vapi libtracker-sparql.vala.stamp: $(libtracker_sparql_la_VALASOURCES) $(vapi_sources) - $(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 --pkg gmodule-2.0 --pkg dbus-glib-1 -H tracker-sparql.h --vapi tracker-sparql-$(TRACKER_API_VERSION).vapi $^ + $(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --includedir=libtracker-sparql --pkg gio-2.0 --pkg gmodule-2.0 --pkg dbus-glib-1 -H tracker-sparql.h --vapi tracker-sparql-$(TRACKER_API_VERSION).vapi $^ $(AM_V_GEN)touch $@ tracker-sparql-$(TRACKER_API_VERSION).deps: tracker-sparql.deps diff --git a/src/miners/flickr/Makefile.am b/src/miners/flickr/Makefile.am index dee086c9c..91926ca5d 100644 --- a/src/miners/flickr/Makefile.am +++ b/src/miners/flickr/Makefile.am @@ -6,9 +6,7 @@ INCLUDES = \ -DLOCALEDIR=\""$(localedir)"\" \ -DLIBEXEC_PATH=\""$(libexecdir)"\" \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/libtracker-sparql \ -I$(top_builddir)/src \ - -I$(top_builddir)/src/libtracker-sparql \ $(TRACKER_MINER_FLICKR_CFLAGS) VALAFLAGS = \ diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am index 63af52911..fad7350cb 100644 --- a/src/miners/fs/Makefile.am +++ b/src/miners/fs/Makefile.am @@ -6,14 +6,7 @@ INCLUDES = \ -DLOCALEDIR=\""$(localedir)"\" \ -DLIBEXEC_PATH=\""$(libexecdir)"\" \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/libtracker-sparql \ -I$(top_builddir)/src \ - -I$(top_srcdir)/src/libtracker-client \ - -I$(top_builddir)/src/libtracker-client \ - -I$(top_srcdir)/src/libtracker-data \ - -I$(top_builddir)/src/libtracker-data \ - -I$(top_srcdir)/src/libtracker-sparql \ - -I$(top_builddir)/src/libtracker-sparql \ $(TRACKER_MINER_FS_CFLAGS) libexec_PROGRAMS = tracker-miner-fs diff --git a/src/miners/rss/Makefile.am b/src/miners/rss/Makefile.am index 4eb5d7022..a4772904b 100644 --- a/src/miners/rss/Makefile.am +++ b/src/miners/rss/Makefile.am @@ -6,9 +6,7 @@ INCLUDES = \ -DLOCALEDIR=\""$(localedir)"\" \ -DLIBEXEC_PATH=\""$(libexecdir)"\" \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/libtracker-sparql \ -I$(top_builddir)/src \ - -I$(top_builddir)/src/libtracker-sparql \ $(TRACKER_MINER_RSS_CFLAGS) libexec_PROGRAMS = tracker-miner-rss diff --git a/src/plugins/evolution/Makefile.am b/src/plugins/evolution/Makefile.am index 9eeed2e17..bd108cf73 100644 --- a/src/plugins/evolution/Makefile.am +++ b/src/plugins/evolution/Makefile.am @@ -6,7 +6,6 @@ INCLUDES = \ -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \ -DLOCALEDIR="\"$(localedir)\"" \ -I$(top_builddir)/src \ - -I$(top_builddir)/src/libtracker-sparql \ $(EVOLUTION_PLUGIN_CFLAGS) %.eplug.in: %.eplug.xml diff --git a/src/plugins/nautilus/Makefile.am b/src/plugins/nautilus/Makefile.am index 566ad5e8e..9cd89fc4f 100644 --- a/src/plugins/nautilus/Makefile.am +++ b/src/plugins/nautilus/Makefile.am @@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.decl INCLUDES = \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ - -I$(top_builddir)/src/libtracker-client \ $(GCOV_CFLAGS) \ $(WARN_CFLAGS) \ $(NAUTILUS_EXTENSION_CFLAGS) \ diff --git a/src/tracker-control/Makefile.am b/src/tracker-control/Makefile.am index 2a6665602..356245400 100644 --- a/src/tracker-control/Makefile.am +++ b/src/tracker-control/Makefile.am @@ -4,13 +4,7 @@ INCLUDES = \ $(BUILD_CFLAGS) \ -DLOCALEDIR=\""$(localedir)"\" \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/libtracker-sparql \ -I$(top_builddir)/src \ - -I$(top_builddir)/src/libtracker-client \ - -I$(top_srcdir)/src/libtracker-data \ - -I$(top_builddir)/src/libtracker-data \ - -I$(top_srcdir)/src/libtracker-sparql \ - -I$(top_builddir)/src/libtracker-sparql \ $(TRACKER_CONTROL_CFLAGS) bin_PROGRAMS = tracker-control diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am index 322cecdf0..210229d33 100644 --- a/src/tracker-extract/Makefile.am +++ b/src/tracker-extract/Makefile.am @@ -8,9 +8,7 @@ INCLUDES = \ -DLOCALEDIR=\""$(localedir)"\" \ -DTRACKER_EXTRACTORS_DIR=\"$(modulesdir)\" \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/libtracker-sparql \ -I$(top_builddir)/src \ - -I$(top_builddir)/src/libtracker-sparql \ $(TRACKER_EXTRACT_CFLAGS) \ $(GDKPIXBUF_CFLAGS) \ $(LIBGIF_CFLAGS) \ diff --git a/src/tracker-search-bar/Makefile.am b/src/tracker-search-bar/Makefile.am index 98ed43909..89925b1d9 100644 --- a/src/tracker-search-bar/Makefile.am +++ b/src/tracker-search-bar/Makefile.am @@ -17,7 +17,6 @@ tracker_search_bar_CFLAGS = \ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ - -I$(top_builddir)/src/libtracker-client \ $(WARN_CFLAGS) \ $(GCOV_CFLAGS) \ $(TRACKER_SEARCH_BAR_CFLAGS) diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am index 535056dd1..04716a39b 100644 --- a/src/tracker-store/Makefile.am +++ b/src/tracker-store/Makefile.am @@ -7,11 +7,7 @@ INCLUDES = \ -DMAIL_MODULES_DIR=\""$(libdir)"/tracker-$(TRACKER_API_VERSION)/mail-modules\" \ -DPUSH_MODULES_DIR=\""$(libdir)/tracker-$(TRACKER_API_VERSION)/push-modules/daemon"\" \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/libtracker-sparql \ - -I$(top_srcdir)/src/libtracker-data \ -I$(top_builddir)/src \ - -I$(top_builddir)/src/libtracker-sparql \ - -I$(top_builddir)/src/libtracker-data \ $(TRACKER_STORE_CFLAGS) # diff --git a/src/tracker-utils/Makefile.am b/src/tracker-utils/Makefile.am index a172623f4..009875641 100644 --- a/src/tracker-utils/Makefile.am +++ b/src/tracker-utils/Makefile.am @@ -5,7 +5,6 @@ INCLUDES = \ -DLOCALEDIR=\""$(localedir)"\" \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ - -I$(top_builddir)/src/libtracker-sparql \ $(TRACKER_UTILS_CFLAGS) libs = \ diff --git a/src/tracker-writeback/Makefile.am b/src/tracker-writeback/Makefile.am index 6c3d30ea8..e4e31a9e1 100644 --- a/src/tracker-writeback/Makefile.am +++ b/src/tracker-writeback/Makefile.am @@ -10,7 +10,6 @@ INCLUDES = \ -DWRITEBACK_MODULES_DIR=\""$(modulesdir)"\" \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ - -I$(top_builddir)/src/libtracker-sparql \ $(TRACKER_WRITEBACK_CFLAGS) \ $(TAGLIB_CFLAGS) \ $(EXEMPI_CFLAGS) \ diff --git a/tests/functional-tests/Makefile.am b/tests/functional-tests/Makefile.am index edacaa8e3..844db38aa 100644 --- a/tests/functional-tests/Makefile.am +++ b/tests/functional-tests/Makefile.am @@ -3,12 +3,8 @@ include $(top_srcdir)/Makefile.decl SUBDIRS=common test-configurations test-extraction-data test-writeback-data ttl unittest2 test-ontologies INCLUDES = \ - -I$(top_srcdir)/src/libtracker-sparql \ - -I$(top_srcdir)/src/libtracker-direct \ - -I$(top_srcdir)/src/libtracker-bus \ - -I$(top_builddir)/src/libtracker-sparql \ - -I$(top_builddir)/src/libtracker-direct \ - -I$(top_builddir)/src/libtracker-bus \ + -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ $(WARN_CFLAGS) \ $(DBUS_CFLAGS) \ $(GLIB2_CFLAGS) \ diff --git a/tests/functional-tests/update-array-performance-test.c b/tests/functional-tests/update-array-performance-test.c index bfdfa2ca2..3f0d7262c 100644 --- a/tests/functional-tests/update-array-performance-test.c +++ b/tests/functional-tests/update-array-performance-test.c @@ -22,8 +22,7 @@ #include <stdlib.h> #include <string.h> -#include <tracker-bus.h> -#include <tracker-sparql.h> +#include <libtracker-sparql/tracker-sparql.h> typedef struct { GMainLoop *main_loop; diff --git a/tests/libtracker-extract/Makefile.am b/tests/libtracker-extract/Makefile.am index 60fde39cb..00792b130 100644 --- a/tests/libtracker-extract/Makefile.am +++ b/tests/libtracker-extract/Makefile.am @@ -9,9 +9,8 @@ TEST_PROGS += \ INCLUDES = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/tests/common \ -I$(top_builddir)/src \ - -I$(top_builddir)/src/libtracker-sparql \ + -I$(top_srcdir)/tests/common \ $(GLIB2_CFLAGS) \ $(GMODULE_CFLAGS) \ $(GTHREAD_CFLAGS) \ diff --git a/utils/mtp/Makefile.am b/utils/mtp/Makefile.am index c840c2986..8adf4d8f4 100644 --- a/utils/mtp/Makefile.am +++ b/utils/mtp/Makefile.am @@ -5,8 +5,6 @@ INCLUDES = \ -DLOCALEDIR=\""$(localedir)"\" \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ - -I$(top_builddir)/src/libtracker-sparql \ - -I$(top_srcdir)/src/libtracker-sparql \ $(DBUS_CFLAGS) \ $(GIO_CFLAGS) \ $(GTHREAD_CFLAGS) \ diff --git a/utils/mtp/mtp-dummy.c b/utils/mtp/mtp-dummy.c index 816a95526..c03c689d6 100644 --- a/utils/mtp/mtp-dummy.c +++ b/utils/mtp/mtp-dummy.c @@ -20,8 +20,10 @@ #include <stdio.h> #include <errno.h> #include <locale.h> + #include <glib.h> -#include <tracker-sparql.h> + +#include <libtracker-sparql/tracker-sparql.h> #define COPY_TIMEOUT_MS 100 diff --git a/utils/services/Makefile.am b/utils/services/Makefile.am index 396bdb931..a45d0a747 100644 --- a/utils/services/Makefile.am +++ b/utils/services/Makefile.am @@ -8,7 +8,6 @@ INCLUDES = \ $(BUILD_CFLAGS) \ -DTOP_SRCDIR=\"$(top_srcdir)\" \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/libtracker-sparql \ -I$(top_builddir)/src \ $(GLIB2_CFLAGS) \ $(GIO_CFLAGS) \ |