From d4d899fa278efff9e7d4730527d12703f9d39dc5 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 2 Sep 2010 11:45:42 -0400 Subject: [PATCH] introspection: Build fixes This patch merges in substantial work from Emmanuele Bassi * Use new introspection --include-uninstalled API since we don't want to try to find the clutter-1.0.pc file before it's installed. * Use --pkg-export for Clutter-1.0.gir, since we want the .gir file to contain the associated pkg-config file. * Drop the use of --pkg for dependencies; those come from the associated .gir files. (Actually, --pkg is almost never needed) * Add --quiet http://bugzilla.clutter-project.org/show_bug.cgi?id=2292 --- cogl/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cogl/Makefile.am b/cogl/Makefile.am index 9ba4e4f2c..4de6fae2b 100644 --- a/cogl/Makefile.am +++ b/cogl/Makefile.am @@ -239,6 +239,7 @@ if HAVE_INTROSPECTION Cogl-@CLUTTER_API_VERSION@.gir: Makefile $(INTROSPECTION_SCANNER) libclutter-cogl.la $(QUIET_SCAN)$(INTROSPECTION_SCANNER) \ $(INTROSPECTION_SCANNER_ARGS) \ + --quiet \ --namespace Cogl --nsversion=@CLUTTER_API_VERSION@ \ $(INCLUDES) \ $(AM_CPPFLAGS) \ @@ -247,7 +248,6 @@ Cogl-@CLUTTER_API_VERSION@.gir: Makefile $(INTROSPECTION_SCANNER) libclutter-cog --include=GObject-2.0 \ --library=libclutter-cogl.la \ --libtool="$(top_builddir)/libtool" \ - --pkg gobject-2.0 \ --output $@ \ $(cogl_headers) cogl-enum-types.h