more cleanup

6 files changed, 18 insertions, 15 deletions

diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index fd19c153..38b371b8 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -5,7 +5,7 @@ endif
 NULL =
 
 zeitgeist_libs = \
-	$(top_builddir)/libzeitgeist/internal/libzeitgeist-internal-2.0.la \
+	$(top_builddir)/libzeitgeist/internal/libzeitgeist-internal.la \
 	$(top_builddir)/libzeitgeist/libzeitgeist-2.0.la \
 	$(ZEITGEIST_LIBS)
 
@@ -15,6 +15,7 @@ noinst_LTLIBRARIES = ds-registry.la blacklist.la storage-monitor.la fts.la bench
 AM_CPPFLAGS = \
 	$(ZEITGEIST_CFLAGS) \
 	-include $(CONFIG_HEADER) \
+	-I $(top_srcdir)/libzeitgeist/internal \
 	-I $(top_srcdir)/libzeitgeist \
 	-I $(top_srcdir)/src \
 	-w \
@@ -25,7 +26,7 @@ VALAFLAGS = \
 	--pkg gio-2.0 \
 	--pkg sqlite3 \
 	--pkg gmodule-2.0 \
-	$(top_srcdir)/libzeitgeist/internal/zeitgeist-internal-2.0.vapi \
+	$(top_srcdir)/libzeitgeist/internal/zeitgeist-internal.vapi \
 	$(top_srcdir)/libzeitgeist/zeitgeist-2.0.vapi \
 	$(top_srcdir)/src/zeitgeist-engine.vapi \
 	$(NULL)
diff --git a/extensions/fts++/Makefile.am b/extensions/fts++/Makefile.am
index c5c44914..c60e71ab 100644
--- a/extensions/fts++/Makefile.am
+++ b/extensions/fts++/Makefile.am
@@ -26,7 +26,7 @@ AM_VALAFLAGS = \
 	--pkg posix \
 	--pkg gmodule-2.0 \
 	$(top_srcdir)/libzeitgeist/zeitgeist-2.0.vapi \
-	$(top_srcdir)/libzeitgeist/internal/zeitgeist-internal-2.0.vapi \
+	$(top_srcdir)/libzeitgeist/internal/zeitgeist-internal.vapi \
 	$(top_srcdir)/config.vapi \
 	$(NULL)
 
diff --git a/libzeitgeist/Makefile.am b/libzeitgeist/Makefile.am
index 21d36226..a046ab04 100644
--- a/libzeitgeist/Makefile.am
+++ b/libzeitgeist/Makefile.am
@@ -22,7 +22,7 @@ AM_VALAFLAGS = \
 	--pkg gio-2.0 \
 	--pkg gio-unix-2.0 \
 	--pkg sqlite3 \
-	$(top_srcdir)/libzeitgeist/internal/zeitgeist-internal-2.0.vapi \
+	$(top_srcdir)/libzeitgeist/internal/zeitgeist-internal.vapi \
 	$(top_srcdir)/config.vapi \
 	--vapi zeitgeist-2.0.vapi \
 	-H zeitgeist.h \
@@ -51,7 +51,7 @@ libzeitgeist_2_0_la_SOURCES = \
 	$(NULL)
 
 libzeitgeist_2_0_la_LIBADD = \
-    $(top_builddir)/libzeitgeist/internal/libzeitgeist-internal-2.0.la \
+    $(top_builddir)/libzeitgeist/internal/libzeitgeist-internal.la \
     $(ZEITGEIST_LIBS) \
     $(NULL)$
 libzeitgeist_2_0_la_LDFLAGS = -version-info $(LIBZEITGEIST_LT_VERSION)
