[evolution-data-server] Bug 662888 - Use --include-uninstalled for internal .gir files



commit 272392dbe61e7b454b55ccf60f4dd7ae1a3af6bf
Author: Colin Walters <walters verbum org>
Date:   Fri Dec 23 00:42:01 2011 -0500

    Bug 662888 - Use --include-uninstalled for internal .gir files
    
    Otherwise we end up with a dependency on an installed pkg-config file.

 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)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]