GNOME.org
 

[tracker/vpath-build-review: 1/2] Several modifications in the build structure, including VPATH builds

commit 0c50b9445e6364bc686cc7a32541cc2111323434
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Thu May 13 15:30:27 2010 +0200

    Several modifications in the build structure, including VPATH builds
    
    	* Also fixed GB#616808: The user can now rebuild PNG files from
    	the sources in the distribution tarball. And PNG files are only
    	removed in make maintainerclean.
    
    	* Same for the ontology XML files, they can now be rebuilt from
    	the sources in the distribution tarball, and will only be
    	removed in make maintainerclean.
    
    	* Support for VPATH builds, where $(srcdir) != $(builddir)

 Makefile.am                                   |    2 +-
 data/ontologies/Makefile.am                   |   24 +++++-
 docs/ontologies/README.ontologiesdoc          |    9 +-
 docs/reference/libtracker-client/Makefile.am  |    8 +-
 docs/reference/libtracker-common/Makefile.am  |    5 +-
 docs/reference/libtracker-extract/Makefile.am |    5 +-
 docs/reference/libtracker-miner/Makefile.am   |    5 +-
 docs/reference/ontology/Makefile.am           |  122 +++++++++++++++++++------
 docs/tools/Makefile.am                        |   51 +----------
 docs/tools/gen-doc.sh                         |   19 ++--
 examples/libtracker-extract/Makefile.am       |    2 +
 examples/libtracker-miner/Makefile.am         |    2 +
 src/libtracker-client/Makefile.am             |    3 +-
 src/libtracker-data/Makefile.am               |    8 +-
 src/libtracker-extract/Makefile.am            |    1 +
 src/libtracker-miner/Makefile.am              |    2 +
 src/miners/flickr/Makefile.am                 |    2 +
 src/miners/fs/Makefile.am                     |    4 +-
 src/miners/rss/Makefile.am                    |    2 +
 src/plugins/evolution/Makefile.am             |    4 +-
 src/plugins/kmail/Makefile.am                 |    2 +
 src/plugins/nautilus/Makefile.am              |    2 +
 src/tracker-control/Makefile.am               |    2 +
 src/tracker-extract/Makefile.am               |    2 +
 src/tracker-search-bar/Makefile.am            |    2 +
 src/tracker-search-tool/Makefile.am           |    2 +-
 src/tracker-status-icon/Makefile.am           |    2 +
 src/tracker-store/Makefile.am                 |    2 +
 src/tracker-utils/Makefile.am                 |    2 +
 src/tracker-writeback/Makefile.am             |    2 +
 tests/libtracker-data/Makefile.am             |    2 +
 tests/libtracker-extract/Makefile.am          |    2 +
 tests/libtracker-fts/Makefile.am              |    2 +
 tests/libtracker-miner/Makefile.am            |    2 +
 tests/tracker-miner-fs/Makefile.am            |    2 +-
 utils/services/Makefile.am                    |    3 +-
 36 files changed, 202 insertions(+), 111 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0c41179..a995970 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,7 +66,7 @@ DISTCHECK_CONFIGURE_FLAGS =			\
 	--enable-miner-flickr			\
 	--disable-miner-evolution		\
 	--enable-unac				\
-	--enable-poppler-glib			\
+	--enable-poppler			\
 	--enable-exempi				\
 	--enable-libiptcdata			\
 	--enable-libjpeg			\
diff --git a/data/ontologies/Makefile.am b/data/ontologies/Makefile.am
index 925da00..8f66fac 100644
--- a/data/ontologies/Makefile.am
+++ b/data/ontologies/Makefile.am
@@ -20,10 +20,30 @@ config_DATA =			\
 	40-mlo.ontology		\
 	41-mfo.ontology		\
 	89-mtp.ontology		\
-	90-tracker.ontology
+	90-tracker.ontology	\
+	10-xsd.description	\
+	11-rdf.description	\
+	12-nrl.description	\
+	20-dc.description	\
+	30-nie.description	\
+	31-nao.description	\
+	32-nco.description	\
+	33-nfo.description	\
+	34-nmo.description	\
+	35-ncal.description	\
+	36-scal.description	\
+	37-nid3.description	\
+	38-nmm.description	\
+	39-mto.description	\
+	40-mlo.description	\
+	41-mfo.description	\
+	89-mtp.description	\
+	90-tracker.description
 
 if HAVE_MAEMO
-config_DATA += 91-maemo.ontology	
+config_DATA += 			\
+	91-maemo.ontology	\
+	91-maemo.description
 endif
 
 EXTRA_DIST = $(config_DATA)
diff --git a/docs/ontologies/README.ontologiesdoc b/docs/ontologies/README.ontologiesdoc
index b930dd5..70de288 100644
--- a/docs/ontologies/README.ontologiesdoc
+++ b/docs/ontologies/README.ontologiesdoc
@@ -9,11 +9,10 @@ Expected documents/format
 1) There should be one directory per ontology prefix.
 2) In that directory, there must be a file called 'explanation.xml'
    This file will be copied as-it-is into the documentation general XML
