build: A lot of cleaning up in the build-system

- Share internal libraries
- Don't ship built sources "as far possible"
- Refactor src/engine.vala,src/zeitgeist-daemon.vala,
  src/extensions-collection.vala for shared libzeitgeist-engine
- Make parallel builds work

19 files changed, 84 insertions, 211 deletions

diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 3c434728..75d63cd7 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -4,90 +4,47 @@ endif
 
 NULL =
 
-zeitgeist_libs = \
-	$(top_builddir)/libzeitgeist/libzeitgeist-2.0.la \
-	$(ZEITGEIST_LIBS)
-
 #extensionsdir = $(libdir)/zeitgeist/extensions
-noinst_LTLIBRARIES = ds-registry.la blacklist.la storage-monitor.la fts.la benchmark.la histogram.la
+noinst_LTLIBRARIES = \
+	benchmark.la \
+	blacklist.la \
+	ds-registry.la \
+	fts.la \
+	histogram.la \
+	storage-monitor.la \
+	$(NULL)
+
 
 AM_CPPFLAGS = \
 	$(ZEITGEIST_CFLAGS) \
 	-include $(CONFIG_HEADER) \
-	-I $(top_srcdir)/libzeitgeist \
-	-I $(top_srcdir)/src \
+	-I $(top_builddir)/libzeitgeist \
+	-I $(top_builddir)/src \
 	-w \
 	$(NULL)
 
-VALAFLAGS = \
+AM_VALAFLAGS = \
 	--target-glib=2.26 \
 	--pkg gio-2.0 \
 	--pkg sqlite3 \
 	--pkg gmodule-2.0 \
-	$(top_srcdir)/libzeitgeist/zeitgeist-2.0.vapi \
-	$(top_srcdir)/src/zeitgeist-engine.vapi \
-	$(NULL)
-
-ds_registry_la_SOURCES = \
-	ds-registry.vala \
+	$(top_builddir)/libzeitgeist/zeitgeist-2.0.vapi \
+	$(top_builddir)/libzeitgeist/zeitgeist-internal.vapi \
+	$(top_builddir)/src/zeitgeist-engine.vapi \
 	$(NULL)
 
-ds_registry_la_LDFLAGS = -module -avoid-version
-
-ds_registry_la_LIBADD = \
+AM_LDFLAGS = \
+	-module -avoid-version \
 	$(ZEITGEIST_LIBS) \
+	$(top_builddir)/libzeitgeist/libzeitgeist-internal.la \
 	$(NULL)
 
-blacklist_la_SOURCES = \
-	blacklist.vala \
-	$(NULL)
-
-blacklist_la_LDFLAGS = -module -avoid-version
-
-blacklist_la_LIBADD = \
-	$(ZEITGEIST_LIBS) \
-	$(NULL)
-
-storage_monitor_la_SOURCES = \
-	storage-monitor.vala \
-	$(NULL)
-
-storage_monitor_la_LDFLAGS = -module -avoid-version
-
-storage_monitor_la_LIBADD = \
-	$(ZEITGEIST_LIBS) \
-	$(NULL)
-	
-
-fts_la_SOURCES = \
-	fts.vala \
-	$(NULL)
-
-fts_la_LDFLAGS = -module -avoid-version
-
-fts_la_LIBADD = \
-	$(ZEITGEIST_LIBS) \
-	$(NULL)
-	
-benchmark_la_SOURCES = \
-	benchmark.vala \
-	$(NULL)
-
-benchmark_la_LDFLAGS = -module -avoid-version
-
-benchmark_la_LIBADD = \
-	$(ZEITGEIST_LIBS) \
-	$(NULL)
-	
-histogram_la_SOURCES = \
-	histogram.vala \
-	$(NULL)
-
-histogram_la_LDFLAGS = -module -avoid-version
-
-histogram_la_LIBADD = \
-	$(ZEITGEIST_LIBS) \
-	$(NULL)
+benchmark_la_SOURCES = benchmark.vala
+blacklist_la_SOURCES = blacklist.vala
+ds_registry_la_SOURCES = ds-registry.vala
+fts_la_SOURCES = fts.vala
+histogram_la_SOURCES = histogram.vala
+storage_monitor_la_SOURCES = storage-monitor.vala
 
 distclean-local:
 	rm -f *.c *.o *.stamp *.~[0-9]~