diff --git a/libzeitgeist/internal/Makefile.am b/libzeitgeist/internal/Makefile.am
index 2243bbc4..9e4a41ab 100644
--- a/libzeitgeist/internal/Makefile.am
+++ b/libzeitgeist/internal/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-lib_LTLIBRARIES = libzeitgeist-internal-2.0.la
+lib_LTLIBRARIES = libzeitgeist-internal.la
 
 ONTOLOGY = \
 	$(wildcard $(top_srcdir)/data/ontology/*.trig) \
@@ -18,13 +18,13 @@ AM_VALAFLAGS = \
 	--pkg gio-unix-2.0 \
 	--pkg sqlite3 \
 	$(top_srcdir)/config.vapi \
-	--vapi zeitgeist-internal-2.0.vapi \
+	--vapi zeitgeist-internal.vapi \
 	-H zeitgeist-internal.h \
 	-h zeitgeist-internal-private.h \
 	--library=zeitgeist-internal \
 	$(NULL)
 
-libzeitgeist_internal_2_0_la_SOURCES = \
+libzeitgeist_internal_la_SOURCES = \
 	enumerations.vala \
 	errors.vala \
 	sql-schema.vala \
@@ -35,17 +35,17 @@ libzeitgeist_internal_2_0_la_SOURCES = \
 	where-clause.vala \
 	$(NULL)
 
-libzeitgeist_internal_2_0_la_LIBADD = $(ZEITGEIST_LIBS)
-libzeitgeist_internal_2_0_la_LDFLAGS = -version-info $(LIBZEITGEIST_LT_VERSION)
+libzeitgeist_internal_la_LIBADD = $(ZEITGEIST_LIBS)
+libzeitgeist_internal_la_LDFLAGS = -version-info $(LIBZEITGEIST_LT_VERSION)
 
-libzeitgeist_internal_includedir=$(includedir)/zeitgeist-internal-2.0/
+libzeitgeist_internal_includedir=$(includedir)/zeitgeist-internal/
 libzeitgeist_internal_include_HEADERS = \
 	zeitgeist-internal.h \
 	$(NULL)
 
 libzeitgeist_internal_vapidir = $(datadir)/vala/vapi/
 libzeitgeist_internal_vapi_DATA = \
-	zeitgeist-internal-2.0.vapi
+	zeitgeist-internal.vapi
 	$(NULL)
 
 EXTRA_DIST = \
@@ -56,7 +56,7 @@ EXTRA_DIST = \
 DISTCLEANFILES = \
 	ontology.vala \
 	ontology-uris.vala \
-	zeitgeist-internal-2.0.vapi
+	zeitgeist-internal.vapi
 	$(NULL)
 
 CLEANFILES =
diff --git a/src/Makefile.am b/src/Makefile.am
index a934801b..89433225 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,7 @@ AM_VALAFLAGS = \
 	--pkg sqlite3 \
 	--pkg posix \
 	--pkg gmodule-2.0 \
-	$(top_srcdir)/libzeitgeist/internal/zeitgeist-internal-2.0.vapi \
+	$(top_srcdir)/libzeitgeist/internal/zeitgeist-internal.vapi \
 	$(top_srcdir)/libzeitgeist/zeitgeist-2.0.vapi \
 	$(top_srcdir)/config.vapi \
 	$(NULL)
@@ -55,7 +55,7 @@ zeitgeist_daemon_SOURCES = \
 	$(NULL)
 
 zeitgeist_daemon_LDADD = \
-	$(top_builddir)/libzeitgeist/internal/libzeitgeist-internal-2.0.la \
+	$(top_builddir)/libzeitgeist/internal/libzeitgeist-internal.la \
 	$(top_builddir)/libzeitgeist/libzeitgeist-2.0.la \
 	$(ZEITGEIST_LIBS) \
 	$(NULL)
diff --git a/test/c/Makefile.am b/test/c/Makefile.am
index 558b7aa6..67bc07df 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/internal -I$(top_builddir)/libzeitgeist/internal \
   $(GIO_UNIX_CFLAGS) \
   $(ZEITGEIST_CFLAGS)
 
@@ -17,6 +18,7 @@ EXTRA_DIST += \
   test.desktop
 
 helper_sources = \
+  $(top_srcdir)/libzeitgeist/internal/zeitgeist-internal.h  \
   $(top_srcdir)/libzeitgeist/zeitgeist.h  \
   test.desktop