-3) There is a predefined id schema for the elements in ontology 
+3) There is a predefined id schema for the elements in ontology
    and the document itself, so it is easy to link them from anywhere.
-4) Images and other resources (*) linked in the documentation must be 
-   added _in two places_
-    - docs/tools/Makefile.am (ONTOLOGY_DIAGRAMS variable)
+4) Images and other resources (*) linked in the documentation must be
+   added: 
     - docs/reference/ontology/Makefile.am (ONTOLOGY_DIAGRAMS variable)
 
 (*) .dia files will be exported as PNG.
@@ -62,7 +61,7 @@ There are two steps:
    docs/reference/ontology
 
    make check the gen-doc.stamp file to decide when it needs to
-   rebuild. Remove that file after modifying any of the inputs to 
+   rebuild. Remove that file after modifying any of the inputs to
    force a rebuild.
 
 2) run make in docs/reference/ontology
diff --git a/docs/reference/libtracker-client/Makefile.am b/docs/reference/libtracker-client/Makefile.am
index 522a69c..eaf523d 100644
--- a/docs/reference/libtracker-client/Makefile.am
+++ b/docs/reference/libtracker-client/Makefile.am
@@ -12,7 +12,7 @@ DOC_MAIN_SGML_FILE = libtracker-client-docs.sgml
 SCAN_OPTIONS=--deprecated-guards="TRACKER_DISABLE_DEPRECATED"
 
 # Extra options to pass to gtkdoc-scangobj
-# SCANGOBJ_OPTIONS=--type-init-func="gtk_type_init(0)" 
+# SCANGOBJ_OPTIONS=--type-init-func="gtk_type_init(0)"
 
 # The directory containing the source code. Relative to $(srcdir)
 DOC_SOURCE_DIR = ../../../src/libtracker-client
@@ -46,9 +46,11 @@ GTKDOC_LIBS =								\
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS = --sgml-mode --output-format=xml
 
+# Extra options to supply to gtkdoc-mkhtml
+MKHTML_OPTIONS=--path="$(abs_builddir)"
+
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
-content_files =						\
-	version.xml
+content_files =	version.xml
 
 expand_content_files =
 
diff --git a/docs/reference/libtracker-common/Makefile.am b/docs/reference/libtracker-common/Makefile.am
index 1c77b36..70c57e5 100644
--- a/docs/reference/libtracker-common/Makefile.am
+++ b/docs/reference/libtracker-common/Makefile.am
@@ -12,7 +12,7 @@ DOC_MAIN_SGML_FILE=libtracker-common-docs.sgml
 SCAN_OPTIONS=--deprecated-guards="TRACKER_DISABLE_DEPRECATED"
 
 # Extra options to pass to gtkdoc-scangobj
-# SCANGOBJ_OPTIONS=--type-init-func="gtk_type_init(0)" 
+# SCANGOBJ_OPTIONS=--type-init-func="gtk_type_init(0)"
 
 # The directory containing the source code. Relative to $(srcdir)
 DOC_SOURCE_DIR=../../../src/libtracker-common
@@ -43,6 +43,9 @@ GTKDOC_LIBS =								\
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS=--sgml-mode --output-format=xml
 
+# Extra options to supply to gtkdoc-mkhtml
+MKHTML_OPTIONS=--path="$(abs_builddir)"
+
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =						\
 	version.xml
diff --git a/docs/reference/libtracker-extract/Makefile.am b/docs/reference/libtracker-extract/Makefile.am
index 8f01a10..b161d10 100644
--- a/docs/reference/libtracker-extract/Makefile.am
+++ b/docs/reference/libtracker-extract/Makefile.am
@@ -12,7 +12,7 @@ DOC_MAIN_SGML_FILE = libtracker-extract-docs.sgml
 SCAN_OPTIONS=--deprecated-guards="TRACKER_DISABLE_DEPRECATED"
 
 # Extra options to pass to gtkdoc-scangobj
-# SCANGOBJ_OPTIONS=--type-init-func="gtk_type_init(0)" 
+# SCANGOBJ_OPTIONS=--type-init-func="gtk_type_init(0)"
 
 # The directory containing the source code. Relative to $(srcdir)
 DOC_SOURCE_DIR = ../../../src/libtracker-extract
@@ -40,6 +40,9 @@ GTKDOC_LIBS =								\
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS = --sgml-mode --output-format=xml
 
+# Extra options to supply to gtkdoc-mkhtml
+MKHTML_OPTIONS=--path="$(abs_builddir)"
+
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =						\
 	version.xml
diff --git a/docs/reference/libtracker-miner/Makefile.am b/docs/reference/libtracker-miner/Makefile.am
index 650b6f3..45111cf 100644
--- a/docs/reference/libtracker-miner/Makefile.am
+++ b/docs/reference/libtracker-miner/Makefile.am
@@ -12,7 +12,7 @@ DOC_MAIN_SGML_FILE=libtracker-miner-docs.sgml
 # SCAN_OPTIONS=--deprecated-guards="G_GNUC_DEPRECATED"
 
 # Extra options to pass to gtkdoc-scangobj