diff --git a/extensions/benchmark.vala b/extensions/benchmark.vala
index 76bfd377..6e38fa0d 100644
--- a/extensions/benchmark.vala
+++ b/extensions/benchmark.vala
@@ -30,7 +30,7 @@ namespace Zeitgeist
             throws Error;
     }
 
-    class Benchmarker: Extension, RemoteBenchmarker
+    public class Benchmarker: Extension, RemoteBenchmarker
     {
 
         private uint registration_id;
diff --git a/extensions/blacklist.vala b/extensions/blacklist.vala
index fa81e254..145490e6 100644
--- a/extensions/blacklist.vala
+++ b/extensions/blacklist.vala
@@ -84,7 +84,7 @@ namespace Zeitgeist
         }
     }
 
-    class Blacklist: Extension, RemoteBlacklist
+    public class Blacklist: Extension, RemoteBlacklist
     {
         private HashTable<string, Event> blacklist;
         private uint registration_id;
diff --git a/extensions/ds-registry.vala b/extensions/ds-registry.vala
index d3ea0ad6..ab712f06 100644
--- a/extensions/ds-registry.vala
+++ b/extensions/ds-registry.vala
@@ -49,7 +49,7 @@ namespace Zeitgeist
         }
     }
 
-    internal class DataSourceRegistryExtension: Extension, RemoteRegistry
+    public class DataSourceRegistryExtension: Extension, RemoteRegistry
     {
         private const string MULTIPLE_MARKER = "<multiple>";
         private HashTable<string, DataSource> sources;
diff --git a/extensions/fts++/Makefile.am b/extensions/fts++/Makefile.am
index d590e7bb..2ff1700c 100644
--- a/extensions/fts++/Makefile.am
+++ b/extensions/fts++/Makefile.am
@@ -1,11 +1,11 @@
-SUBDIRS = test
 NULL = 
 
-noinst_LTLIBRARIES = libzeitgeist-internal.la
+SUBDIRS = test
+
 libexec_PROGRAMS = zeitgeist-fts
 
 servicedir = $(DBUS_SERVICES_DIR)
-service_DATA = org.gnome.zeitgeist.fts.service
+nodist_service_DATA = org.gnome.zeitgeist.fts.service
 
 org.gnome.zeitgeist.fts.service: org.gnome.zeitgeist.fts.service.in
 	$(AM_V_GEN)sed  -e s!\@libexecdir\@!$(libexecdir)! < $< > $@
@@ -15,7 +15,8 @@ AM_CPPFLAGS = \
 	$(ZEITGEIST_CFLAGS) \
 	$(XAPIAN_CXXFLAGS) \
 	-include $(CONFIG_HEADER) \
-	-I $(top_srcdir)/libzeitgeist \
+	-I $(top_builddir)/libzeitgeist \
+	-I $(top_builddir)/src \
 	-w \
 	$(NULL)
 
@@ -25,37 +26,19 @@ AM_VALAFLAGS = \
 	--pkg sqlite3 \
 	--pkg posix \
 	--pkg gmodule-2.0 \
-	$(top_srcdir)/libzeitgeist/zeitgeist-2.0.vapi \
+	$(top_builddir)/libzeitgeist/zeitgeist-2.0.vapi \
+	$(top_builddir)/libzeitgeist/zeitgeist-internal.vapi \
+	$(top_builddir)/src/zeitgeist-engine.vapi \
+	$(srcdir)/fts.vapi \
 	$(top_srcdir)/config.vapi \
-	$(NULL)
-
-libzeitgeist_internal_la_VALASOURCES = \
-	db-reader.vala \
-	engine.vala \
-	sql.vala \
-	errors.vala \
-	table-lookup.vala \
-	sql-schema.vala \
-	where-clause.vala \
-	ext-dummies.vala \
-	$(NULL)
-
-libzeitgeist_internal_la_SOURCES = \
-	zeitgeist-internal.stamp \
-	$(libzeitgeist_internal_la_VALASOURCES:.vala=.c) \
-	$(NULL)
-
-libzeitgeist_internal_la_LIBADD = \
-	$(ZEITGEIST_LIBS) \
+	-C \
 	$(NULL)
 
 zeitgeist_fts_VALASOURCES = \
 	zeitgeist-fts.vala \
 	$(NULL)
 
-zeitgeist_fts_SOURCES = \
-	zeitgeist-fts_vala.stamp \
-	$(zeitgeist_fts_VALASOURCES:.vala=.c) \
+zeitgeist_fts_CSOURCES = \
 	controller.cpp \
 	controller.h \
 	fts.cpp \
@@ -68,41 +51,48 @@ zeitgeist_fts_SOURCES = \
 	stringutils.h \
 	$(NULL)
 
+nodist_zeitgeist_fts_SOURCES = \
+	$(BUILT_SOURCES) \
+	$(zeitgeist_fts_CSOURCES) \
+	$(zeitgeist_fts_VALASOURCES:.vala=.c) \
+	$(NULL)
+
 zeitgeist_fts_LDADD = \
-	$(builddir)/libzeitgeist-internal.la \
 	$(top_builddir)/libzeitgeist/libzeitgeist-2.0.la \
+	$(top_builddir)/libzeitgeist/libzeitgeist-internal.la \
+	$(top_builddir)/src/libzeitgeist-engine.la \
 	$(XAPIAN_LIBS) \
 	$(NULL)
 
+zeitgeist_fts_LDFLAGS = -export-dynamic -no-undefined
+
 if HAVE_DEE_ICU
 AM_CPPFLAGS += $(DEE_ICU_CFLAGS)
 zeitgeist_fts_LDADD += $(DEE_ICU_LIBS)
 endif
 
 BUILT_SOURCES = \
-	zeitgeist-internal.stamp \
 	zeitgeist-fts_vala.stamp \
 	$(NULL)
 
-zeitgeist-internal.stamp: $(libzeitgeist_internal_la_VALASOURCES)
-	$(VALA_V)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C -H zeitgeist-internal.h --library zeitgeist-internal $^
-	@touch "$@"
-
-zeitgeist-fts_vala.stamp: $(zeitgeist_fts_VALASOURCES)
-	$(VALA_V)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) \
-	$(srcdir)/zeitgeist-internal.vapi $(srcdir)/fts.vapi -C $^
-	@touch "$@"
+zeitgeist-fts_vala.stamp: $(engine_VALASOURCES) $(zeitgeist_fts_VALASOURCES) Makefile
+	$(AM_V_VALA)$(VALAC) \
+		$(AM_VALAFLAGS) \
+		$(filter %.vala %.c,$^)
+	$(AM_V_at)touch $@
 
 EXTRA_DIST = \
