[tracker] build: Fixed remaining distcheck issues with introspection

[Martyn James Russell <mr src gnome org>]

commit 1848afb581d75d048a95d7edf36d0f26e4d90493
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Apr 7 11:25:58 2011 +0100

    build: Fixed remaining distcheck issues with introspection
    
    Mostly this is about $top_srcdir vs $top_builddir for Vala vs C files

 src/libtracker-extract/Makefile.am |   12 ++++++------
 src/libtracker-miner/Makefile.am   |   20 ++++++++++----------
 src/libtracker-sparql/Makefile.am  |    5 ++++-
 3 files changed, 20 insertions(+), 17 deletions(-)
---
diff --git a/src/libtracker-extract/Makefile.am b/src/libtracker-extract/Makefile.am
index 94d9456..137fdd9 100644
--- a/src/libtracker-extract/Makefile.am
+++ b/src/libtracker-extract/Makefile.am
@@ -53,19 +53,19 @@ libtracker_extract_ TRACKER_API_VERSION@_la_LIBADD =   \
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = \
 	--warn-all \
-	-I $(top_builddir)/src \
+	-I $(top_srcdir)/src \
 	-D TRACKER_COMPILATION \
-	--c-include="libtracker-extract/tracker-extract.h" \
-	--add-include-path=$(top_builddir)/src/libtracker-sparql 
-INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/src/libtracker-sparql
+	--c-include="libtracker-extract/tracker-extract.h"
+
+INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)/src/libtracker-sparql
 
 if HAVE_INTROSPECTION
 INTROSPECTION_CFLAGS += $(AM_CPPFLAGS)
 introspection_sources = $(libtracker_extract_ TRACKER_API_VERSION@_la_SOURCES)
-
 TrackerExtract- TRACKER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) $(lib_LTLIBRARIES) Makefile
 TrackerExtract_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 GModule-2.0
-#TrackerExtract_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_PACKAGES = TrackerSparql-$(TRACKER_API_VERSION)
+TrackerExtract_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_SCANNERFLAGS = \
+	--include-uninstalled=$(top_srcdir)/src/libtracker-sparql/Tracker-$(TRACKER_API_VERSION).gir
 TrackerExtract_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_CFLAGS = $(INCLUDES)
 TrackerExtract_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_LIBS = $(lib_LTLIBRARIES)
 TrackerExtract_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_FILES = $(introspection_sources)
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index 899f62a..328f64b 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -135,17 +135,16 @@ EXTRA_DIST =                                           \
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = \
-	-I$(top_builddir)/src \
-	-DTRACKER_COMPILATION \
-	--c-include="libtracker-miner/tracker-miner.h" 			\
-	--add-include-path=$(top_builddir)/src/libtracker-sparql 	\
-	--identifier-prefix=TrackerProcessor				\
-	--symbol-prefix=tracker_processing				\
-	--identifier-prefix=Tracker					\
-	--symbol-prefix=tracker						\
+	-I $(top_srcdir)/src \
+	-D TRACKER_COMPILATION \
+	--c-include="libtracker-miner/tracker-miner.h" \
+	--identifier-prefix=TrackerProcessor \
+	--symbol-prefix=tracker_processing \
+	--identifier-prefix=Tracker \
+	--symbol-prefix=tracker \
 	--warn-all
 
-INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/src/libtracker-sparql
+INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)/src/libtracker-sparql
 
 if HAVE_INTROSPECTION
 INTROSPECTION_CFLAGS += $(AM_CPPFLAGS)
@@ -157,7 +156,8 @@ introspection_sources = \
 
 TrackerMiner- TRACKER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) $(lib_LTLIBRARIES) Makefile
 TrackerMiner_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 GModule-2.0 Gio-2.0
-#TrackerMiner_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_PACKAGES = TrackerSparql-$(TRACKER_API_VERSION)
+TrackerMiner_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_SCANNERFLAGS = \
+	--include-uninstalled=$(top_srcdir)/src/libtracker-sparql/Tracker-$(TRACKER_API_VERSION).gir
 TrackerMiner_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_CFLAGS = $(INCLUDES)
 TrackerMiner_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_NAMESPACE = "TrackerMiner"
 TrackerMiner_ TRACKER_MAJOR_VERSION@_ TRACKER_MINOR_VERSION@_gir_LIBS = $(lib_LTLIBRARIES)
diff --git a/src/libtracker-sparql/Makefile.am b/src/libtracker-sparql/Makefile.am
index cf9cee8..4ba7dcf 100644
--- a/src/libtracker-sparql/Makefile.am
+++ b/src/libtracker-sparql/Makefile.am
@@ -84,5 +84,8 @@ gir_DATA = Tracker-$(TRACKER_API_VERSION).gir
 typelibdir = $(libdir)/girepository-1.0
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
-CLEANFILES = $(gir_DATA) $(typelib_DATA)
+# We don't clean the gir/typelib data for *Vala* generated g-ir files.
+# However, we do for *C* generated g-ir files due to Vala not being
+# required when building from a tarball.
+EXTRA_DIST += $(gir_DATA) $(typelib_DATA)
 endif