-# SCANGOBJ_OPTIONS=--type-init-func="gtk_type_init(0)" 
+# SCANGOBJ_OPTIONS=--type-init-func="gtk_type_init(0)"
 
 # The directory containing the source code. Relative to $(srcdir)
 DOC_SOURCE_DIR=../../../src/libtracker-miner
@@ -56,6 +56,9 @@ GTKDOC_LIBS =								\
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS=--sgml-mode --output-format=xml
 
+# Extra options to supply to gtkdoc-mkhtml
+MKHTML_OPTIONS=--path="$(abs_builddir)"
+
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =						\
 	version.xml
diff --git a/docs/reference/ontology/Makefile.am b/docs/reference/ontology/Makefile.am
index 59b55fc..f753749 100644
--- a/docs/reference/ontology/Makefile.am
+++ b/docs/reference/ontology/Makefile.am
@@ -2,6 +2,72 @@ include $(top_srcdir)/Makefile.decl
 
 AUTOMAKE_OPTIONS = 1.6
 
+# Generation of ontology.png using ontology-graph
+ontology.png:
+	$(top_builddir)/docs/tools/ontology-graph 			\
+		-d $(top_srcdir)/data/ontologies 			\
+		-o ontology.dot
+	$(AM_V_GEN) $(GRAPHVIZ_FDP) -Tpng -o $@ ontology.dot
+	rm ontology.dot
+
+# Generation of the additional PNG files from DIA files
+#  (list of original '.dia' files with '.png' extension)
+ONTOLOGY_DIAGRAMS =							\
+	$(top_srcdir)/docs/ontologies/notation.dia			\
+	$(top_srcdir)/docs/ontologies/mfo/feeds-overview.dia		\
+	$(top_srcdir)/docs/ontologies/nmm/radio-overview.dia		\
+	$(top_srcdir)/docs/ontologies/nmm/images-overview.dia		\
+	$(top_srcdir)/docs/ontologies/mlo/location-overview.dia		\
+	$(top_srcdir)/docs/ontologies/nie/overview.dia			\
+	$(top_srcdir)/docs/ontologies/nmo/message-class-overview.dia	\
+	$(top_srcdir)/docs/ontologies/nmo/email-mimeparts-overview.dia
+
+# The wanted PNG files
+ONTOLOGY_DIAGRAMS_PNG = $(notdir $(ONTOLOGY_DIAGRAMS:.dia=.png))
+
+# DIA to PNG conversion
+$(ONTOLOGY_DIAGRAMS_PNG): $(ONTOLOGY_DIAGRAMS)
+	dia -t png $^ 2>/dev/null
+
+# The original Ontology explanation files
+ONTOLOGY_EXPLANATIONS = 						\
+	$(top_srcdir)/docs/ontologies/mfo/explanation.xml		\
+	$(top_srcdir)/docs/ontologies/nmm/explanation.xml		\
+	$(top_srcdir)/docs/ontologies/mlo/explanation.xml		\
+	$(top_srcdir)/docs/ontologies/nie/explanation.xml		\
+	$(top_srcdir)/docs/ontologies/nmm/explanation.xml		\
+	$(top_srcdir)/docs/ontologies/nmo/explanation.xml
+
+# The XMLs to generate from the Ontology info
+ONTOLOGY_INFOS_XML =							\
+	fts-properties.xml						\
+	nie-ontology.xml						\
+	nco-ontology.xml						\
+	nmo-ontology.xml						\
+	nfo-ontology.xml						\
+	nao-ontology.xml						\
+	mto-ontology.xml						\
+	nmm-ontology.xml						\
+	mfo-ontology.xml						\
+	mlo-ontology.xml						\
+	tracker-ontology.xml						\
+	maemo-ontology.xml						\
+	ncal-ontology.xml						\
+	scal-ontology.xml						\
+	xsd-ontology.xml
+
+# Generation of the ontology XML files.
+gen-doc.stamp: $(ONTOLOGY_EXPLANATIONS)
+	$(top_srcdir)/docs/tools/gen-doc.sh 				\
+		$(top_builddir)/docs/tools/ttl2sgml			\
+		$(top_srcdir)/data/ontologies 				\
+		$(top_srcdir)/docs/ontologies 				\
+			.
+	$(AM_V_GEN) touch $@
+
+# Make the final XML files depend on the stamp
+$(ONTOLOGY_INFOS_XML): gen-doc.stamp
+
 # The name of the module.
 DOC_MODULE = ontology
 
@@ -14,44 +80,40 @@ DOC_SOURCE_DIR = .
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS = --sgml-mode --output-format=xml
 
+# Extra options to supply to gtkdoc-mkhtml
+MKHTML_OPTIONS=--path="$(abs_builddir)"
+
+# Images to copy into HTML directory
+HTML_IMAGES = 								\
+	$(ONTOLOGY_DIAGRAMS_PNG)					\
+	ontology.png
+
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
-content_files =						\
-	fts-properties.xml				\
-	nie-ontology.xml				\
-	nco-ontology.xml				\
-	nmo-ontology.xml				\
-	nfo-ontology.xml				\
-	nao-ontology.xml				\
-	mto-ontology.xml				\
-	nmm-ontology.xml				\
-	mfo-ontology.xml				\
-	mlo-ontology.xml				\
-	tracker-ontology.xml				\
-	maemo-ontology.xml				\
-	ncal-ontology.xml				\
-	scal-ontology.xml				\
-	xsd-ontology.xml				\
+#  Note that PNG files are also added in content_files so that
+#  the documentation is not built before the PNGs.
+content_files =								\
+	$(ONTOLOGY_INFOS_XML) 						\
+	$(HTML_IMAGES)							\
 	version.xml
 
 expand_content_files =
 