-	$(libzeitgeist_internal_la_VALASOURCES) \
 	$(zeitgeist_fts_VALASOURCES) \
-	zeitgeist-fts_vala.stamp \
-	zeitgeist-internal.h \
-	zeitgeist-internal.vapi \
+	$(zeitgeist_fts_CSOURCES) \
 	org.gnome.zeitgeist.fts.service.in \
+	fts.vapi \
 	$(NULL)
 
-CLEANFILES = org.gnome.zeitgeist.fts.service
+CLEANFILES = \
+	$(BUILT_SOURCES) \
+	$(zeitgeist_fts_VALASOURCES:.vala=.c) \
+	org.gnome.zeitgeist.fts.service \
+	$(NULL)
 
 DISTCLEANFILES = \
 	$(NULL)
diff --git a/extensions/fts++/db-reader.vala b/extensions/fts++/db-reader.vala
deleted file mode 120000
index fecbc782..00000000
--- a/extensions/fts++/db-reader.vala
+++ /dev/null
@@ -1 +0,0 @@
-../../src/db-reader.vala
\ No newline at end of file
diff --git a/extensions/fts++/engine.vala b/extensions/fts++/engine.vala
deleted file mode 120000
index e2314a5e..00000000
--- a/extensions/fts++/engine.vala
+++ /dev/null
@@ -1 +0,0 @@
-../../src/engine.vala
\ No newline at end of file
diff --git a/extensions/fts++/errors.vala b/extensions/fts++/errors.vala
deleted file mode 120000
index c630d3ed..00000000
--- a/extensions/fts++/errors.vala
+++ /dev/null
@@ -1 +0,0 @@
-../../src/errors.vala
\ No newline at end of file
diff --git a/extensions/fts++/ext-dummies.vala b/extensions/fts++/ext-dummies.vala
deleted file mode 100644
index f77a2b2d..00000000
--- a/extensions/fts++/ext-dummies.vala
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ext-dummies.vala
- *
- * Copyright © 2011-2012 Michal Hruby <michal.mhr@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace Zeitgeist
-{
-    public class ExtensionCollection : Object
-    {
-        public unowned Engine engine { get; construct; }
-
-        public ExtensionCollection (Engine engine)
-        {
-            Object (engine: engine);
-        }
-
-        public string[] get_extension_names ()
-        {
-            string[] result = {};
-            return result;
-        }
-
-        public void call_pre_insert_events (GenericArray<Event?> events,
-            BusName? sender)
-        {
-        }
-
-        public void call_post_insert_events (GenericArray<Event?> events,
-            BusName? sender)
-        {
-        }
-
-        public unowned uint32[] call_pre_delete_events (uint32[] event_ids,
-            BusName? sender)
-        {
-            return event_ids;
-        }
-
-        public void call_post_delete_events (uint32[] event_ids,
-            BusName? sender)
-        {
-        }
-    }
-
-    public class ExtensionStore : Object
-    {
-        public unowned Engine engine { get; construct; }
-
-        public ExtensionStore (Engine engine)
-        {
-            Object (engine: engine);
-        }
-    }
-
-}
-
-// vim:expandtab:ts=4:sw=4
diff --git a/extensions/fts++/mimetype.vala b/extensions/fts++/mimetype.vala
deleted file mode 120000
index fc0a6ce1..00000000
--- a/extensions/fts++/mimetype.vala
+++ /dev/null
@@ -1 +0,0 @@
-../../src/mimetype.vala
\ No newline at end of file
diff --git a/extensions/fts++/remote.vala b/extensions/fts++/remote.vala
deleted file mode 120000
index 32661b1f..00000000
--- a/extensions/fts++/remote.vala
+++ /dev/null
@@ -1 +0,0 @@
-../../src/remote.vala
\ No newline at end of file
diff --git a/extensions/fts++/sql-schema.vala b/extensions/fts++/sql-schema.vala
deleted file mode 120000
index a2756d4a..00000000
--- a/extensions/fts++/sql-schema.vala
+++ /dev/null
@@ -1 +0,0 @@
-../../src/sql-schema.vala
\ No newline at end of file
diff --git a/extensions/fts++/sql.vala b/extensions/fts++/sql.vala
deleted file mode 120000
index 48950aed..00000000
--- a/extensions/fts++/sql.vala
+++ /dev/null
@@ -1 +0,0 @@
-../../src/sql.vala
\ No newline at end of file
diff --git a/extensions/fts++/table-lookup.vala b/extensions/fts++/table-lookup.vala
deleted file mode 120000
index 9e242838..00000000
--- a/extensions/fts++/table-lookup.vala
+++ /dev/null
@@ -1 +0,0 @@
-../../src/table-lookup.vala
\ No newline at end of file
diff --git a/extensions/fts++/test/Makefile.am b/extensions/fts++/test/Makefile.am
index df29c21c..5f1ef854 100644
--- a/extensions/fts++/test/Makefile.am
+++ b/extensions/fts++/test/Makefile.am
@@ -1,31 +1,37 @@
 NULL = 
