fix makefiles

3 files changed, 49 insertions, 26 deletions

diff --git a/libzeitgeist/Makefile.am b/libzeitgeist/Makefile.am
index 74432004..a36d1585 100644
--- a/libzeitgeist/Makefile.am
+++ b/libzeitgeist/Makefile.am
@@ -1,9 +1,5 @@
 NULL =
 
-SUBDIRS = \
-	client \
-	$(NULL)
-
 lib_LTLIBRARIES = libzeitgeist-2.0.la
 
 ONTOLOGY = \
diff --git a/libzeitgeist/client/Makefile.am b/libzeitgeist/client/Makefile.am
index 356992c8..312451af 100644
--- a/libzeitgeist/client/Makefile.am
+++ b/libzeitgeist/client/Makefile.am
@@ -1,13 +1,11 @@
 NULL =
 
-lib_LTLIBRARIES = libzeitgeist-client.la
-
+lib_LTLIBRARIES = libzeitgeistclient-1.0.la
 
 AM_CPPFLAGS = \
 	$(ZEITGEIST_CFLAGS) \
 	-include $(CONFIG_HEADER) \
 	-I $(top_srcdir)/libzeitgeist \
-	-I $(top_srcdir)/src/ \
 	-w \
 	$(NULL)
 
@@ -16,39 +14,68 @@ AM_VALAFLAGS = \
 	--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 \
+	$(top_srcdir)/libzeitgeist/zeitgeist-2.0.vapi \
+	--vapi zeitgeistclient.vapi \
+	-H zeitgeistclient.h \
+	-h zeitgeistclient-private.h \
+	--library=zeitgeistclient \
+	--gir=ZeitgeistClient-1.0.gir \
 	$(NULL)
 
-libzeitgeist_client_la_SOURCES = \
+libzeitgeistclient_1_0_la_SOURCES = \
 	log.vala \
 	$(NULL)
 
-libzeitgeist_client_la_LIBADD = \
+libzeitgeistclient_1_0_la_LIBADD = \
     $(top_builddir)/libzeitgeist/libzeitgeist-2.0.la \
     $(ZEITGEIST_LIBS) \
     $(NULL)$
-libzeitgeist_client_la_LDFLAGS = -version-info $(LIBZEITGEIST_LT_VERSION)
+libzeitgeistclient_1_0_la_LDFLAGS = -version-info $(LIBZEITGEIST_LT_VERSION)
 
-libzeitgeist_client_includedir=$(includedir)/zeitgeist-client/
-libzeitgeist_client_include_HEADERS = \
-	zeitgeist-client.h \
+libzeitgeistclient_includedir=$(includedir)/zeitgeistclient/
+libzeitgeistclient_include_HEADERS = \
+	zeitgeistclient.h \
 	$(NULL)
 
-libzeitgeist_client_vapidir = $(datadir)/vala/vapi/
-libzeitgeist_client_vapi_DATA = \
-	zeitgeist-client.vapi \
+libzeitgeistclient_vapidir = $(datadir)/vala/vapi/
+libzeitgeistclient_vapi_DATA = \
+	zeitgeistclient.vapi \
 	$(NULL)
 
 DISTCLEANFILES = \
-	zeitgeist-client.vapi \
+	log.vala \
+	zeitgeistclient.vapi \
 	$(NULL)
 
 CLEANFILES =
 MAINTAINERCLEANFILES =
 
+# We have to extract our own dlname from libzeitgeist-2.0.la; see bgo#658002.
+# This is what g-ir-scanner does.
+libzeitgeistclient_dlname = \
+	`$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libzeitgeistclient-1.0.la`
+
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS =
+INTROSPECTION_COMPILER_ARGS = -l $(libzeitgeistclient_dlname)
+
+if HAVE_INTROSPECTION
+ZeitgeistClient-1.0.gir: libzeitgeistclient-1.0.la
+GIRS = ZeitgeistClient-1.0.gir
+
+girdir = $(datadir)/gir-1.0
+dist_gir_DATA = $(GIRS)
+
+MAINTAINERCLEANFILES += $(dist_gir_DATA)
+
+typelibdir = $(libdir)/girepository-1.0
+nodist_typelib_DATA = $(GIRS:.gir=.typelib)
+
+CLEANFILES += $(nodist_typelib_DATA)
+endif
+
+MAINTAINERCLEANFILES += \
+	$(BUILT_SOURCES) \
+	$(NULL)
diff --git a/libzeitgeist/simple-result-set.vala b/libzeitgeist/simple-result-set.vala
index a2d56472..08f0dd73 100644
--- a/libzeitgeist/simple-result-set.vala
+++ b/libzeitgeist/simple-result-set.vala
@@ -24,21 +24,21 @@
 namespace Zeitgeist
 {
 
-internal class SimpleResultSet : Object, ResultSet
+public class SimpleResultSet : Object, ResultSet
 {
 
     private GenericArray<Event> events;
     private uint num_estimated_matches;
     private uint cursor;
 
-    internal SimpleResultSet (GenericArray<Event> events)
+    public SimpleResultSet (GenericArray<Event> events)
     {
         this.events = events;
         num_estimated_matches = events.length;
         cursor = 0;
     }
 
-    internal SimpleResultSet.with_num_matches (
+    public SimpleResultSet.with_num_matches (
         GenericArray<Event> events, uint matches)
     {
         this.events = events;