-ONTOLOGY_DIAGRAMS = 					\
-	notation.png					\
-	feeds-overview.png				\
-	radio-overview.png				\
-	images-overview.png				\
-	location-overview.png				\
-	overview.png					\
-	message-class-overview.png			\
-	email-mimeparts-overview.png
-
-# Images to copy into HTML directory
-HTML_IMAGES = ontology.png notation.png $(ONTOLOGY_DIAGRAMS)
-
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS =
 
 include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
-EXTRA_DIST += version.xml.in $(HTML_IMAGES)
+# Note that HTML_FILES and content_files are already included
+#  by gtk-doc
+EXTRA_DIST += 								\
+	gen-doc.stamp							\
+	version.xml.in							\
+	$(ONTOLOGY_DIAGRAMS)						\
+	$(ONTOLOGY_EXPLANATIONS)
+
+# PNGs and XMLs generated are removed only in maintainer-clean
+MAINTAINERCLEANFILES = 							\
+	$(HTML_IMAGES)							\
+	$(ONTOLOGY_INFOS_XML) 						\
+	gen-doc.stamp
\ No newline at end of file
diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am
index ab625d2..9a515f3 100644
--- a/docs/tools/Makefile.am
+++ b/docs/tools/Makefile.am
@@ -7,6 +7,9 @@ INCLUDES = 								\
 	-DTRACKER_COMPILATION						\
 	-DTOP_SRCDIR=\"$(top_srcdir)\"					\
 	-I$(top_srcdir)/src						\
+	-I$(top_builddir)/src						\
+	-I$(top_builddir)/src/libtracker-client				\
+	-I$(top_builddir)/src/libtracker-data				\
 	$(WARN_CFLAGS)							\
 	$(GLIB2_CFLAGS)							\
 	$(GIO_CFLAGS)							\
@@ -40,50 +43,4 @@ ttl2sgml_LDADD = 							\
 	$(GLIB2_LIBS)							\
 	$(GIO_LIBS)
 
-gen-doc.stamp: ttl2sgml
-	$(top_srcdir)/docs/tools/gen-doc.sh
-	$(AM_V_GEN) touch $@
-
-ontology.dot: ontology-graph
-	$(AM_V_GEN) ./ontology-graph -d $(top_srcdir)/data/ontologies -o ontology.dot
-
-ontology.png: ontology.dot
-	$(AM_V_GEN)$(GRAPHVIZ_FDP) -Tpng -o ontology.png ontology.dot
-	cp ontology.png $(top_builddir)/docs/reference/ontology/
-
-#
-# The origianal diagram but with .png extension
-# Horrible, i know.
-#
-ONTOLOGY_DIAGRAMS=							\
-	../ontologies/notation.png					\
-	../ontologies/mfo/feeds-overview.png				\
-	../ontologies/nmm/radio-overview.png				\
-	../ontologies/nmm/images-overview.png				\
-	../ontologies/mlo/location-overview.png				\
-	../ontologies/nie/overview.png					\
-	../ontologies/nmo/message-class-overview.png			\
-	../ontologies/nmo/email-mimeparts-overview.png
-
-.dia.png:
-	dia -t png $<
-	cp $(notdir $(<:.dia=.png)) $@
-	cp $@ $(top_builddir)/docs/reference/ontology
-
-BUILT_SOURCES = 							\
-	$(ONTOLOGY_DIAGRAMS)						\
-	ontology.png							\
-	gen-doc.stamp
-
-EXTRA_DIST = 								\
-	$(ONTOLOGY_DIAGRAMS)						\
-	gen-doc.sh
-
-DISTCLEANFILES = 							\
-	ontology.dot							\
-	$(top_builddir)/docs/reference/ontology/notation.png		\
-	$(top_builddir)/docs/reference/ontology/ontology.png
-
-CLEANFILES = $(BUILT_SOURCES) $(notdir $(ONTOLOGY_DIAGRAMS:.dia=.png))
-
-make-hook: ontology-graph ontology.dot ontology.png
+EXTRA_DIST = gen-doc.sh
diff --git a/docs/tools/gen-doc.sh b/docs/tools/gen-doc.sh
index 6f4e7a0..226eb52 100755
--- a/docs/tools/gen-doc.sh
+++ b/docs/tools/gen-doc.sh
@@ -16,16 +16,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA. 
+# 02110-1301, USA.
 #
 
