Link the support library GIRs against libfolks

Bug: https://bugzilla.gnome.org/show_bug.cgi?id=703450

diff --git a/NEWS b/NEWS
index c59897a..ca843cf 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 \