diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-11 15:06:51 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-11 15:06:51 +0100 |
| commit | 5c49347ae31f9bd6316953f0a55d192f9c043032 (patch) | |
| tree | 14dc2343dc2f9bc99846e0b40b29e9a986b451f0 | |
| parent | 6b43200f2a4bee32adc21fffe99255628b44637c (diff) | |
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.
| -rw-r--r-- | 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 93ee3cf5c..c67f72c3c 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 |