-BUILD_DIR="../reference/ontology/"
-
-if ! [ -e $PWD/gen-doc.sh ]; then
-	# building documentation out of tree is not supported
-	# as documentation is distributed in release tarballs
-	exit
-fi
+TTL2SGML=$1
+ONTOLOGIES_DATA_DIR=$2
+ONTOLOGIES_INFO_DIR=$3
+BUILD_DIR=$4
 
 echo "Preparing file full text index properties (fts-properties.xml)"
 
@@ -45,14 +42,14 @@ echo "<?xml version='1.0' encoding='UTF-8'?>
 
 <tbody>" > $BUILD_DIR/fts-properties.xml
 
-for f in `find ../../data/ontologies -name "*.description"` ; do
+for f in `find $ONTOLOGIES_DATA_DIR -name "*.description"` ; do
     # ../../data/ontologies/XX-aaa.description -> PREFIX=aaa
     TMPNAME=${f%.description}
     PREFIX=${TMPNAME#*-}
     echo "Generating $PREFIX documentation"
 
-    ./ttl2sgml -d $f -o $BUILD_DIR/$PREFIX-ontology.xml -f $BUILD_DIR/fts-properties.xml \
-	-e ../../docs/ontologies/$PREFIX/explanation.xml
+    $TTL2SGML -d $f -o $BUILD_DIR/$PREFIX-ontology.xml -f $BUILD_DIR/fts-properties.xml \
+	-e $ONTOLOGIES_INFO_DIR/$PREFIX/explanation.xml
 done
 
 echo "</tbody></table></chapter>" >> $BUILD_DIR/fts-properties.xml
diff --git a/examples/libtracker-extract/Makefile.am b/examples/libtracker-extract/Makefile.am
index dbf9236..604a60f 100644
--- a/examples/libtracker-extract/Makefile.am
+++ b/examples/libtracker-extract/Makefile.am
@@ -5,6 +5,8 @@ modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/extract-modules
 
 INCLUDES = 								\
 	-I$(top_srcdir)/src 						\
+	-I$(top_builddir)/src						\
+	-I$(top_builddir)/src/libtracker-client				\
 	$(WARN_CFLAGS)							\
 	$(GLIB2_CFLAGS)							\
 	$(GCOV_CFLAGS)
diff --git a/examples/libtracker-miner/Makefile.am b/examples/libtracker-miner/Makefile.am
index 72300ed..9bac048 100644
--- a/examples/libtracker-miner/Makefile.am
+++ b/examples/libtracker-miner/Makefile.am
@@ -5,6 +5,8 @@ INCLUDES =							\
 	-DG_LOG_DOMAIN=\"Tracker\"				\
 	-DTRACKER_COMPILATION					\
 	-I$(top_srcdir)/src					\
+	-I$(top_builddir)/src					\
+	-I$(top_builddir)/src/libtracker-client			\
 	$(WARN_CFLAGS)						\
 	$(GLIB2_CFLAGS)						\
 	$(GCOV_CFLAGS)						\
diff --git a/src/libtracker-client/Makefile.am b/src/libtracker-client/Makefile.am
index 3bfb826..d3b2b83 100644
--- a/src/libtracker-client/Makefile.am
+++ b/src/libtracker-client/Makefile.am
@@ -5,10 +5,11 @@ INCLUDES = 						\
 	-DG_LOG_DOMAIN=\"Tracker\"			\
 	-DTRACKER_COMPILATION				\
 	-I$(top_srcdir)/src				\
+	-I$(top_builddir)/src/libtracker-client		\
 	$(WARN_CFLAGS)					\
 	$(GLIB2_CFLAGS)					\
 	$(GCOV_CFLAGS)					\
-	$(DBUS_CFLAGS)			
+	$(DBUS_CFLAGS)
 
 lib_LTLIBRARIES = libtracker-client- TRACKER_API_VERSION@.la
 
diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am
index f2ed878..b53cae9 100644
--- a/src/libtracker-data/Makefile.am
+++ b/src/libtracker-data/Makefile.am
@@ -5,6 +5,8 @@ INCLUDES =								\
 	-DG_LOG_DOMAIN=\"Tracker\"					\
 	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
+	-I$(top_builddir)/src						\
+	-I$(top_builddir)/src/libtracker-client				\
 	$(WARN_CFLAGS)							\
 	$(GLIB2_CFLAGS)							\
 	$(DBUS_CFLAGS)							\
@@ -55,9 +57,9 @@ vapi_sources =								\
 	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi			\
 	$(top_srcdir)/src/libtracker-common/libtracker-common.vapi	\
 	$(top_srcdir)/src/libtracker-db/libtracker-db.vapi		\
-	libtracker-data.vapi 
+	libtracker-data.vapi
 
-libtracker-data.vala.stamp: $(libtracker_data_la_VALASOURCES) $(vapi_sources) 
+libtracker-data.vala.stamp: $(libtracker_data_la_VALASOURCES) $(vapi_sources)
 	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) -H tracker-sparql-query.h $^
 	touch $@
 
@@ -76,7 +78,7 @@ libtracker_data_la_LIBADD = 						\
 MAINTAINERCLEANFILES =							\
 	libtracker-data.vala.stamp					\
 	$(libtracker_data_la_VALASOURCES:.vala=.c)			\
