tracker r2157 - in branches/indexer-split: . src src/libinotify tests/common tests/libtracker-common tests/libtracker-db

[carlosg svn gnome org]

Author: carlosg
Date: Tue Aug 26 15:51:59 2008
New Revision: 2157
URL: http://svn.gnome.org/viewvc/tracker?rev=2157&view=rev

Log:
2008-08-26  Carlos Garnacho  <carlos imendio com>

        * src/Makefile.am:
        * src/libinotify/Makefile.am:
        * tests/common/Makefile.am:
        * tests/common/tracker-test-helpers.c:
        * tests/libtracker-common/Makefile.am:
        * tests/libtracker-db/Makefile.am: Fix distcheck, to some extent.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/Makefile.am
   branches/indexer-split/src/libinotify/Makefile.am
   branches/indexer-split/tests/common/Makefile.am
   branches/indexer-split/tests/common/tracker-test-helpers.c
   branches/indexer-split/tests/libtracker-common/Makefile.am
   branches/indexer-split/tests/libtracker-db/Makefile.am

Modified: branches/indexer-split/src/Makefile.am
==============================================================================
--- branches/indexer-split/src/Makefile.am	(original)
+++ branches/indexer-split/src/Makefile.am	Tue Aug 26 15:51:59 2008
@@ -35,6 +35,23 @@
 	tracker-thumbnailer			\
 	tracker-indexer				\
 	$(build_libtrackergtk)			\
-	$(build_tracker_gui)			\
 	$(build_trackerapplet) 			\
+	$(build_tracker_search_tool)		\
 	$(build_tracker_preferences)
+
+DIST_SUBDIRS = 					\
+	libstemmer				\
+	qdbm					\
+	libinotify				\
+	libtracker-common 			\
+	libtracker-db				\
+	libtracker				\
+	trackerd				\
+	tracker-utils				\
+	tracker-extract				\
+	tracker-thumbnailer			\
+	tracker-indexer				\
+	libtracker-gtk				\
+	tracker-applet	 			\
+	tracker-search-tool			\
+	tracker-preferences

Modified: branches/indexer-split/src/libinotify/Makefile.am
==============================================================================
--- branches/indexer-split/src/libinotify/Makefile.am	(original)
+++ branches/indexer-split/src/libinotify/Makefile.am	Tue Aug 26 15:51:59 2008
@@ -5,14 +5,16 @@
 
 noinst_LTLIBRARIES = libinotify.la
 
-libinotify_la_SOURCES = inotify-monitor.c 		\
-			inotify-handle.c 		\
-			inotify-listhash.c 		\
-			inotify-monitor.h		\
-			inotify-handle.h 		\
-			inotify-listhash.h 		\
-			inotify-log.h 			\
-			linux-inotify-syscalls.h
+libinotify_la_SOURCES = 		\
+	inotify-monitor.c 		\
+	inotify-handle.c 		\
+	inotify-listhash.c 		\
+	inotify-monitor.h		\
+	inotify-handle.h 		\
+	inotify-listhash.h 		\
+	inotify-log.h 			\
+	linux-inotify-syscalls.h	\
+	libinotify.h
 
 libinotify_la_LDFLAGS = -version-info 0:0:0
 libinotify_la_LIBADD = 					\

Modified: branches/indexer-split/tests/common/Makefile.am
==============================================================================
--- branches/indexer-split/tests/common/Makefile.am	(original)
+++ branches/indexer-split/tests/common/Makefile.am	Tue Aug 26 15:51:59 2008
@@ -3,6 +3,7 @@
 noinst_LTLIBRARIES = libtracker-testcommon.la
 
 INCLUDES = 				\
+	-DTEST_TEXT=\""$(top_srcdir)"/tests/libtracker-common/non-utf8.txt\"	\
 	-I.				\
 	$(GLIB2_CFLAGS)
 

Modified: branches/indexer-split/tests/common/tracker-test-helpers.c
==============================================================================
--- branches/indexer-split/tests/common/tracker-test-helpers.c	(original)
+++ branches/indexer-split/tests/common/tracker-test-helpers.c	Tue Aug 26 15:51:59 2008
@@ -49,7 +49,7 @@
         GMappedFile *file = NULL;
 
         if (!nonutf8_str) {
-                file = g_mapped_file_new ("./non-utf8.txt", FALSE, NULL);
+                file = g_mapped_file_new (TEST_TEXT, FALSE, NULL);
                 nonutf8_str = g_strdup (g_mapped_file_get_contents (file));
                 nonutf8_str [g_mapped_file_get_length (file) -1] = '\0';
                 g_mapped_file_free (file);

Modified: branches/indexer-split/tests/libtracker-common/Makefile.am
==============================================================================
--- branches/indexer-split/tests/libtracker-common/Makefile.am	(original)
+++ branches/indexer-split/tests/libtracker-common/Makefile.am	Tue Aug 26 15:51:59 2008
@@ -74,3 +74,5 @@
 	$(GTHREAD_LIBS)							\
 	$(PANGO_LIBS)							\
 	$(GLIB2_LIBS)							
+
+EXTRA_DIST = non-utf8.txt
\ No newline at end of file

Modified: branches/indexer-split/tests/libtracker-db/Makefile.am
==============================================================================
--- branches/indexer-split/tests/libtracker-db/Makefile.am	(original)
+++ branches/indexer-split/tests/libtracker-db/Makefile.am	Tue Aug 26 15:51:59 2008
@@ -27,7 +27,10 @@
 	$(GLIB2_CFLAGS)
 
 
-union_performance_SOURCES = union-performance.c
+union_performance_SOURCES = \
+	tracker-db-manager-common.h	\
+	tracker-db-manager-common.c	\
+	union-performance.c
 
 union_performance_LDADD =                                              \
 	$(top_builddir)/src/libtracker-db/libtracker-db.la              \