[tracker] libtracker-common: Fixed tests linking errors with binutils-gold's ld

[Martyn James Russell <mr src gnome org>]

commit 60e6ce02e6f9e6cd3b4a1dabf59718c918d77712
Author: Martyn Russell <martyn lanedo com>
Date:   Mon Nov 23 07:32:16 2009 +0000

    libtracker-common: Fixed tests linking errors with binutils-gold's ld

 tests/libtracker-common/Makefile.am               |   28 +++++++++++---------
 tests/libtracker-common/tracker-type-utils-test.c |    1 -
 2 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/tests/libtracker-common/Makefile.am b/tests/libtracker-common/Makefile.am
index 0484c19..002aa96 100644
--- a/tests/libtracker-common/Makefile.am
+++ b/tests/libtracker-common/Makefile.am
@@ -35,46 +35,48 @@ tracker_dbus_SOURCES = 							\
 	tracker-dbus-test.c
 
 tracker_dbus_LDADD =							\
-	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(DBUS_LIBS)							\
-	$(GCOV_LIBS)							\
 	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
-	$(GLIB2_LIBS)							
+	$(GLIB2_LIBS)							\
+	$(GCOV_LIBS)
 
 tracker_type_utils_SOURCES = \
 	tracker-type-utils-test.c 
 
 tracker_type_utils_LDADD =						\
-	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(GMODULE_LIBS)							\
-	$(GCOV_LIBS)							\
 	$(GTHREAD_LIBS)							\
-	$(GLIB2_LIBS)							
+	$(GOBJECT_LIBS)							\
+	$(GLIB2_LIBS)							\
+	$(GCOV_LIBS)
 
 tracker_file_utils_SOURCES = 						\
 	tracker-file-utils-test.c 
 
 tracker_file_utils_LDADD =						\
-	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
+	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(GMODULE_LIBS)							\
-	$(GCOV_LIBS)							\
 	$(GTHREAD_LIBS)							\
-	$(GLIB2_LIBS)							
+	$(GIO_LIBS)							\
+	$(GLIB2_LIBS)							\
+	$(GCOV_LIBS)
 
 # tracker_property_SOURCES = 						\
 # 	tracker-field-test.c 
 #
 # tracker_property_LDADD =							\
-# 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 # 	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
+# 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
+# 	$(PANGO_LIBS)							\
 # 	$(GMODULE_LIBS)							\
-#	$(GCOV_LIBS)							\
 # 	$(GTHREAD_LIBS)							\
-# 	$(PANGO_LIBS)							\
-# 	$(GLIB2_LIBS)							
+# 	$(GLIB2_LIBS)							\
+#	$(GCOV_LIBS)
 
 EXTRA_DIST = non-utf8.txt
diff --git a/tests/libtracker-common/tracker-type-utils-test.c b/tests/libtracker-common/tracker-type-utils-test.c
index 105cba0..96a4486 100644
--- a/tests/libtracker-common/tracker-type-utils-test.c
+++ b/tests/libtracker-common/tracker-type-utils-test.c
@@ -21,7 +21,6 @@
 #include <time.h>
 #include <string.h>
 
-#include <glib.h>
 #include <glib-object.h>
 
 #include <libtracker-common/tracker-type-utils.h>