-	tracker-sparql-query.h					\
+	tracker-sparql-query.h						\
 	$(NULL)
 
 EXTRA_DIST = $(libtracker_data_la_VALASOURCES)				\
diff --git a/src/libtracker-extract/Makefile.am b/src/libtracker-extract/Makefile.am
index 8d02c20..2f6caef 100644
--- a/src/libtracker-extract/Makefile.am
+++ b/src/libtracker-extract/Makefile.am
@@ -5,6 +5,7 @@ INCLUDES =						\
 	-DG_LOG_DOMAIN=\"Tracker\"			\
 	-DTRACKER_COMPILATION				\
 	-I$(top_srcdir)/src				\
+	-I$(top_builddir)/src				\
 	$(WARN_CFLAGS)					\
 	$(GLIB2_CFLAGS)					\
 	$(GCOV_CFLAGS)					\
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index c57d299..5d6daa7 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -7,6 +7,8 @@ INCLUDES =						\
 	-DTRACKER_COMPILATION				\
 	-DTRACKER_MINERS_DIR=\""$(datadir)/tracker/miners"\" 	\
 	-I$(top_srcdir)/src				\
+	-I$(top_builddir)/src				\
+	-I$(top_builddir)/src/libtracker-client		\
 	$(WARN_CFLAGS)					\
 	$(GLIB2_CFLAGS)					\
 	$(GCOV_CFLAGS)					\
diff --git a/src/miners/flickr/Makefile.am b/src/miners/flickr/Makefile.am
index 97de85f..b9b136c 100644
--- a/src/miners/flickr/Makefile.am
+++ b/src/miners/flickr/Makefile.am
@@ -9,6 +9,8 @@ INCLUDES =								\
 	-DG_LOG_DOMAIN=\"Tracker\"					\
 	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
+	-I$(top_builddir)/src						\
+	-I$(top_builddir)/src/libtracker-client				\
 	$(WARN_CFLAGS)							\
 	$(GMODULE_CFLAGS)						\
 	$(PANGO_CFLAGS)							\
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index b66035d..8022b2a 100644
--- a/src/miners/fs/Makefile.am
+++ b/src/miners/fs/Makefile.am
@@ -9,6 +9,8 @@ INCLUDES =								\
 	-DG_LOG_DOMAIN=\"Tracker\"					\
 	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
+	-I$(top_builddir)/src						\
+	-I$(top_builddir)/src/libtracker-client				\
 	$(WARN_CFLAGS)							\
 	$(GMODULE_CFLAGS)						\
 	$(DBUS_CFLAGS)							\
@@ -27,7 +29,7 @@ tracker_miner_fs_SOURCES =						\
 	tracker-miner-files.c						\
 	tracker-miner-files.h						\
 	tracker-miner-files-reindex.c					\
-	tracker-miner-files-reindex.h					
+	tracker-miner-files-reindex.h
 
 tracker_miner_fs_LDADD =						\
 	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
diff --git a/src/miners/rss/Makefile.am b/src/miners/rss/Makefile.am
index f850ae6..d19019a 100644
--- a/src/miners/rss/Makefile.am
+++ b/src/miners/rss/Makefile.am
@@ -9,6 +9,8 @@ INCLUDES =								\
 	-DG_LOG_DOMAIN=\"Tracker\"					\
 	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
+	-I$(top_builddir)/src						\
+	-I$(top_builddir)/src/libtracker-client				\
 	$(WARN_CFLAGS)							\
 	$(GMODULE_CFLAGS)						\
 	$(DBUS_CFLAGS)							\
diff --git a/src/plugins/evolution/Makefile.am b/src/plugins/evolution/Makefile.am
index c048cad..7db1433 100644
--- a/src/plugins/evolution/Makefile.am
+++ b/src/plugins/evolution/Makefile.am
@@ -6,6 +6,8 @@ INCLUDES =								\
 	-DLOCALEDIR="\"$(localedir)\""					\
 	-DG_LOG_DOMAIN=\"Tracker\"					\
 	-DTRACKER_COMPILATION						\
+	-I$(top_builddir)/src						\
+	-I$(top_builddir)/src/libtracker-client				\
 	$(WARN_CFLAGS)							\
 	$(DBUS_CFLAGS)							\
 	$(EVOLUTION_PLUGIN_CFLAGS)					\
@@ -30,7 +32,7 @@ module_flags = -module -avoid-version -no-undefined
 
 liborg_freedesktop_Tracker_evolution_plugin_la_SOURCES = 		\
 	tracker-evolution-plugin.c 			 		\
-	tracker-evolution-plugin.h					
+	tracker-evolution-plugin.h
 
 liborg_freedesktop_Tracker_evolution_plugin_la_LDFLAGS = -module -avoid-version
 liborg_freedesktop_Tracker_evolution_plugin_la_LIBADD = 		\
