tracker r2241 - in branches/indexer-split: . src/libtracker-common tests tests/tracker-indexer

[mr svn gnome org]

Author: mr
Date: Tue Sep 16 15:40:08 2008
New Revision: 2241
URL: http://svn.gnome.org/viewvc/tracker?rev=2241&view=rev

Log:
	* src/libtracker-common/tracker-ontology.c:
	(tracker_ontology_get_field_names_registered): Removed the NULL
	check since it is valid to pass NULL. Thanks to Ivan's tests to
	pointing this out before building :)

	* configure.ac:
	* tests/Makefile.am:
	* tests/tracker-indexer/Makefile.am: Fixed tests for make
	distcheck.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/configure.ac
   branches/indexer-split/src/libtracker-common/tracker-ontology.c
   branches/indexer-split/tests/Makefile.am
   branches/indexer-split/tests/tracker-indexer/Makefile.am

Modified: branches/indexer-split/configure.ac
==============================================================================
--- branches/indexer-split/configure.ac	(original)
+++ branches/indexer-split/configure.ac	Tue Sep 16 15:40:08 2008
@@ -959,17 +959,15 @@
                 tests/tracker-indexer/tracker-indexer.h:src/tracker-indexer/tracker-indexer.h
                 tests/tracker-indexer/tracker-indexer-db.c:src/tracker-indexer/tracker-indexer-db.c
                 tests/tracker-indexer/tracker-indexer-db.h:src/tracker-indexer/tracker-indexer-db.h
-                tests/tracker-indexer/tracker-indexer-glue.h:src/tracker-indexer/tracker-indexer-glue.h
                 tests/tracker-indexer/tracker-indexer-module.c:src/tracker-indexer/tracker-indexer-module.c
                 tests/tracker-indexer/tracker-indexer-module.h:src/tracker-indexer/tracker-indexer-module.h
-                tests/tracker-indexer/tracker-marshal.c:src/tracker-indexer/tracker-marshal.c
-                tests/tracker-indexer/tracker-marshal.h:src/tracker-indexer/tracker-marshal.h
 		tests/tracker-indexer/tracker-metadata.c:src/tracker-indexer/tracker-metadata.c 
                 tests/tracker-indexer/tracker-metadata.h:src/tracker-indexer/tracker-metadata.h
                 tests/tracker-indexer/tracker-metadata-utils.c:src/tracker-indexer/tracker-metadata-utils.c
                 tests/tracker-indexer/tracker-metadata-utils.h:src/tracker-indexer/tracker-metadata-utils.h
                 tests/tracker-indexer/tracker-module.h:src/tracker-indexer/tracker-module.h
 )
+
 ##################################################################
 # Write generated files
 ##################################################################

Modified: branches/indexer-split/src/libtracker-common/tracker-ontology.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-ontology.c	(original)
+++ branches/indexer-split/src/libtracker-common/tracker-ontology.c	Tue Sep 16 15:40:08 2008
@@ -396,8 +396,6 @@
 	const gchar    *prefix;
 	const gchar    *parent_prefix;
 
-	g_return_val_if_fail (service_str != NULL, NULL);
-
 	parent_prefix = NULL;
 
 	if (service_str) {

Modified: branches/indexer-split/tests/Makefile.am
==============================================================================
--- branches/indexer-split/tests/Makefile.am	(original)
+++ branches/indexer-split/tests/Makefile.am	Tue Sep 16 15:40:08 2008
@@ -1,10 +1,14 @@
 include $(top_srcdir)/Makefile.decl
 
+if ENABLE_SQLITE_FTS
+build_sqlite_fts = tracker-fts
+endif
+
 SUBDIRS = common 			\
 	libtracker-common		\
 	libtracker-db 			\
 	trackerd 			\
 	scripts 			\
-	tracker-fts   			\
+	$(build_sqlite_fts)		\
 	tracker-indexer
 

Modified: branches/indexer-split/tests/tracker-indexer/Makefile.am
==============================================================================
--- branches/indexer-split/tests/tracker-indexer/Makefile.am	(original)
+++ branches/indexer-split/tests/tracker-indexer/Makefile.am	Tue Sep 16 15:40:08 2008
@@ -18,19 +18,27 @@
 	$(GTHREAD_CFLAGS)						\
 	$(GLIB2_CFLAGS)			
 
+generated_files = 							\
+	tracker-indexer-glue.h						\
+	tracker-marshal.c						\
+	tracker-marshal.h
+
+$(generated_files):
+	rm -rf $@
+	ln -s $(top_srcdir)/src/tracker-indexer/$@ $@
+
+CLEANFILES = $(generated_files)
 
 tracker_metadata_utils_SOURCES = 					\
+	$(generated_files)						\
 	tracker-dbus.c							\
 	tracker-dbus.h							\
 	tracker-indexer.c						\
 	tracker-indexer.h						\
 	tracker-indexer-db.c						\
 	tracker-indexer-db.h						\
-	tracker-indexer-glue.h						\
 	tracker-indexer-module.c					\
 	tracker-indexer-module.h					\
-	tracker-marshal.c						\
-	tracker-marshal.h						\
 	tracker-metadata.c						\
 	tracker-metadata.h						\
 	tracker-metadata-utils.c 					\
@@ -48,4 +56,3 @@
 	$(GTHREAD_LIBS)							\
 	$(GIO_LIBS)							\
 	$(GLIB2_LIBS)							
-