summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeif Lotfy <seif@lotfy.com>2013-02-11 14:43:41 +0100
committerSeif Lotfy <seif@lotfy.com>2013-02-11 14:43:41 +0100
commitcaeed9b4c4730f39b3d9fe75df3f7ec918508efd (patch)
treefebf3883e157ff66674ed8959aefef1f4652f0ea
parent7c188ece554d1c8fd18f02055593cd49964361c9 (diff)
downloadzeitgeist-caeed9b4c4730f39b3d9fe75df3f7ec918508efd.tar.gz
fix makefiles
-rw-r--r--libzeitgeist/Makefile.am1
-rw-r--r--libzeitgeist/client/Makefile.am7
2 files changed, 3 insertions, 5 deletions
diff --git a/libzeitgeist/Makefile.am b/libzeitgeist/Makefile.am
index 2f1eab48..792cf73d 100644
--- a/libzeitgeist/Makefile.am
+++ b/libzeitgeist/Makefile.am
@@ -81,6 +81,7 @@ libzeitgeist_dlname = \
`$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libzeitgeist-2.0.la`
if HAVE_INTROSPECTION
+Zeitgeist-2.0.gir: libzeitgeist-2.0.la
Zeitgeist-2.0.typelib: Zeitgeist-2.0.gir
${INTROSPECTION_COMPILER} -l ${libzeitgeist_dlname} --includedir ${INTROSPECTION_GIRDIR} -o $@ $^
diff --git a/libzeitgeist/client/Makefile.am b/libzeitgeist/client/Makefile.am
index 33a09250..031aa798 100644
--- a/libzeitgeist/client/Makefile.am
+++ b/libzeitgeist/client/Makefile.am
@@ -44,7 +44,6 @@ libzeitgeist_client_vapi_DATA = \
$(NULL)
DISTCLEANFILES = \
- zeitgeist-client.vapi \
$(NULL)
CLEANFILES =
@@ -56,12 +55,10 @@ libzeitgeist_client_dlname = \
`$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libzeitgeist-client-1.0.la`
-include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS =
-INTROSPECTION_COMPILER_ARGS = -l $(libzeitgeist_client_dlname)
if HAVE_INTROSPECTION
-ZeitgeistClient-1.0.gir: libzeitgeist-client-1.0.la
+Zeitgeist-2.0.typelib: Zeitgeist-2.0.gir
+ ${INTROSPECTION_COMPILER} -l ${libzeitgeist_dlname} --includedir ${INTROSPECTION_GIRDIR} -o $@ $^
GIRS = ZeitgeistClient-1.0.gir
girdir = $(datadir)/gir-1.0