tracker r2239 - in branches/indexer-split: . src/tracker-indexer tests/tracker-indexer

[mr svn gnome org]

Author: mr
Date: Tue Sep 16 12:22:37 2008
New Revision: 2239
URL: http://svn.gnome.org/viewvc/tracker?rev=2239&view=rev

Log:
	* configure.ac:
	* tests/tracker-indexer/Makefile.am: Fixed the test cases for the
	indexer since pvanhoof's merge requires tracker-dbus.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/configure.ac
   branches/indexer-split/src/tracker-indexer/tracker-dbus.h
   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 12:22:37 2008
@@ -953,11 +953,23 @@
 AC_SUBST(HILDON_THUMBNAIL_CFLAGS)
 AC_SUBST(HILDON_THUMBNAIL_LIBS)
 
-AC_CONFIG_LINKS(tests/tracker-indexer/tracker-metadata.c:src/tracker-indexer/tracker-metadata.c 
+AC_CONFIG_LINKS(tests/tracker-indexer/tracker-dbus.c:src/tracker-indexer/tracker-dbus.c
+                tests/tracker-indexer/tracker-dbus.h:src/tracker-indexer/tracker-dbus.h
+                tests/tracker-indexer/tracker-indexer.c:src/tracker-indexer/tracker-indexer.c
+                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-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/tracker-indexer/tracker-dbus.h
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-dbus.h	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-dbus.h	Tue Sep 16 12:22:37 2008
@@ -23,6 +23,7 @@
 #define __TRACKER_DBUS_H__
 
 #include <glib.h>
+
 #include <dbus/dbus-glib-bindings.h>
 
 G_BEGIN_DECLS

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 12:22:37 2008
@@ -4,27 +4,46 @@
 
 TEST_PROGS += tracker-metadata-utils
 
-INCLUDES = 				\
-	-g -DTEST			\
-	-DG_LOG_DOMAIN=\"Tracker\"	\
-	-DLIBDIR=\""$(libdir)"\"	\
-	-DLIBEXEC_PATH=\""$(libexecdir)"\"	\
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/tests/common	\
-	$(GMODULE_CFLAGS)		\
-	$(GTHREAD_CFLAGS)		\
+INCLUDES = 								\
+	-g -DTEST							\
+	-DG_LOG_DOMAIN=\"Tracker\"					\
+	-DINDEXER_MODULES_DIR=\""$(libdir)/tracker/indexer-modules"\"	\
+	-DLIBDIR=\""$(libdir)"\"					\
+	-DLIBEXEC_PATH=\""$(libexecdir)"\"				\
+	-I$(top_srcdir)/src						\
+	-I$(top_srcdir)/tests/common					\
+	$(DBUS_CFLAGS)							\
+	$(PANGO_CFLAGS)							\
+	$(GMODULE_CFLAGS)						\
+	$(GTHREAD_CFLAGS)						\
 	$(GLIB2_CFLAGS)			
 
 
-tracker_metadata_utils_SOURCES = 	\
-	tracker-metadata-utils-test.c 	\
-	tracker-metadata-utils.c 	\
-	tracker-metadata.c 		
+tracker_metadata_utils_SOURCES = 					\
+	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 					\
+	tracker-metadata-utils.h 					\
+	tracker-metadata-utils-test.c 					\
+	tracker-module.h
 
 tracker_metadata_utils_LDADD =	                                        \
 	$(top_builddir)/src/libtracker-db/libtracker-db.la 		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(top_builddir)/tests/common/libtracker-testcommon.la           \
+	$(DBUS_LIBS)							\
+	$(PANGO_LIBS)							\
 	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
 	$(GIO_LIBS)							\