[tracker/configure-for-binaries: 46/60] libtracker-extract: Cleaned up CFLAGS/LIBS for tests

[Martyn James Russell <mr src gnome org>]

commit 038c61d223d713a7413e2f442cca59e63e358200
Author: Martyn Russell <martyn lanedo com>
Date:   Mon Oct 25 16:57:07 2010 +0100

    libtracker-extract: Cleaned up CFLAGS/LIBS for tests

 tests/libtracker-extract/Makefile.am               |   35 ++++---------------
 .../{tracker-utils-test.c => tracker-test-utils.c} |    5 ++-
 .../{tracker-xmp-test.c => tracker-test-xmp.c}     |    5 +--
 3 files changed, 13 insertions(+), 32 deletions(-)
---
diff --git a/tests/libtracker-extract/Makefile.am b/tests/libtracker-extract/Makefile.am
index 00792b1..5ce8dfa 100644
--- a/tests/libtracker-extract/Makefile.am
+++ b/tests/libtracker-extract/Makefile.am
@@ -3,43 +3,24 @@ include $(top_srcdir)/Makefile.decl
 noinst_PROGRAMS = $(TEST_PROGS)
 
 TEST_PROGS += 								\
-	tracker-utils 							\
-	tracker-xmp
+	tracker-test-utils						\
+	tracker-test-xmp
 
 INCLUDES = 								\
 	$(BUILD_CFLAGS)							\
 	-I$(top_srcdir)/src						\
 	-I$(top_builddir)/src						\
 	-I$(top_srcdir)/tests/common					\
-	$(GLIB2_CFLAGS)							\
-	$(GMODULE_CFLAGS)						\
-	$(GTHREAD_CFLAGS)						\
-	$(DBUS_CFLAGS)
+	$(LIBTRACKER_EXTRACT_CFLAGS)
 
-tracker_utils_SOURCES = \
-	tracker-utils-test.c
-
-tracker_utils_LDADD =							\
+LDADD =									\
 	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-sparql/libtracker-sparql- TRACKER_API_VERSION@.la   \
 	$(BUILD_LIBS)							\
-	$(GMODULE_LIBS)							\
-	$(GTHREAD_LIBS)							\
-	$(GOBJECT_LIBS)							\
-	$(GLIB2_LIBS)
+	$(LIBTRACKER_EXTRACT_LIBS)
 
-tracker_xmp_SOURCES = \
-	tracker-xmp-test.c
+tracker_test_utils_SOURCES = tracker-test-utils.c
+
+tracker_test_xmp_SOURCES = tracker-test-xmp.c
 
-tracker_xmp_LDADD =							\
-	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
-	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
-	$(top_builddir)/src/libtracker-extract/libtracker-extract- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la   \
-	$(BUILD_LIBS)							\
-	$(GMODULE_LIBS)							\
-	$(GTHREAD_LIBS)							\
-	$(GOBJECT_LIBS)							\
-	$(GLIB2_LIBS)
diff --git a/tests/libtracker-extract/tracker-utils-test.c b/tests/libtracker-extract/tracker-test-utils.c
similarity index 98%
rename from tests/libtracker-extract/tracker-utils-test.c
rename to tests/libtracker-extract/tracker-test-utils.c
index 56b6f9f..cab8f7f 100644
--- a/tests/libtracker-extract/tracker-utils-test.c
+++ b/tests/libtracker-extract/tracker-test-utils.c
@@ -19,13 +19,14 @@
  * Authors: Philip Van Hoof <philip codeminded be>
  */
 
+#include "config.h"
+
 #include <time.h>
 #include <string.h>
 
 #include <glib-object.h>
 
-#include <libtracker-common/tracker-date-time.h>
-#include <libtracker-extract/tracker-utils.h>
+#include <libtracker-extract/tracker-extract.h>
 
 #include <tracker-test-helpers.h>
 
diff --git a/tests/libtracker-extract/tracker-xmp-test.c b/tests/libtracker-extract/tracker-test-xmp.c
similarity index 99%
rename from tests/libtracker-extract/tracker-xmp-test.c
rename to tests/libtracker-extract/tracker-test-xmp.c
index a33b68f..2905944 100644
--- a/tests/libtracker-extract/tracker-xmp-test.c
+++ b/tests/libtracker-extract/tracker-test-xmp.c
@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib-object.h>
 
 #include <libtracker-extract/tracker-extract.h>
@@ -276,8 +275,8 @@ test_xmp_apply (void)
 	TrackerSparqlBuilder *metadata, *preupdate;
 	TrackerXmpData *data;
 
-	metadata = tracker_sparql_builder_new_update ();;
-	preupdate = tracker_sparql_builder_new_update ();;
+	metadata = tracker_sparql_builder_new_update ();
+	preupdate = tracker_sparql_builder_new_update ();
 
 	data = tracker_xmp_new (EXAMPLE_XMP, strlen (EXAMPLE_XMP), "urn:uuid:test");
 	g_assert (data != NULL);