[next] telepathy-glib: Explicitly link telepathy-glib-1-dbus when introspecting telepathy-glib-1

Simon McVittie smcv at kemper.freedesktop.org
Fri May 11 07:29:14 PDT 2012


Module: telepathy-glib
Branch: next
Commit: 5c49347ae31f9bd6316953f0a55d192f9c043032
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=5c49347ae31f9bd6316953f0a55d192f9c043032

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri May 11 15:06:51 2012 +0100

Explicitly link telepathy-glib-1-dbus when introspecting telepathy-glib-1

This is done via PACKAGES rather than LIBS so that it's treated as a
dependency, instead of being treated as the thing being introspected.

---

 telepathy-glib/introspection.am |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/telepathy-glib/introspection.am b/telepathy-glib/introspection.am
index 93ee3cf..c67f72c 100644
--- a/telepathy-glib/introspection.am
+++ b/telepathy-glib/introspection.am
@@ -11,6 +11,10 @@ include $(INTROSPECTION_MAKEFILE)
 
 INTROSPECTION_GIRS = TelepathyGLib-1.gir TelepathyGLibDBus-1.gir
 
+# Set PKG_CONFIG_PATH so we can find our own -uninstalled.pc for
+# telepathy-glib-1-dbus
+INTROSPECTION_SCANNER_ENV = PKG_CONFIG_PATH=$(builddir):$${PKG_CONFIG_PATH}
+
 TelepathyGLib-1.gir: libtelepathy-glib-1.la libtelepathy-glib-1-core.la
 # /!\ Order matters, see https://bugzilla.gnome.org/show_bug.cgi?id=660629
 TelepathyGLib_1_gir_FILES = \
@@ -110,6 +114,7 @@ TelepathyGLib_1_gir_INCLUDES = \
 TelepathyGLib_1_gir_PACKAGES = \
 	gio-2.0	\
 	dbus-glib-1 \
+	telepathy-glib-1-dbus \
 	$(NULL)
 
 TelepathyGLibDBus_1_gir_NAMESPACE = TelepathyGLibDBus



More information about the telepathy-commits mailing list