more fixesdirectdb

10 files changed, 30 insertions, 2 deletions

diff --git a/Makefile.am b/Makefile.am
index 0d710def..d6324258 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,8 @@ SUBDIRS = \
 	extensions \
 	data \
 	python \
+	test \
+	examples \
 	po \
 	doc \
 	$(NULL)
diff --git a/configure.ac b/configure.ac
index e09d4eca..0df3a7d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,14 @@ AC_CONFIG_FILES([
 	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/examples/c/Makefile.am b/examples/c/Makefile.am
index 0d165cb6..99c92d5e 100644
--- a/examples/c/Makefile.am
+++ b/examples/c/Makefile.am
@@ -2,6 +2,7 @@ include $(top_srcdir)/libzeitgeist/Makefile.decl
 
 INCLUDES = \
   -I$(top_srcdir)/libzeitgeist -I$(top_builddir)/libzeitgeist \
+  -I$(top_srcdir)/libzeitgeist/client -I$(top_builddir)/libzeitgeist/client \
   $(GIO_UNIX_CFLAGS) \
   $(ZEITGEIST_CFLAGS)
 
@@ -11,13 +12,17 @@ AM_CFLAGS = \
   -DZEITGEIST_COMPILATION \
   -DTEST_DIR=\"$(top_srcdir)/tests\"
 
-zeitgeist_libs = $(top_builddir)/libzeitgeist/libzeitgeist-2.0.la $(ZEITGEIST_LIBS)
+zeitgeist_libs = \
+    $(top_builddir)/libzeitgeist/libzeitgeist-2.0.la \
+    $(top_builddir)/libzeitgeist/client/libzeitgeist-client-1.0.la \
+    $(ZEITGEIST_LIBS)
 
 EXTRA_DIST += \
   test.desktop
 
 helper_sources = \
   $(top_srcdir)/libzeitgeist/zeitgeist.h  \
+  $(top_srcdir)/libzeitgeist/client/zeitgeist-client.h  \
   test.desktop
 
 noinst_PROGRAMS = \
diff --git a/examples/c/find-events.c b/examples/c/find-events.c
index 637bbc4d..6985bc60 100644
--- a/examples/c/find-events.c
+++ b/examples/c/find-events.c
@@ -21,6 +21,7 @@
 #include <glib/gprintf.h>
 #include <glib-object.h>
 #include <zeitgeist.h>
+#include <zeitgeist-client.h>
 
 static void
 on_events_received (ZeitgeistLog  *log,
diff --git a/examples/c/monitor-events.c b/examples/c/monitor-events.c
index e6d8c114..14d1a2e8 100644
--- a/examples/c/monitor-events.c
+++ b/examples/c/monitor-events.c
@@ -21,6 +21,7 @@
 #include <glib/gprintf.h>
 #include <glib-object.h>
 #include <zeitgeist.h>
+#include <zeitgeist-client.h>
 
 static void
 on_events_inserted (ZeitgeistMonitor   *mon,
diff --git a/examples/c/search-events.c b/examples/c/search-events.c
index c022b437..1d843e87 100644
--- a/examples/c/search-events.c
+++ b/examples/c/search-events.c
@@ -21,6 +21,7 @@
 #include <glib/gprintf.h>
 #include <glib-object.h>
 #include <zeitgeist.h>
+#include <zeitgeist-client.h>
 
 static void
 on_events_received (ZeitgeistIndex *index,
diff --git a/examples/vala/Makefile.am b/examples/vala/Makefile.am
index 5a6d7138..9b10b639 100644
--- a/examples/vala/Makefile.am
+++ b/examples/vala/Makefile.am
@@ -4,6 +4,7 @@ AM_CPPFLAGS = \
 	$(ZEITGEIST_CFLAGS) \
 	-include $(CONFIG_HEADER) \
 	-I $(top_srcdir)/libzeitgeist/ \
+	-I $(top_srcdir)/libzeitgeist/client/ \
 	-w \
 	$(NULL)
 
@@ -11,11 +12,13 @@ AM_VALAFLAGS = \
 	--target-glib=2.26 \
 	--pkg gio-2.0 \
 	$(top_srcdir)/libzeitgeist/zeitgeist-2.0.vapi \
+	$(top_srcdir)/libzeitgeist/client/zeitgeist-client.vapi \
 	$(top_srcdir)/config.vapi \
 	$(NULL)
 
 zeitgeist_libs = \
 	$(top_builddir)/libzeitgeist/libzeitgeist-2.0.la \
+	$(top_srcdir)/libzeitgeist/client/libzeitgeist-client-1.0.la \
 	$(ZEITGEIST_LIBS)
 
 noinst_PROGRAMS = \
diff --git a/libzeitgeist/client/Makefile.am b/libzeitgeist/client/Makefile.am
index 01df0741..646a7ae7 100644
--- a/libzeitgeist/client/Makefile.am
+++ b/libzeitgeist/client/Makefile.am
@@ -27,6 +27,7 @@ AM_VALAFLAGS = \
 
 libzeitgeist_client_1_0_la_SOURCES = \
 	log.vala \
+	index.vala \
 	$(NULL)
 
 libzeitgeist_client_1_0_la_LIBADD = \
diff --git a/test/c/Makefile.am b/test/c/Makefile.am
index 558b7aa6..6f0c4394 100644
--- a/test/c/Makefile.am
+++ b/test/c/Makefile.am
@@ -2,6 +2,7 @@ include $(top_srcdir)/libzeitgeist/Makefile.decl
 
 INCLUDES = \
   -I$(top_srcdir)/libzeitgeist -I$(top_builddir)/libzeitgeist \
+  -I$(top_srcdir)/libzeitgeist/client -I$(top_builddir)/libzeitgeist/client \
   $(GIO_UNIX_CFLAGS) \
   $(ZEITGEIST_CFLAGS)
 
@@ -11,13 +12,17 @@ AM_CFLAGS = \
   -DZEITGEIST_COMPILATION \
   -DTEST_DIR=\"$(top_srcdir)/tests\"
 
-zeitgeist_libs = $(top_builddir)/libzeitgeist/libzeitgeist-2.0.la $(ZEITGEIST_LIBS)
+zeitgeist_libs = \
+    $(top_builddir)/libzeitgeist/libzeitgeist-2.0.la \
+    $(top_builddir)/libzeitgeist/client/libzeitgeist-client-1.0.la \
+    $(ZEITGEIST_LIBS)
 
 EXTRA_DIST += \
   test.desktop
 
 helper_sources = \
   $(top_srcdir)/libzeitgeist/zeitgeist.h  \
+  $(top_srcdir)/libzeitgeist/client/zeitgeist-client.h  \
   test.desktop
 
 noinst_PROGRAMS = $(TEST_PROGS)
diff --git a/test/c/test-log.c b/test/c/test-log.c
index ff1c6021..74cc7dd1 100644
--- a/test/c/test-log.c
+++ b/test/c/test-log.c
@@ -19,6 +19,7 @@
 #include <glib.h>
 #include <glib-object.h>
 #include "zeitgeist.h"
+#include "zeitgeist-client.h"
 
 typedef struct
 {