[folks] Link the support library GIRs against libfolks
- From: Travis Reitter <treitter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks] Link the support library GIRs against libfolks
- Date: Tue, 2 Jul 2013 16:33:01 +0000 (UTC)
commit 754c4c17d10d6b5dc07412f6f6749fb3b44944fc
Author: Emilio Pozuelo Monfort <emilio pozuelo collabora co uk>
Date: Tue Jul 2 11:50:41 2013 +0200
Link the support library GIRs against libfolks
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=703450
NEWS | 1 +
backends/eds/lib/Makefile.am | 5 ++++-
backends/libsocialweb/lib/Makefile.am | 5 ++++-
backends/telepathy/lib/Makefile.am | 4 +++-
backends/tracker/lib/Makefile.am | 5 ++++-
5 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/NEWS b/NEWS
index c59897a..ca843cf 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Major changes:
Bugs fixed:
• Bug 699865 — Folks needs to expose chat/VoIP service client types
• Bug 703402 — Backend support libraries don't set the GIR version and namespace
+• Bug 703450 — Telepathy backend gir fails to link
API changes:
• Add PresenceDetails.client_types
diff --git a/backends/eds/lib/Makefile.am b/backends/eds/lib/Makefile.am
index 1dc79be..4223bda 100644
--- a/backends/eds/lib/Makefile.am
+++ b/backends/eds/lib/Makefile.am
@@ -156,7 +156,10 @@ FolksEds_ API_VERSION_MAJOR@_ API_VERSION_MINOR@_gir_INCLUDES = \
EBookContacts-1.2 \
EDataServer-1.2 \
$(NULL)
-FolksEds_ API_VERSION_MAJOR@_ API_VERSION_MINOR@_gir_LIBS = libfolks-eds.la
+FolksEds_ API_VERSION_MAJOR@_ API_VERSION_MINOR@_gir_LIBS = \
+ libfolks-eds.la \
+ $(top_builddir)/folks/libfolks.la \
+ $(NULL)
FolksEds_ API_VERSION_MAJOR@_ API_VERSION_MINOR@_gir_FILES = \
$(libfolks_eds_la_SOURCES) \
folks/folks-eds.h \
diff --git a/backends/libsocialweb/lib/Makefile.am b/backends/libsocialweb/lib/Makefile.am
index a09c8fd..04074ce 100644
--- a/backends/libsocialweb/lib/Makefile.am
+++ b/backends/libsocialweb/lib/Makefile.am
@@ -143,7 +143,10 @@ FolksLibsocialweb_ API_VERSION_MAJOR@_ API_VERSION_MINOR@_gir_INCLUDES = \
Folks-$(API_VERSION_DOT) \
SocialWebClient-0.25 \
$(NULL)
-FolksLibsocialweb_ API_VERSION_MAJOR@_ API_VERSION_MINOR@_gir_LIBS = libfolks-libsocialweb.la
+FolksLibsocialweb_ API_VERSION_MAJOR@_ API_VERSION_MINOR@_gir_LIBS = \
+ libfolks-libsocialweb.la \
+ $(top_builddir)/folks/libfolks.la \
+ $(NULL)
FolksLibsocialweb_ API_VERSION_MAJOR@_ API_VERSION_MINOR@_gir_FILES = \
$(libfolks_libsocialweb_la_SOURCES) \
folks/folks-libsocialweb.h \
diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am
index 53152f0..8551af5 100644
--- a/backends/telepathy/lib/Makefile.am
+++ b/backends/telepathy/lib/Makefile.am
@@ -236,7 +236,9 @@ FolksTelepathy_ API_VERSION_MAJOR@_ API_VERSION_MINOR@_gir_INCLUDES = \
Folks-$(API_VERSION_DOT) \
TelepathyGLib-0.12 \
$(NULL)
-FolksTelepathy_ API_VERSION_MAJOR@_ API_VERSION_MINOR@_gir_LIBS = libfolks-telepathy.la
+FolksTelepathy_ API_VERSION_MAJOR@_ API_VERSION_MINOR@_gir_LIBS = libfolks-telepathy.la \
+ $(top_builddir)/folks/libfolks.la \
+ $(NULL)
FolksTelepathy_ API_VERSION_MAJOR@_ API_VERSION_MINOR@_gir_FILES = \
$(libfolks_telepathy_la_SOURCES) \
folks/folks-telepathy.h \
diff --git a/backends/tracker/lib/Makefile.am b/backends/tracker/lib/Makefile.am
index 58b4ccf..13b3df8 100644
--- a/backends/tracker/lib/Makefile.am
+++ b/backends/tracker/lib/Makefile.am
@@ -140,7 +140,10 @@ FolksTracker_ API_VERSION_MAJOR@_ API_VERSION_MINOR@_gir_INCLUDES = \
Folks-$(API_VERSION_DOT) \
Tracker-$(TRACKER_SPARQL_MAJOR) \
$(NULL)
-FolksTracker_ API_VERSION_MAJOR@_ API_VERSION_MINOR@_gir_LIBS = libfolks-tracker.la
+FolksTracker_ API_VERSION_MAJOR@_ API_VERSION_MINOR@_gir_LIBS = \
+ libfolks-tracker.la \
+ $(top_builddir)/folks/libfolks.la \
+ $(NULL)
FolksTracker_ API_VERSION_MAJOR@_ API_VERSION_MINOR@_gir_FILES = \
$(libfolks_tracker_la_SOURCES) \
folks/folks-tracker.h \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]