[tracker/collation: 5/6] libtracker-data: moved collation stuff here from libtracker-common

[Aleksander Morgado <aleksm src gnome org>]

commit f898a45e5250958cdafd5ada1c6ffd73bd5e84c7
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Mon Aug 16 15:59:35 2010 +0200

    libtracker-data: moved collation stuff here from libtracker-common

 src/libtracker-common/Makefile.am      |   12 ++++--------
 src/libtracker-common/tracker-common.h |    1 -
 src/libtracker-data/Makefile.am        |    6 +++++-
 3 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index 4f02c30..e6ebd17 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -11,8 +11,7 @@ INCLUDES =						\
 	$(GIO_CFLAGS)					\
 	$(HAL_CFLAGS)					\
 	$(UPOWER_CFLAGS)				\
-	$(DBUS_CFLAGS)					\
-	$(UNICODE_SUPPORT_CFLAGS)
+	$(DBUS_CFLAGS)
 
 libtracker_commondir = $(libdir)/tracker-$(TRACKER_API_VERSION)
 libtracker_common_LTLIBRARIES = libtracker-common.la
@@ -51,8 +50,7 @@ libtracker_common_la_SOURCES =	 			\
 	tracker-log.c	 				\
 	tracker-type-utils.c				\
 	tracker-utils.c					\
-	tracker-crc32.c					\
-	tracker-collation.c
+	tracker-crc32.c
 
 noinst_HEADERS =					\
 	$(power_headers)				\
@@ -68,8 +66,7 @@ noinst_HEADERS =					\
 	tracker-ontologies.h				\
 	tracker-type-utils.h				\
 	tracker-utils.h					\
-	tracker-crc32.h					\
-	tracker-collation.h
+	tracker-crc32.h
 
 if HAVE_TRACKER_FTS
 libtracker_common_la_SOURCES +=	 			\
@@ -87,8 +84,7 @@ libtracker_common_la_LIBADD = 				\
 	$(DBUS_LIBS)					\
 	$(GIO_LIBS)					\
 	$(GCOV_LIBS)					\
-	$(GLIB2_LIBS)					\
-	$(UNICODE_SUPPORT_LIBS)
+	$(GLIB2_LIBS)
 
 if HAVE_TRACKER_FTS
 libtracker_common_la_LIBADD += 				\
diff --git a/src/libtracker-common/tracker-common.h b/src/libtracker-common/tracker-common.h
index 80627ef..fbd0550 100644
--- a/src/libtracker-common/tracker-common.h
+++ b/src/libtracker-common/tracker-common.h
@@ -41,7 +41,6 @@
 #include "tracker-power.h"
 #include "tracker-type-utils.h"
 #include "tracker-utils.h"
-#include "tracker-collation.h"
 
 #undef __LIBTRACKER_COMMON_INSIDE__
 
diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am
index f72fde0..71e1eee 100644
--- a/src/libtracker-data/Makefile.am
+++ b/src/libtracker-data/Makefile.am
@@ -13,7 +13,8 @@ INCLUDES =								\
 	$(DBUS_CFLAGS)							\
 	$(UUID_CFLAGS)							\
 	$(GCOV_CFLAGS)							\
-	$(SQLITE3_CFLAGS)
+	$(SQLITE3_CFLAGS)						\
+	$(UNICODE_SUPPORT_CFLAGS)
 
 BUILT_SOURCES = libtracker-data.vala.stamp
 
@@ -29,6 +30,7 @@ libtracker_data_la_VALASOURCES = 					\
 
 libtracker_data_la_SOURCES = 						\
 	tracker-class.c							\
+	tracker-collation.c						\
 	tracker-data-backup.c						\
 	tracker-data-manager.c						\
 	tracker-data-query.c						\
@@ -49,6 +51,7 @@ libtracker_data_la_SOURCES = 						\
 noinst_HEADERS =							\
 	tracker-class.h							\
 	tracker-data.h							\
+	tracker-collation.h						\
 	tracker-data-backup.h						\
 	tracker-data-manager.h						\
 	tracker-data-query.h						\
@@ -87,6 +90,7 @@ libtracker_data_la_LIBADD = 						\
 	$(GLIB2_LIBS)							\
 	$(UUID_LIBS)							\
 	$(GCOV_LIBS)							\
+	$(UNICODE_SUPPORT_LIBS)						\
 	-lz								\
 	-lm