[tracker] Fixes GB#614981 - Make distcheck depend on important components

[Martyn James Russell <mr src gnome org>]

commit e052fe5078af8e851c5f75747ff00dfeac941570
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Apr 8 12:18:17 2010 +0100

    Fixes GB#614981 - Make distcheck depend on important components

 Makefile.am                                    |   20 ++++++++++++-
 tests/Makefile.am                              |    5 +++-
 tests/functional-tests/Makefile.am             |   34 +++++++++++------------
 tests/functional-tests/data/Images/Makefile.am |    2 -
 tests/functional-tests/data/Makefile.am        |    6 +---
 tests/functional-tests/data/Music/Makefile.am  |    2 -
 tests/tracker-writeback/Makefile.am            |    2 -
 7 files changed, 39 insertions(+), 32 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index feb929d..54f8d9a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,9 +57,25 @@ DISTCLEANFILES = 				\
 DISTCHECK_CONFIGURE_FLAGS =			\
 	--with-session-bus-services-dir="\$(datadir)"/dbus-1/services \
 	--disable-evolution-miner		\
-	--disable-deskbar-applet		\
 	--disable-nautilus-extension		\
-	--enable-gtk-doc
+	--enable-unit-tests			\
+	--enable-functional-tests		\
+	--enable-gtk-doc			\
+	--enable-miner-rss			\
+	--enable-unac				\
+	--enable-poppler-glib			\
+	--enable-exempi				\
+	--enable-libiptcdata			\
+	--enable-libjpeg			\
+	--enable-libtiff			\
+	--enable-libvorbis			\
+	--enable-libflac			\
+	--enable-libgsf				\
+	--enable-playlist			\
+	--enable-tracker-preferences		\
+	--enable-tracker-search-bar		\
+	--enable-tracker-status-icon		\
+	--with-enca
 
 if OLD_EXEC_REMOVE_ALL
 install-exec-hook:
diff --git a/tests/Makefile.am b/tests/Makefile.am
index cc536ca..cbdf251 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,5 +11,8 @@ SUBDIRS = 			\
 	tracker-miner-fs	\
 	tracker-extract		\
 	tracker-store		\
-	functional-tests	\
 	tracker-writeback
+
+if DIST_FUNCTIONAL_TESTS
+SUBDIRS += functional-tests
+endif
\ No newline at end of file
diff --git a/tests/functional-tests/Makefile.am b/tests/functional-tests/Makefile.am
index c18a8e1..4b2decb 100644
--- a/tests/functional-tests/Makefile.am
+++ b/tests/functional-tests/Makefile.am
@@ -2,25 +2,23 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = data
 
-if DIST_FUNCTIONAL_TESTS
 configdir = $(datadir)/tracker-tests
 
-config_SCRIPTS =		\
-	tests.xml		\
-	01-insertion.py		\
-	02-metacontacts.py	\
-	03-fts-functions.py	\
-	configuration.py	\
-	metadata_extraction_tc.py \
-	writeback-tc.py 	\
-	04-group-concat.py	\
-	05-coalesce.py		\
-	06-distance.py		\
-	07-graph.py		\
-	08-unique-insertions.py \
-	virtual-files-tc.py	\
-	performance-tc.py	\
-	bootup-tc.py
+config_SCRIPTS =			\
+	01-insertion.py			\
+	02-metacontacts.py		\
+	03-fts-functions.py		\
+	04-group-concat.py		\
+	05-coalesce.py			\
+	06-distance.py			\
+	07-graph.py			\
+	08-unique-insertions.py 	\
+	bootup-tc.py			\
+	configuration.py		\
+	metadata_extraction_tc.py 	\
+	performance-tc.py		\
+	tests.xml			\
+	virtual-files-tc.py		\
+	writeback-tc.py
 
 EXTRA_DIST = $(config_SCRIPTS)
-endif
diff --git a/tests/functional-tests/data/Images/Makefile.am b/tests/functional-tests/data/Images/Makefile.am
index f6ec4bf..8a33d7f 100644
--- a/tests/functional-tests/data/Images/Makefile.am
+++ b/tests/functional-tests/data/Images/Makefile.am
@@ -1,10 +1,8 @@
 include $(top_srcdir)/Makefile.decl
 
-if DIST_FUNCTIONAL_TESTS
 configdir = $(datadir)/tracker-tests/data/Images
 
 config_DATA =			\
 	test-image-1.jpg
 
 EXTRA_DIST = $(config_DATA)
-endif
diff --git a/tests/functional-tests/data/Makefile.am b/tests/functional-tests/data/Makefile.am
index d76ef21..aab62c8 100644
--- a/tests/functional-tests/data/Makefile.am
+++ b/tests/functional-tests/data/Makefile.am
@@ -1,10 +1,7 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = 		\
-	Music		\
-	Images
+SUBDIRS = Music Images
 
-if DIST_FUNCTIONAL_TESTS
 configdir = $(datadir)/tracker-tests/data
 
 config_DATA =			\
@@ -12,4 +9,3 @@ config_DATA =			\
 	pickled_Images
 
 EXTRA_DIST = $(config_DATA)
-endif
diff --git a/tests/functional-tests/data/Music/Makefile.am b/tests/functional-tests/data/Music/Makefile.am
index cb869e6..0166f9f 100644
--- a/tests/functional-tests/data/Music/Makefile.am
+++ b/tests/functional-tests/data/Music/Makefile.am
@@ -1,10 +1,8 @@
 include $(top_srcdir)/Makefile.decl
 
-if DIST_FUNCTIONAL_TESTS
 configdir = $(datadir)/tracker-tests/data/Music
 
 config_DATA =			\
 	tracker-mp3-test.mp3
 
 EXTRA_DIST = $(config_DATA)
-endif
diff --git a/tests/tracker-writeback/Makefile.am b/tests/tracker-writeback/Makefile.am
index 10975b9..9e54c3c 100644
--- a/tests/tracker-writeback/Makefile.am
+++ b/tests/tracker-writeback/Makefile.am
@@ -1,10 +1,8 @@
 include $(top_srcdir)/Makefile.decl
 
-if DIST_FUNCTIONAL_TESTS
 configdir = $(datadir)/tracker-tests
 
 config_SCRIPTS =		\
 	01-writeback.py		
 
 EXTRA_DIST = $(config_SCRIPTS)
-endif