[libpeas] Add missing EXPORT_PACKAGES, bump required gobject-introspection version



commit 4c47b043ba0e2b0bf2f8d2ffba1449a81a47bc4b
Author: Michal Hruby <michal mhr gmail com>
Date:   Fri Feb 4 14:39:21 2011 +0100

    Add missing EXPORT_PACKAGES, bump required gobject-introspection version
    
    The EXPORT_PACKAGES are used by vala, so it can get proper cflags and
    libs when compiling apps using the gir.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=640252

 configure.ac                            |    2 +-
 libpeas-gtk/Makefile.am                 |    1 +
 libpeas/Makefile.am                     |    1 +
 tests/libpeas/introspection/Makefile.am |    3 ++-
 4 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3a28333..fecfce3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,7 @@ PKG_PROG_PKG_CONFIG
 
 GLIB_REQUIRED=2.18.0
 GOBJECT_REQUIRED=2.23.6
-INTROSPECTION_REQUIRED=0.9.6
+INTROSPECTION_REQUIRED=0.10.1
 
 PKG_CHECK_MODULES(PEAS, [
 	glib-2.0 >= $GLIB_REQUIRED
diff --git a/libpeas-gtk/Makefile.am b/libpeas-gtk/Makefile.am
index aa19ef3..1d2aef2 100644
--- a/libpeas-gtk/Makefile.am
+++ b/libpeas-gtk/Makefile.am
@@ -58,6 +58,7 @@ if HAVE_INTROSPECTION
   PeasGtk_1_0_gir_CFLAGS = $(PEAS_CFLAGS) $(PEAS_GTK_CFLAGS) -I$(top_srcdir)
   PeasGtk_1_0_gir_LIBS = libpeas-gtk-1.0.la
   PeasGtk_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
+  PeasGtk_1_0_gir_EXPORT_PACKAGES = libpeas-gtk-1.0
 
   girdir = $(datadir)/gir-1.0
   gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/libpeas/Makefile.am b/libpeas/Makefile.am
index 0091087..5252f90 100644
--- a/libpeas/Makefile.am
+++ b/libpeas/Makefile.am
@@ -94,6 +94,7 @@ if HAVE_INTROSPECTION
   Peas_1_0_gir_CFLAGS = $(PEAS_CFLAGS)
   Peas_1_0_gir_LIBS = libpeas-1.0.la
   Peas_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
+  Peas_1_0_gir_EXPORT_PACKAGES = libpeas-1.0
 
   girdir = $(datadir)/gir-1.0
   gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/tests/libpeas/introspection/Makefile.am b/tests/libpeas/introspection/Makefile.am
index 47e5ac0..1e6b487 100644
--- a/tests/libpeas/introspection/Makefile.am
+++ b/tests/libpeas/introspection/Makefile.am
@@ -38,10 +38,11 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libpeas
 introspection_sources = $(libintrospection_1_0_la_SOURCES)
 
 Introspection-1.0.gir: libintrospection-1.0.la
-Introspection_1_0_gir_INCLUDES = GObject-2.0 GIRepository-2.0 Peas-1.0
+Introspection_1_0_gir_INCLUDES = GObject-2.0 GIRepository-2.0
 Introspection_1_0_gir_CFLAGS = $(INTROSPECTION_INCLUDES)
 Introspection_1_0_gir_LIBS = libintrospection-1.0.la
 Introspection_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
+Introspection_1_0_gir_SCANNERFLAGS = --include-uninstalled=$(top_builddir)/libpeas/Peas-1.0.gir
 
 CLEANFILES = $(INTROSPECTION_GIRS) $(INTROSPECTION_TYPELIBS)
 



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