+
 check_PROGRAMS = test-fts
 TESTS = test-fts
 
 AM_CPPFLAGS = \
 	$(ZEITGEIST_CFLAGS) \
+	$(XAPIAN_CXXFLAGS) \
 	-include $(CONFIG_HEADER) \
 	-w \
-	-I$(srcdir)/.. \
-	-I $(top_srcdir)/libzeitgeist \
+	-I $(srcdir)/.. \
+	-I $(builddir)/.. \
+	-I $(top_builddir)/libzeitgeist \
+	-I $(top_builddir)/src \
+	-include $(top_builddir)/src/zeitgeist-engine.h \
 	$(NULL)
 
 test_fts_SOURCES = \
-  test-stringutils.cpp \
-  test-indexer.cpp \
-  test-fts.c \
-  $(srcdir)/../stringutils.cpp \
-  $(srcdir)/../controller.cpp \
-  $(srcdir)/../indexer.cpp \
-  $(srcdir)/../task.cpp \
-  $(srcdir)/../fts.cpp \
-  $(NULL)
+	test-stringutils.cpp \
+	test-indexer.cpp \
+	test-fts.c \
+	$(srcdir)/../stringutils.cpp \
+	$(srcdir)/../controller.cpp \
+	$(srcdir)/../indexer.cpp \
+	$(srcdir)/../task.cpp \
+	$(srcdir)/../fts.cpp \
+	$(NULL)
 
 test_fts_LDADD = \
