initial directread

7 files changed, 60 insertions, 12 deletions

diff --git a/Makefile.am b/Makefile.am
index 7b28551c..1fd6c9f3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,8 +6,6 @@ SUBDIRS = \
 	extensions \
 	data \
 	python \
-	test \
-	examples \
 	po \
 	doc \
 	$(NULL)
diff --git a/configure.ac b/configure.ac
index 0ee830cc..e09d4eca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,20 +47,13 @@ AC_CONFIG_FILES([
 	src/Makefile
 	libzeitgeist/Makefile
 	libzeitgeist/zeitgeist-2.0.pc
+	libzeitgeist/client/Makefile
 	extensions/Makefile
 	extensions/fts++/Makefile
 	extensions/fts++/test/Makefile
 	data/Makefile
 	data/ontology/Makefile
 	python/Makefile
-	test/Makefile
-	test/dbus/Makefile
-	test/direct/Makefile
-	test/c/Makefile
-	test/data/Makefile
-	examples/Makefile
-	examples/c/Makefile
-	examples/vala/Makefile
 	doc/Makefile
 	doc/libzeitgeist/Makefile
 	po/Makefile.in
diff --git a/libzeitgeist/Makefile.am b/libzeitgeist/Makefile.am
index 69af9efe..74432004 100644
--- a/libzeitgeist/Makefile.am
+++ b/libzeitgeist/Makefile.am
@@ -1,5 +1,9 @@
 NULL =
 
+SUBDIRS = \
+	client \
+	$(NULL)
+
 lib_LTLIBRARIES = libzeitgeist-2.0.la
 
 ONTOLOGY = \
@@ -33,8 +37,6 @@ libzeitgeist_2_0_la_SOURCES = \
 	event.vala \
 	subject.vala \
 	timerange.vala \
-	index.vala \
-	log.vala \
 	timestamp.vala \
 	monitor.vala \
 	ontology-uris.vala \
diff --git a/libzeitgeist/client/Makefile.am b/libzeitgeist/client/Makefile.am
new file mode 100644
index 00000000..356992c8
--- /dev/null
+++ b/libzeitgeist/client/Makefile.am
@@ -0,0 +1,54 @@
+NULL =
+
+lib_LTLIBRARIES = libzeitgeist-client.la
+
+
+AM_CPPFLAGS = \
+	$(ZEITGEIST_CFLAGS) \
+	-include $(CONFIG_HEADER) \
+	-I $(top_srcdir)/libzeitgeist \
+	-I $(top_srcdir)/src/ \
+	-w \
+	$(NULL)
+
+AM_VALAFLAGS = \
+	--target-glib=2.26 \
+	--pkg gio-2.0 \
+	--pkg gio-unix-2.0 \
+	--pkg sqlite3 \
+	$(top_srcdir)/libzeitgeist/zeitgeist-2.0.vapi \
+	$(top_srcdir)/src/zeitgeist-engine.vapi \
+	$(top_srcdir)/config.vapi \
+	--vapi zeitgeist-client.vapi \
+	-H zeitgeist-client.h \
+	-h zeitgeist-client-private.h \
+	--library=zeitgeist-client \
+	$(NULL)
+
+libzeitgeist_client_la_SOURCES = \
+	log.vala \
+	$(NULL)
+
+libzeitgeist_client_la_LIBADD = \
+    $(top_builddir)/libzeitgeist/libzeitgeist-2.0.la \
+    $(ZEITGEIST_LIBS) \
+    $(NULL)$
+libzeitgeist_client_la_LDFLAGS = -version-info $(LIBZEITGEIST_LT_VERSION)
+
+libzeitgeist_client_includedir=$(includedir)/zeitgeist-client/
+libzeitgeist_client_include_HEADERS = \
+	zeitgeist-client.h \
+	$(NULL)
+
+libzeitgeist_client_vapidir = $(datadir)/vala/vapi/
+libzeitgeist_client_vapi_DATA = \
+	zeitgeist-client.vapi \
+	$(NULL)
+
+DISTCLEANFILES = \
+	zeitgeist-client.vapi \
+	$(NULL)
+
+CLEANFILES =
+MAINTAINERCLEANFILES =
+
diff --git a/libzeitgeist/index.vala b/libzeitgeist/client/index.vala
index 6ab3d716..6ab3d716 100644
--- a/libzeitgeist/index.vala
+++ b/libzeitgeist/client/index.vala
diff --git a/libzeitgeist/log.vala b/libzeitgeist/client/log.vala
index a0db8712..a0db8712 100644
--- a/libzeitgeist/log.vala
+++ b/libzeitgeist/client/log.vala
diff --git a/src/Makefile.am b/src/Makefile.am
index a686045b..52104b04 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,7 @@ NULL =
 
 bin_PROGRAMS = zeitgeist-daemon
 
+
 AM_CPPFLAGS = \
 	$(ZEITGEIST_CFLAGS) \
 	-include $(CONFIG_HEADER) \