diff options
| author | Seif Lotfy <seif@lotfy.com> | 2013-02-10 21:27:28 +0100 |
|---|---|---|
| committer | Seif Lotfy <seif@lotfy.com> | 2013-02-10 21:27:28 +0100 |
| commit | 7c188ece554d1c8fd18f02055593cd49964361c9 (patch) | |
| tree | a451b2f49961890b17a5468fd42e26b01c49068c | |
| parent | 1955f0cedc84268952f8b8f284a1991c85fdd8d6 (diff) | |
| download | zeitgeist-7c188ece554d1c8fd18f02055593cd49964361c9.tar.gz | |
more fixes
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | libzeitgeist/Makefile.am | 9 | ||||
| -rw-r--r-- | libzeitgeist/client/Makefile.am | 39 |
3 files changed, 23 insertions, 26 deletions
diff --git a/Makefile.am b/Makefile.am index 1fd6c9f3..0d710def 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,7 @@ NULL = SUBDIRS = \ libzeitgeist \ src \ + libzeitgeist/client \ extensions \ data \ python \ diff --git a/libzeitgeist/Makefile.am b/libzeitgeist/Makefile.am index a36d1585..2f1eab48 100644 --- a/libzeitgeist/Makefile.am +++ b/libzeitgeist/Makefile.am @@ -80,13 +80,10 @@ MAINTAINERCLEANFILES = libzeitgeist_dlname = \ `$(SED) -n "s/^dlname='\([A-Za-z0-9.+-]\+\)'/\1/p" libzeitgeist-2.0.la` --include $(INTROSPECTION_MAKEFILE) -INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = -INTROSPECTION_COMPILER_ARGS = -l $(libzeitgeist_dlname) - 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 $@ $^ + GIRS = Zeitgeist-2.0.gir girdir = $(datadir)/gir-1.0 diff --git a/libzeitgeist/client/Makefile.am b/libzeitgeist/client/Makefile.am index 312451af..33a09250 100644 --- a/libzeitgeist/client/Makefile.am +++ b/libzeitgeist/client/Makefile.am @@ -1,6 +1,6 @@ NULL = -lib_LTLIBRARIES = libzeitgeistclient-1.0.la +lib_LTLIBRARIES = libzeitgeist-client-1.0.la AM_CPPFLAGS = \ $(ZEITGEIST_CFLAGS) \ @@ -16,36 +16,35 @@ AM_VALAFLAGS = \ --pkg sqlite3 \ $(top_srcdir)/config.vapi \ $(top_srcdir)/libzeitgeist/zeitgeist-2.0.vapi \ - --vapi zeitgeistclient.vapi \ - -H zeitgeistclient.h \ - -h zeitgeistclient-private.h \ - --library=zeitgeistclient \ + --vapi zeitgeist-client.vapi \ + -H zeitgeist-client.h \ + -h zeitgeist-client-private.h \ + --library=zeitgeist-client \ --gir=ZeitgeistClient-1.0.gir \ $(NULL) -libzeitgeistclient_1_0_la_SOURCES = \ +libzeitgeist_client_1_0_la_SOURCES = \ log.vala \ $(NULL) -libzeitgeistclient_1_0_la_LIBADD = \ +libzeitgeist_client_1_0_la_LIBADD = \ $(top_builddir)/libzeitgeist/libzeitgeist-2.0.la \ $(ZEITGEIST_LIBS) \ $(NULL)$ -libzeitgeistclient_1_0_la_LDFLAGS = -version-info $(LIBZEITGEIST_LT_VERSION) +libzeitgeist_client_1_0_la_LDFLAGS = -version-info $(LIBZEITGEIST_LT_VERSION) -libzeitgeistclient_includedir=$(includedir)/zeitgeistclient/ -libzeitgeistclient_include_HEADERS = \ - zeitgeistclient.h \ +libzeitgeist_client_includedir=$(includedir)/zeitgeist-client/ +libzeitgeist_client_include_HEADERS = \ + zeitgeist-client.h \ $(NULL) -libzeitgeistclient_vapidir = $(datadir)/vala/vapi/ -libzeitgeistclient_vapi_DATA = \ - zeitgeistclient.vapi \ +libzeitgeist_client_vapidir = $(datadir)/vala/vapi/ +libzeitgeist_client_vapi_DATA = \ + zeitgeist-client.vapi \ $(NULL) DISTCLEANFILES = \ - log.vala \ - zeitgeistclient.vapi \ + zeitgeist-client.vapi \ $(NULL) CLEANFILES = @@ -53,16 +52,16 @@ 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` +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 $(libzeitgeistclient_dlname) +INTROSPECTION_COMPILER_ARGS = -l $(libzeitgeist_client_dlname) if HAVE_INTROSPECTION -ZeitgeistClient-1.0.gir: libzeitgeistclient-1.0.la +ZeitgeistClient-1.0.gir: libzeitgeist-client-1.0.la GIRS = ZeitgeistClient-1.0.gir girdir = $(datadir)/gir-1.0 |