diff --git a/src/plugins/kmail/Makefile.am b/src/plugins/kmail/Makefile.am
index 3f1ea63..f96e59e 100644
--- a/src/plugins/kmail/Makefile.am
+++ b/src/plugins/kmail/Makefile.am
@@ -5,6 +5,8 @@ INCLUDES = -I$(top_srcdir)/src						\
 	-DLOCALEDIR="\"$(localedir)\""					\
 	-DG_LOG_DOMAIN=\"Tracker\"					\
 	-DTRACKER_COMPILATION						\
+	-I$(top_builddir)/src						\
+	-I$(top_builddir)/src/libtracker-client				\
 	$(WARN_CFLAGS)							\
 	$(DBUS_CFLAGS)							\
 	$(GCOV_CFLAGS)
diff --git a/src/plugins/nautilus/Makefile.am b/src/plugins/nautilus/Makefile.am
index ba67003..566ad5e 100644
--- a/src/plugins/nautilus/Makefile.am
+++ b/src/plugins/nautilus/Makefile.am
@@ -2,6 +2,8 @@ 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 5593a3c..b3445d5 100644
--- a/src/tracker-control/Makefile.am
+++ b/src/tracker-control/Makefile.am
@@ -5,6 +5,8 @@ INCLUDES =								\
 	-DG_LOG_DOMAIN=\"Tracker\"					\
 	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
+	-I$(top_builddir)/src						\
+	-I$(top_builddir)/src/libtracker-client				\
 	$(WARN_CFLAGS)							\
 	$(GCOV_CFLAGS)							\
 	$(DBUS_CFLAGS)							\
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index 37454ba..16db788 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -9,6 +9,8 @@ INCLUDES = 								\
 	-DG_LOG_DOMAIN=\"Tracker\"					\
 	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src 						\
+	-I$(top_builddir)/src						\
+	-I$(top_builddir)/src/libtracker-client				\
 	$(WARN_CFLAGS)							\
 	$(GLIB2_CFLAGS)							\
 	$(GCOV_CFLAGS)							\
diff --git a/src/tracker-search-bar/Makefile.am b/src/tracker-search-bar/Makefile.am
index 7a7fe3d..aea47c0 100644
--- a/src/tracker-search-bar/Makefile.am
+++ b/src/tracker-search-bar/Makefile.am
@@ -16,6 +16,8 @@ tracker_search_bar_CFLAGS = \
 	-DPKGDATADIR=\""$(pkgdatadir)"\"	 		\
 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\
 	-I$(top_srcdir)/src					\
+	-I$(top_builddir)/src					\
+	-I$(top_builddir)/src/libtracker-client			\
 	$(TRACKER_APPS_CFLAGS)					\
 	$(TRACKER_APPLETS_CFLAGS)				\
 	$(GDKPIXBUF_CFLAGS)					\
diff --git a/src/tracker-search-tool/Makefile.am b/src/tracker-search-tool/Makefile.am
index 9e9341a..5a8b561 100644
--- a/src/tracker-search-tool/Makefile.am
+++ b/src/tracker-search-tool/Makefile.am
@@ -29,7 +29,7 @@ tracker_search_tool_CFLAGS = \
 	$(GDKPIXBUF_CFLAGS)					\
 	$(WARN_CFLAGS)						\
 	$(GCOV_CFLAGS)						\
-	-include$(top_srcdir)/config.h  			\
+	-include$(top_builddir)/config.h  			\
 	$(NULL)
 
 tracker_search_tool_LDADD = 					\
diff --git a/src/tracker-status-icon/Makefile.am b/src/tracker-status-icon/Makefile.am
index f60e21f..797cbc9 100644
--- a/src/tracker-status-icon/Makefile.am
+++ b/src/tracker-status-icon/Makefile.am
@@ -7,6 +7,8 @@ INCLUDES =								\
 	-DTRACKER_LIBEXECDIR=\""$(libexecdir)"\" 			\
 	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
+	-I$(top_builddir)/src						\
+	-I$(top_builddir)/src/libtracker-client				\
 	$(TRACKER_APPS_CFLAGS)						\
 	$(PANGO_CFLAGS)							\
 	$(WARN_CFLAGS)							\
diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am
index 9aa80d2..edf3ed8 100644
--- a/src/tracker-store/Makefile.am
+++ b/src/tracker-store/Makefile.am
@@ -8,6 +8,8 @@ INCLUDES =								\
 	-DG_LOG_DOMAIN=\"Tracker\"					\
 	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
+	-I$(top_builddir)/src						\
+	-I$(top_builddir)/src/libtracker-data				\
 	$(WARN_CFLAGS)							\
 	$(GLIB2_CFLAGS)							\
 	$(GTHREAD_CFLAGS)						\
diff --git a/src/tracker-utils/Makefile.am b/src/tracker-utils/Makefile.am
index 5530f33..dab2ab6 100644
--- a/src/tracker-utils/Makefile.am
+++ b/src/tracker-utils/Makefile.am
@@ -5,6 +5,8 @@ INCLUDES =								\
 	-DG_LOG_DOMAIN=\"Tracker\"					\
 	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
+	-I$(top_builddir)/src						\
+	-I$(top_builddir)/src/libtracker-client				\
 	$(WARN_CFLAGS)							\
 	$(GCOV_CFLAGS)							\
 	$(DBUS_CFLAGS)							\
