summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeif Lotfy <seif@lotfy.com>2013-01-21 14:17:36 +0100
committerSeif Lotfy <seif@lotfy.com>2013-01-21 14:17:36 +0100
commitdea125110d448629e8fa297209dc68828993e827 (patch)
tree0657c81b604e2d3e725fdd77f5f84b8c7adc51ea
parenta060a3b7478059b425c11a9897a944ad39338574 (diff)
downloadzeitgeist-dea125110d448629e8fa297209dc68828993e827.tar.gz
add missing use of zeitgeist-internal-2.0.vapi
-rw-r--r--extensions/fts++/Makefile.am1
-rw-r--r--libzeitgeist/Makefile.am5
-rw-r--r--libzeitgeist/internal/Makefile.am22
3 files changed, 5 insertions, 23 deletions
diff --git a/extensions/fts++/Makefile.am b/extensions/fts++/Makefile.am
index 273788bc..c5c44914 100644
--- a/extensions/fts++/Makefile.am
+++ b/extensions/fts++/Makefile.am
@@ -26,6 +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)/config.vapi \
$(NULL)
diff --git a/libzeitgeist/Makefile.am b/libzeitgeist/Makefile.am
index 83f5a0c2..21d36226 100644
--- a/libzeitgeist/Makefile.am
+++ b/libzeitgeist/Makefile.am
@@ -50,7 +50,10 @@ libzeitgeist_2_0_la_SOURCES = \
simple-result-set.vala \
$(NULL)
-libzeitgeist_2_0_la_LIBADD = $(ZEITGEIST_LIBS)
+libzeitgeist_2_0_la_LIBADD = \
+ $(top_builddir)/libzeitgeist/internal/libzeitgeist-internal-2.0.la \
+ $(ZEITGEIST_LIBS) \
+ $(NULL)$
libzeitgeist_2_0_la_LDFLAGS = -version-info $(LIBZEITGEIST_LT_VERSION)
pkgconfigdir = $(libdir)/pkgconfig
diff --git a/libzeitgeist/internal/Makefile.am b/libzeitgeist/internal/Makefile.am
index 5cca44a9..2243bbc4 100644
--- a/libzeitgeist/internal/Makefile.am
+++ b/libzeitgeist/internal/Makefile.am
@@ -56,31 +56,9 @@ EXTRA_DIST = \
DISTCLEANFILES = \
ontology.vala \
ontology-uris.vala \
- zeitgeist-2.0.vapi \
- $(NULL)
-
-
-libzeitgeist_internal_include_HEADERS = \
- zeitgeist-internal.h \
- $(NULL)
-
-libzeitgeist_internal_vapidir = $(datadir)/vala/vapi/
-libzeitgeist_internal_vapi_DATA = \
zeitgeist-internal-2.0.vapi
$(NULL)
-EXTRA_DIST = \
- ontology.vala.in \
- ontology-uris.vala.in \
- $(NULL)
-
-DISTCLEANFILES = \
- ontology.vala \
- ontology-uris.vala \
- zeitgeist-2.0.vapi \
- $(NULL)
-
-
CLEANFILES =
MAINTAINERCLEANFILES =