[tracker/moving-sparql-builder-to-client] Initial clean up of libtracker-common

[Martyn James Russell <mr src gnome org>]

commit 34a0237c5a01f9408cc646ab757690f766e5f897
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Feb 11 17:03:48 2010 +0100

    Initial clean up of libtracker-common

 configure.ac                                       |    1 +
 src/libtracker-client/Makefile.am                  |   43 +++++++++++++++++--
 .../tracker-sparql-builder.vala                    |    0
 .../tracker-statement-list.h                       |    0
 src/libtracker-common/Makefile.am                  |   16 +++-----
 src/vapi/Makefile.am                               |    6 +++
 .../glib-2.0-fixes.vapi                            |    0
 src/{libtracker-common => vapi}/posix.vapi         |    0
 8 files changed, 51 insertions(+), 15 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 69c8df9..04603e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1652,6 +1652,7 @@ AC_CONFIG_FILES([
 	src/plugins/evolution/Makefile
 	src/plugins/kmail/Makefile
 	src/plugins/nautilus/Makefile
+	src/vapi/Makefile
 	tests/common/Makefile
 	tests/libtracker-common/Makefile
 	tests/libtracker-data/Makefile
diff --git a/src/libtracker-client/Makefile.am b/src/libtracker-client/Makefile.am
index a0d4790..d2ad351 100644
--- a/src/libtracker-client/Makefile.am
+++ b/src/libtracker-client/Makefile.am
@@ -11,9 +11,15 @@ INCLUDES = 					\
 
 lib_LTLIBRARIES = libtracker-client- TRACKER_API_VERSION@.la
 
-libtracker_clientincdir = $(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-client
+libtracker_clientincludedir = $(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-client
 
-libtracker_client_ TRACKER_API_VERSION@_la_SOURCES = tracker.c
+libtracker_client_ TRACKER_API_VERSION@_la_VALASOURCES = \
+	tracker-sparql-builder.vala
+
+libtracker_client_ TRACKER_API_VERSION@_la_SOURCES = 	\
+	tracker.c					\
+	libtracker-client.vala.stamp			\
+	$(libtracker_client_la_VALASOURCES:.vala=.c)
 
 libtracker_client_ TRACKER_API_VERSION@_la_LDFLAGS = 	\
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
@@ -24,8 +30,12 @@ libtracker_client_ TRACKER_API_VERSION@_la_LIBADD =	\
 	$(GCOV_LIBS)					\
 	$(GOBJECT_LIBS)
 
-libtracker_clientinc_HEADERS = 				\
-	tracker.h
+libtracker_clientinclude_HEADERS = 			\
+	tracker.h					\
+	tracker-sparql-builder.h
+
+noinst_HEADERS =					\
+	tracker-statement-list.h
 
 # Generate DBus files from XML data.
 dbus_sources = 						\
@@ -35,6 +45,29 @@ dbus_sources = 						\
 %-glue.h: $(top_srcdir)/data/dbus/%.xml
 	$(AM_V_GEN)$(DBUSBINDINGTOOL) --mode=glib-client --output=$@ --prefix=$(subst -,_,$*) $^
 
-BUILT_SOURCES = $(dbus_sources)
+vapi_sources =						\
+	$(top_srcdir)/src/vapi/posix.vapi		\
+	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi
+
+libtracker-client.vala.stamp: $(libtracker_client_la_VALASOURCES) $(vapi_sources)
+	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 -H tracker-sparql-builder.h $^
+	$(AM_V_GEN)touch $@
+
+BUILT_SOURCES = 					\
+	$(dbus_sources)					\
+	libtracker-client.vala.stamp
 
 CLEANFILES = $(BUILT_SOURCES)
+
+MAINTAINERCLEANFILES =					\
+	libtracker-client.vala.stamp			\
+	$(libtracker_client_la_VALASOURCES:.vala=.c)	\
+	tracker-sparql-builder.h
+
+EXTRA_DIST = 						\
+	$(libtracker_client_la_VALASOURCES)		\
+	libtracker-client.vala.stamp			\
+	libtracker-client.vapi				\
+	posix.vapi					\
+	glib-2.0-fixes.vapi
+
diff --git a/src/libtracker-common/tracker-sparql-builder.vala b/src/libtracker-client/tracker-sparql-builder.vala
similarity index 100%
rename from src/libtracker-common/tracker-sparql-builder.vala
rename to src/libtracker-client/tracker-sparql-builder.vala
diff --git a/src/libtracker-common/tracker-statement-list.h b/src/libtracker-client/tracker-statement-list.h
similarity index 100%
rename from src/libtracker-common/tracker-statement-list.h
rename to src/libtracker-client/tracker-statement-list.h
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index 972d358..19a28cf 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -51,7 +51,6 @@ endif
 endif
 
 libtracker_common_la_VALASOURCES =			\
-	tracker-sparql-builder.vala			\
 	tracker-turtle-writer.vala
 
 libtracker_common_la_SOURCES =	 			\
@@ -70,7 +69,6 @@ libtracker_common_la_SOURCES =	 			\
 	tracker-namespace.c				\
 	tracker-ontology.c				\
 	tracker-property.c				\
-	tracker-statement-list.c			\
 	tracker-type-utils.c				\
 	tracker-utils.c					\
 	tracker-crc32.c					\
@@ -95,13 +93,15 @@ libtracker_commoninclude_HEADERS =			\
 	tracker-namespace.h				\
 	tracker-ontology.h				\
 	tracker-property.h				\
-	tracker-sparql-builder.h			\
-	tracker-statement-list.h			\
 	tracker-type-utils.h				\
 	tracker-utils.h					\
 	tracker-crc32.h
 
-libtracker-common.vala.stamp: $(libtracker_common_la_VALASOURCES) posix.vapi glib-2.0-fixes.vapi
+vapi_sources =						\
+	$(top_srcdir)/src/vapi/posix.vapi		\
+	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi
+
+libtracker-common.vala.stamp: $(libtracker_common_la_VALASOURCES) $(vapi_sources)
 	$(AM_V_GEN)$(VALAC) $(GCOV_VALAFLAGS) -C $(VALAFLAGS) --pkg gio-2.0 -H tracker-sparql-builder.h $^
 	$(AM_V_GEN)touch $@
 
@@ -139,15 +139,11 @@ CLEANFILES = $(marshal_sources)
 
 MAINTAINERCLEANFILES =					\
 	libtracker-common.vala.stamp			\
-	$(libtracker_common_la_VALASOURCES:.vala=.c)	\
-	tracker-sparql-builder.h			\
-	$(NULL)
+	$(libtracker_common_la_VALASOURCES:.vala=.c)
 
 EXTRA_DIST = 						\
 	tracker-marshal.list				\
 	$(libtracker_common_la_VALASOURCES)		\
 	libtracker-common.vala.stamp			\
-	posix.vapi					\
-	glib-2.0-fixes.vapi					\
 	libtracker-common.vapi
 
diff --git a/src/vapi/Makefile.am b/src/vapi/Makefile.am
new file mode 100644
index 0000000..d31f770
--- /dev/null
+++ b/src/vapi/Makefile.am
@@ -0,0 +1,6 @@
+include $(top_srcdir)/Makefile.decl
+
+EXTRA_DIST = 						\
+	posix.vapi					\
+	glib-2.0-fixes.vapi
+
diff --git a/src/libtracker-common/glib-2.0-fixes.vapi b/src/vapi/glib-2.0-fixes.vapi
similarity index 100%
rename from src/libtracker-common/glib-2.0-fixes.vapi
rename to src/vapi/glib-2.0-fixes.vapi
diff --git a/src/libtracker-common/posix.vapi b/src/vapi/posix.vapi
similarity index 100%
rename from src/libtracker-common/posix.vapi
rename to src/vapi/posix.vapi