[tracker/configure-for-binaries: 24/60] build: Don't include specific directories, just src/
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/configure-for-binaries: 24/60] build: Don't include specific directories, just src/
- Date: Mon, 25 Oct 2010 18:35:24 +0000 (UTC)
commit 9e823b22b94f0e291ab30214e1f0060b3c5f7363
Author: Martyn Russell <martyn lanedo com>
Date: Mon Oct 25 10:53:16 2010 +0100
build: Don't include specific directories, just src/
This required fixing the Vala generated files using --includedir and
also some tests/utils.
NOTE: At this point make distcheck passes with these changes
docs/tools/Makefile.am | 4 ----
docs/tools/ontology-graph.c | 3 ++-
examples/libtracker-extract/Makefile.am | 1 -
examples/libtracker-miner/Makefile.am | 1 -
src/libtracker-bus/Makefile.am | 4 +---
src/libtracker-client/Makefile.am | 2 +-
src/libtracker-data/Makefile.am | 4 +---
src/libtracker-direct/Makefile.am | 4 +---
src/libtracker-extract/Makefile.am | 1 -
src/libtracker-sparql/Makefile.am | 2 +-
src/miners/flickr/Makefile.am | 2 --
src/miners/fs/Makefile.am | 7 -------
src/miners/rss/Makefile.am | 2 --
src/plugins/evolution/Makefile.am | 1 -
src/plugins/nautilus/Makefile.am | 1 -
src/tracker-control/Makefile.am | 6 ------
src/tracker-extract/Makefile.am | 2 --
src/tracker-search-bar/Makefile.am | 1 -
src/tracker-store/Makefile.am | 4 ----
src/tracker-utils/Makefile.am | 1 -
src/tracker-writeback/Makefile.am | 1 -
tests/functional-tests/Makefile.am | 8 ++------
.../update-array-performance-test.c | 3 +--
tests/libtracker-extract/Makefile.am | 3 +--
utils/mtp/Makefile.am | 2 --
utils/mtp/mtp-dummy.c | 4 +++-
utils/services/Makefile.am | 1 -
27 files changed, 14 insertions(+), 61 deletions(-)
---
diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am
index c450fed..69b1b42 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 99ae73a..0d93b30 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 878d44e..5337eaa 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 541654c..d0de8d5 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 d3627e5..4b531c2 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 f114ddb..a95cf13 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 316426e..027286b 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 ed22dc7..ca5e2b0 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 882fea5..1e5e270 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 894fad5..72c3b3a 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 dee086c..91926ca 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 63af529..fad7350 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 4eb5d70..a477290 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 9eeed2e..bd108cf 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 566ad5e..9cd89fc 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 2a66656..3562454 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 322cecd..210229d 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 98ed439..89925b1 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 535056d..04716a3 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 a172623..0098756 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 6c3d30e..e4e31a9 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 edacaa8..844db38 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 bfdfa2c..3f0d726 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 60fde39..00792b1 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 c840c29..8adf4d8 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 816a955..c03c689 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 396bdb9..a45d0a7 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) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]