-  $(builddir)/../libzeitgeist-internal.la \
-  $(top_builddir)/libzeitgeist/libzeitgeist-2.0.la \
-  -lxapian \
-  $(NULL)
+	$(top_builddir)/libzeitgeist/libzeitgeist-2.0.la \
+	$(top_builddir)/libzeitgeist/libzeitgeist-internal.la \
+	$(top_builddir)/src/libzeitgeist-engine.la \
+	$(XAPIAN_LIBS) \
+	$(NULL)
 
 if HAVE_DEE_ICU
 AM_CPPFLAGS += $(DEE_ICU_CFLAGS)
diff --git a/extensions/fts++/where-clause.vala b/extensions/fts++/where-clause.vala
deleted file mode 120000
index efc7d8f9..00000000
--- a/extensions/fts++/where-clause.vala
+++ /dev/null
@@ -1 +0,0 @@
-../../src/where-clause.vala
\ No newline at end of file
diff --git a/extensions/fts.vala b/extensions/fts.vala
index 58bad8b7..3ac9b38d 100644
--- a/extensions/fts.vala
+++ b/extensions/fts.vala
@@ -41,7 +41,7 @@ namespace Zeitgeist
             out uint matches) throws Error;
     }
 
-    class SearchEngine: Extension, RemoteSearchEngine
+    public class SearchEngine: Extension, RemoteSearchEngine
     {
 
         private const string INDEXER_NAME = "org.gnome.zeitgeist.SimpleIndexer";
diff --git a/extensions/histogram.vala b/extensions/histogram.vala
index 11ce45aa..074002b8 100644
--- a/extensions/histogram.vala
+++ b/extensions/histogram.vala
@@ -30,7 +30,7 @@ namespace Zeitgeist
         public abstract Variant get_histogram_data () throws Error;
     }
 
-    class Histogram: Extension, RemoteHistogram
+    public class Histogram: Extension, RemoteHistogram
     {
 
         private uint registration_id = 0;
diff --git a/extensions/storage-monitor.vala b/extensions/storage-monitor.vala
index 37489e4c..8149ca73 100644
--- a/extensions/storage-monitor.vala
+++ b/extensions/storage-monitor.vala
@@ -40,7 +40,7 @@ namespace Zeitgeist
         public signal void storage_unavailable (string storage_id);
     }
 
-    private interface NetworkMonitor: Object
+    public interface NetworkMonitor: Object
     {
         // This method emits the on_network_up/on_network_up signals
         // basing on the initial state of the network.