edffc1c77e
Fix introspection OBS-URL: https://build.opensuse.org/request/show/97480 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=114
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From c92f1c0f25d8bb590c0ea9439a4b179df9159b7b Mon Sep 17 00:00:00 2001
|
|
From: Colin Walters <walters@verbum.org>
|
|
Date: Tue, 20 Dec 2011 13:27:54 -0500
|
|
Subject: [PATCH] build: Use --include-uninstalled for internal .gir files
|
|
|
|
Otherwise we end up with a dependency on an installed pkg-config file.
|
|
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=662888
|
|
---
|
|
addressbook/libebook/Makefile.am | 3 ++-
|
|
1 files changed, 2 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am
|
|
index fce463e..602fbe0 100644
|
|
--- a/addressbook/libebook/Makefile.am
|
|
+++ b/addressbook/libebook/Makefile.am
|
|
@@ -85,7 +85,7 @@ if HAVE_INTROSPECTION
|
|
introspection_sources = $(libebook_1_2_la_SOURCES)
|
|
EBook-1.2.gir: libebook-1.2.la
|
|
|
|
-EBook_1_2_gir_INCLUDES = GObject-2.0 EDataServer-1.2 GLib-2.0 libxml2-2.0 \
|
|
+EBook_1_2_gir_INCLUDES = GObject-2.0 GLib-2.0 libxml2-2.0 \
|
|
Gio-2.0 \
|
|
$(NULL)
|
|
libxml_include = `$(PKG_CONFIG) --cflags libxml-2.0`
|
|
@@ -100,6 +100,7 @@ EBook_1_2_gir_CFLAGS = $(INCLUDES) \
|
|
-I$(top_srcdir)/addressbook/libebook \
|
|
-I$(top_builddir)/addressbook/libebook \
|
|
$(NULL)
|
|
+EBook_1_2_gir_SCANNERFLAGS = --include-uninstalled=$(top_builddir)/libedataserver/EDataServer-1.2.gir
|
|
EBook_1_2_gir_LIBS = \
|
|
libebook-1.2.la $(top_builddir)/libedataserver/libedataserver-1.2.la
|
|
EBook_1_2_gir_FILES = $(libebook_1_2_la_SOURCES) $(libebookinclude_HEADERS)
|
|
--
|
|
1.7.6.4
|