Commit faf70750 authored by Martyn Russell's avatar Martyn Russell

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
parent 9855fc86
......@@ -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)
......
......@@ -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
......
......@@ -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)
......
......@@ -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)
......
......@@ -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
......
......@@ -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
......
......@@ -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 = \
......
......@@ -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
......
......@@ -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) \
......
......@@ -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
......
......@@ -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 = \
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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) \
......
......@@ -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
......
......@@ -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) \
......
......@@ -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)
......
......@@ -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)
#
......
......@@ -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 = \
......
......@@ -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) \
......
......@@ -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) \
......
......@@ -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;
......
......@@ -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) \
......
......@@ -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) \
......
......@@ -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
......
......@@ -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) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment