GNOME.org
 

tracker r2801 - in trunk: . po src/plugins src/plugins/evolution tests/libtracker-common tests/tracker-extract tests/tracker-indexer tests/trackerd

Author: mr
Date: Fri Jan 16 12:03:24 2009
New Revision: 2801
URL: http://svn.gnome.org/viewvc/tracker?rev=2801&view=rev

Log:
	* POTFILES.in:

	* src/plugins/Makefile.am:
	* src/plugins/evolution/Makefile.am: Added glib test Makefile.decl
	includes to these new Makefiles so make distcheck doesn't fail.

	* tests/tracker-extract/Makefile.am: Include .h files needed in
	TEST_UTILS_SOURCES so they are not left out of the tarball and
	don't fail make distcheck.

	* tests/tracker-extract/tracker-extract-mp3-test.c:
	* tests/tracker-extract/tracker-extract-testsuite-generic.c: Some
	code clean ups.


Modified:
   trunk/ChangeLog
   trunk/po/ChangeLog
   trunk/po/POTFILES.in
   trunk/src/plugins/Makefile.am
   trunk/src/plugins/evolution/Makefile.am
   trunk/tests/libtracker-common/Makefile.am
   trunk/tests/tracker-extract/Makefile.am
   trunk/tests/tracker-extract/tracker-extract-mp3-test.c
   trunk/tests/tracker-extract/tracker-extract-testsuite-generic.c
   trunk/tests/tracker-indexer/Makefile.am
   trunk/tests/trackerd/Makefile.am

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Fri Jan 16 12:03:24 2009
@@ -10,6 +10,7 @@
 src/libtracker-common/tracker-utils.c
 src/libtracker-gtk/tracker-metadata-tile.c
 src/libtracker-gtk/tracker-tag-bar.c
+src/plugins/evolution/org-freedesktop-Tracker-evolution-plugin.eplug.xml
 src/tracker-applet/tracker-applet-prefs.glade
 src/tracker-applet/tracker-applet.c
 src/tracker-applet/tracker-applet.desktop.in.in

Modified: trunk/src/plugins/Makefile.am
==============================================================================
--- trunk/src/plugins/Makefile.am	(original)
+++ trunk/src/plugins/Makefile.am	Fri Jan 16 12:03:24 2009
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
 SUBDIRS = .
 
 if HAVE_EVOLUTION_PLUGIN

Modified: trunk/src/plugins/evolution/Makefile.am
==============================================================================
--- trunk/src/plugins/evolution/Makefile.am	(original)
+++ trunk/src/plugins/evolution/Makefile.am	Fri Jan 16 12:03:24 2009
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
 INCLUDES =						\
 	-I$(top_srcdir)/src				\
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""	\

Modified: trunk/tests/libtracker-common/Makefile.am
==============================================================================
--- trunk/tests/libtracker-common/Makefile.am	(original)
+++ trunk/tests/libtracker-common/Makefile.am	Fri Jan 16 12:03:24 2009
@@ -41,7 +41,7 @@
 	$(GTHREAD_LIBS)							\
 	$(GLIB2_LIBS)							
 
-tracker_dbus_SOURCES = \
+tracker_dbus_SOURCES = 							\
 	tracker-dbus-test.c
 
 tracker_dbus_LDADD =							\

Modified: trunk/tests/tracker-extract/Makefile.am
==============================================================================
--- trunk/tests/tracker-extract/Makefile.am	(original)
+++ trunk/tests/tracker-extract/Makefile.am	Fri Jan 16 12:03:24 2009
@@ -2,12 +2,6 @@
 
 noinst_PROGRAMS = $(TEST_PROGS)
 
-TEST_UTILS_SOURCES = tracker-extract-test-utils.c			\
-		     tracker-extract-testsuite-generic.c		\
-		     tracker-extract-testsuite-mp3.c
-
-
-
 TEST_PROGS += 								\
 	test-tracker-extract-mp3
 
@@ -28,9 +22,17 @@
 	$(PANGO_CFLAGS)							\
 	$(GLIB2_CFLAGS)
 
+test_utils_sources = 							\
+	tracker-extract-test-utils.c					\
+	tracker-extract-test-utils.h					\
+	tracker-extract-testsuite-generic.c				\
+	tracker-extract-testsuite-generic.h				\
+	tracker-extract-testsuite-mp3.c					\
+	tracker-extract-testsuite-mp3.h
+
 test_tracker_extract_mp3_SOURCES = 					\
 	tracker-extract-mp3-test.c					\
-	$(TEST_UTILS_SOURCES)
+	$(test_utils_sources)
 
 test_tracker_extract_mp3_LDADD =					\
 	$(top_builddir)/src/tracker-extract/libextract-mp3.la   	\
@@ -43,7 +45,7 @@
 
 test_tracker_extract_gstreamer_SOURCES = 				\
 	tracker-extract-gstreamer-test.c				\
-	$(TEST_UTILS_SOURCES)
+	$(test_utils_sources)
 
 test_tracker_extract_gstreamer_LDADD =					\
 	$(top_builddir)/src/tracker-extract/libextract-gstreamer.la   	\
@@ -53,4 +55,4 @@
 	$(GLIB2_LIBS)							\
 	$(GSTREAMER_LIBS)
 
-endif
\ No newline at end of file
+endif

Modified: trunk/tests/tracker-extract/tracker-extract-mp3-test.c
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-mp3-test.c	(original)
+++ trunk/tests/tracker-extract/tracker-extract-mp3-test.c	Fri Jan 16 12:03:24 2009
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <fcntl.h>
 #include <stdio.h>
+
 #include <glib.h>
 
 #include <tracker-extract/tracker-extract.h>
@@ -32,14 +33,13 @@
 int
 main (int argc, char **argv) {
 
+	TrackerExtractorData *data;
 	gint result;
 
 	g_type_init ();
 	g_thread_init (NULL);
 	g_test_init (&argc, &argv, NULL);
 
-	TrackerExtractorData *data;
-
 	g_test_message ("Testing extractor functionality");
 	g_test_add_func ("/tracker-extract/tracker-extract-mp3/check-extractor-data",
 			 test_tracker_extract_check_extractor_data);
@@ -66,7 +66,6 @@
 
 #endif
 
-
 	result = g_test_run ();
 
 	return result;

Modified: trunk/tests/tracker-extract/tracker-extract-testsuite-generic.c
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-testsuite-generic.c	(original)
+++ trunk/tests/tracker-extract/tracker-extract-testsuite-generic.c	Fri Jan 16 12:03:24 2009
@@ -18,11 +18,10 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#include "tracker-extract-testsuite-generic.h"
-
 #include <glib.h>
 
 #include "tracker-extract-test-utils.h"
+#include "tracker-extract-testsuite-generic.h"
 
 void
 test_tracker_extract_check_extractor_data (void)
@@ -30,7 +29,7 @@
 	TrackerExtractorData *data;
 	guint extractors = 0;
 
-	data = tracker_get_extractor_data();
+	data = tracker_get_extractor_data ();
 
 	while (data->mime) {
 		if (data->extractor == NULL) {

Modified: trunk/tests/tracker-indexer/Makefile.am
==============================================================================
--- trunk/tests/tracker-indexer/Makefile.am	(original)
+++ trunk/tests/tracker-indexer/Makefile.am	Fri Jan 16 12:03:24 2009
@@ -4,21 +4,21 @@
 
 TEST_PROGS += tracker-metadata-utils
 
-INCLUDES = 								\
-	-DTEST								\
-	-DG_LOG_DOMAIN=\"Tracker\"					\
-	-DINDEXER_MODULES_DIR=\""$(libdir)/tracker/indexer-modules"\"	\
-	-DLIBDIR=\""$(libdir)"\"					\
-	-DLIBEXEC_PATH=\""$(libexecdir)"\"				\
-	-DTRACKER_COMPILATION						\
-	-I$(top_srcdir)/src						\
-	-I$(top_srcdir)/tests/common					\
-	-I$(top_builddir)/src/tracker-indexer				\
-	$(DBUS_CFLAGS)							\
-	$(PANGO_CFLAGS)							\
-	$(GMODULE_CFLAGS)						\
-	$(GTHREAD_CFLAGS)						\
-	$(RAPTOR_CFLAGS)						\
+INCLUDES = 									\
+	-DTEST									\
+	-DG_LOG_DOMAIN=\"Tracker\"						\
+	-DINDEXER_MODULES_DIR=\""$(libdir)/tracker/indexer-modules"\"		\
+	-DLIBDIR=\""$(libdir)"\"						\
+	-DLIBEXEC_PATH=\""$(libexecdir)"\"					\
+	-DTRACKER_COMPILATION							\
+	-I$(top_srcdir)/src							\
+	-I$(top_srcdir)/tests/common						\
+	-I$(top_builddir)/src/tracker-indexer					\
+	$(DBUS_CFLAGS)								\
+	$(PANGO_CFLAGS)								\
+	$(GMODULE_CFLAGS)							\
+	$(GTHREAD_CFLAGS)							\
+	$(RAPTOR_CFLAGS)							\
 	$(GLIB2_CFLAGS)
 
 tracker_metadata_utils_SOURCES = 						\
@@ -34,15 +34,15 @@
 	$(top_srcdir)/src/tracker-indexer/tracker-removable-device.c		\
 	tracker-metadata-utils-test.c 					
 
-tracker_metadata_utils_LDADD =	                                        \
-	$(top_builddir)/src/libtracker-data/libtracker-data.la 		\
-	$(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)							\
-	$(RAPTOR_LIBS)							\
+tracker_metadata_utils_LDADD =	                                        	\
+	$(top_builddir)/src/libtracker-data/libtracker-data.la 			\
+	$(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)								\
+	$(RAPTOR_LIBS)								\
 	$(GLIB2_LIBS)							

Modified: trunk/tests/trackerd/Makefile.am
==============================================================================
--- trunk/tests/trackerd/Makefile.am	(original)
+++ trunk/tests/trackerd/Makefile.am	Fri Jan 16 12:03:24 2009
@@ -4,16 +4,16 @@
 
 noinst_PROGRAMS = $(TEST_PROGS)
 
-INCLUDES = \
-	-DG_LOG_DOMAIN=\"Tracker\" \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/trackerd \
-	-I$(top_srcdir)/tests/common	\
-	$(GMODULE_CFLAGS) \
-	$(GTHREAD_CFLAGS) \
-	$(GLIB2_CFLAGS) \
-	$(QDBM_CFLAGS) \
-	$(GIO_GFLAGS) \
+INCLUDES = 							\
+	-DG_LOG_DOMAIN=\"Tracker\" 				\
+	-I$(top_srcdir)/src 					\
+	-I$(top_srcdir)/src/trackerd 				\
+	-I$(top_srcdir)/tests/common				\
+	$(GMODULE_CFLAGS) 					\
+	$(GTHREAD_CFLAGS) 					\
+	$(GLIB2_CFLAGS) 					\
+	$(QDBM_CFLAGS) 						\
+	$(GIO_GFLAGS) 						\
 	$(DBUS_CFLAGS)
 
 if HAVE_XESAM_GLIB
@@ -22,22 +22,22 @@
 
 INCLUDES += $(XESAM_GLIB_CFLAGS)
 
-tracker_xesam_SOURCES = \
-	tracker-xesam-test.c \
-	tracker-xesam-test.h \
-	tracker-xesam-session-test.c \
-	tracker-xesam-session-test.h \
-	tracker-xesam-hit-test.c \
-	tracker-xesam-hit-test.h \
-	tracker-xesam-hits-test.c \
+tracker_xesam_SOURCES = 					\
+	tracker-xesam-test.c 					\
+	tracker-xesam-test.h 					\
+	tracker-xesam-session-test.c 				\
+	tracker-xesam-session-test.h 				\
+	tracker-xesam-hit-test.c 				\
+	tracker-xesam-hit-test.h 				\
+	tracker-xesam-hits-test.c 				\
 	tracker-xesam-hits-test.h
 
-tracker_xesam_LDADD = \
-	$(top_builddir)/tests/trackerd/xesam/libxesamhelper.la \
-	$(XESAM_GLIB_LIBS) \
-	$(GMODULE_LIBS) \
-	$(GTHREAD_LIBS) \
-	$(GLIB2_LIBS) \
+tracker_xesam_LDADD = 						\
+	$(top_builddir)/tests/trackerd/xesam/libxesamhelper.la 	\
+	$(XESAM_GLIB_LIBS)					\
+	$(GMODULE_LIBS) 					\
+	$(GTHREAD_LIBS) 					\
+	$(GLIB2_LIBS) 						\
 	$(DBUS_LIBS)
 
 endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]