diff --git a/src/tracker-writeback/Makefile.am b/src/tracker-writeback/Makefile.am
index 368e465..76e37c3 100644
--- a/src/tracker-writeback/Makefile.am
+++ b/src/tracker-writeback/Makefile.am
@@ -10,6 +10,8 @@ INCLUDES = 								\
 	-DTRACKER_COMPILATION						\
 	-DWRITEBACK_MODULES_DIR=\""$(modulesdir)"\" 			\
 	-I$(top_srcdir)/src 						\
+	-I$(top_builddir)/src						\
+	-I$(top_builddir)/src/libtracker-client				\
 	$(TRACKER_APPS_CFLAGS)						\
 	$(WARN_CFLAGS)							\
 	$(GLIB2_CFLAGS)							\
diff --git a/tests/libtracker-data/Makefile.am b/tests/libtracker-data/Makefile.am
index 5ac1569..6f0d44c 100644
--- a/tests/libtracker-data/Makefile.am
+++ b/tests/libtracker-data/Makefile.am
@@ -37,6 +37,8 @@ INCLUDES = 								\
 	-DG_LOG_DOMAIN=\"Tracker\"					\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/tests/common					\
+	-I$(top_builddir)/src						\
+	-I$(top_builddir)/src/libtracker-client				\
 	$(WARN_CFLAGS)							\
 	$(GCOV_CFLAGS)							\
 	$(DBUS_CFLAGS)							\
diff --git a/tests/libtracker-extract/Makefile.am b/tests/libtracker-extract/Makefile.am
index dbe2193..13ee713 100644
--- a/tests/libtracker-extract/Makefile.am
+++ b/tests/libtracker-extract/Makefile.am
@@ -11,6 +11,8 @@ INCLUDES = 								\
 	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/tests/common					\
+	-I$(top_builddir)/src						\
+	-I$(top_builddir)/src/libtracker-client				\
 	$(WARN_CFLAGS)							\
 	$(GLIB2_CFLAGS)							\
 	$(GCOV_CFLAGS)							\
diff --git a/tests/libtracker-fts/Makefile.am b/tests/libtracker-fts/Makefile.am
index ac8ec9c..1d39f2a 100644
--- a/tests/libtracker-fts/Makefile.am
+++ b/tests/libtracker-fts/Makefile.am
@@ -16,6 +16,8 @@ INCLUDES = 								\
 	-DG_LOG_DOMAIN=\"Tracker\"					\
 	-I$(top_srcdir)/src						\
 	-I$(top_srcdir)/tests/common					\
+	-I$(top_builddir)/src						\
+	-I$(top_builddir)/src/libtracker-client				\
 	$(WARN_CFLAGS)							\
 	$(GCOV_CFLAGS)							\
 	$(DBUS_CFLAGS)							\
diff --git a/tests/libtracker-miner/Makefile.am b/tests/libtracker-miner/Makefile.am
index 9f06354..3c1e938 100644
--- a/tests/libtracker-miner/Makefile.am
+++ b/tests/libtracker-miner/Makefile.am
@@ -19,6 +19,8 @@ INCLUDES =									\
 	-I$(top_srcdir)/src							\
 	-I$(top_srcdir)/tests/common						\
 	-I$(top_builddir)/src/tracker-store					\
+	-I$(top_builddir)/src							\
+	-I$(top_builddir)/src/libtracker-client					\
 	$(WARN_CFLAGS)								\
 	$(GCOV_CFLAGS)								\
 	$(GLIB2_CFLAGS)								\
diff --git a/tests/tracker-miner-fs/Makefile.am b/tests/tracker-miner-fs/Makefile.am
index e407126..f0706e5 100644
--- a/tests/tracker-miner-fs/Makefile.am
+++ b/tests/tracker-miner-fs/Makefile.am
@@ -24,7 +24,7 @@ INCLUDES = 									\
 
 tracker_metadata_utils_SOURCES = 						\
 	$(top_srcdir)/src/miners/fs/tracker-config.c				\
-	$(top_srcdir)/src/miners/fs/tracker-marshal.c				\
+	$(top_builddir)/src/miners/fs/tracker-marshal.c				\
 	tracker-metadata-utils-test.c
 
 tracker_metadata_utils_LDADD =	                                        	\
diff --git a/utils/services/Makefile.am b/utils/services/Makefile.am
index cf155ce..e8db519 100644
--- a/utils/services/Makefile.am
+++ b/utils/services/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES = 								\
 	-DTRACKER_COMPILATION						\
 	-DTOP_SRCDIR=\"$(top_srcdir)\"					\
 	-I$(top_srcdir)/src						\
+	-I$(top_builddir)/src						\
 	$(WARN_CFLAGS)							\
 	$(GLIB2_CFLAGS)							\
 	$(GIO_CFLAGS)							\
@@ -32,7 +33,7 @@ data_validator_LDADD =							\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
 	$(DBUS_LIBS)							\
 	$(GLIB2_LIBS)							\
-	$(GIO_LIBS)							
+	$(GIO_LIBS)
 
 #qname_test_SOURCES = qname-test.c qname.c
 #qname_test_LDADD = 	$(DBUS_LIBS)					\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]