isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 19:40:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

introspection: Build fixes

Browse Source 
This patch merges in substantial work from
Emmanuele Bassi <ebassi@linux.intel.com>

* 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
This commit is contained in:
Colin Walters 2010-09-02 11:45:42 -04:00 committed by Emmanuele Bassi
parent 7e158c6bc5
commit d4d899fa27
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogl/Makefile.am
View File

@ -239,6 +239,7 @@ if HAVE_INTROSPECTION
Cogl-@CLUTTER_API_VERSION@.gir: Makefile $(INTROSPECTION_SCANNER) libclutter-cogl.la Cogl-@CLUTTER_API_VERSION@.gir: Makefile $(INTROSPECTION_SCANNER) libclutter-cogl.la
$(QUIET_SCAN)$(INTROSPECTION_SCANNER) \ $(QUIET_SCAN)$(INTROSPECTION_SCANNER) \
$(INTROSPECTION_SCANNER_ARGS) \ $(INTROSPECTION_SCANNER_ARGS) \
--quiet \
--namespace Cogl --nsversion=@CLUTTER_API_VERSION@ \ --namespace Cogl --nsversion=@CLUTTER_API_VERSION@ \
$(INCLUDES) \ $(INCLUDES) \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \
@ -247,7 +248,6 @@ Cogl-@CLUTTER_API_VERSION@.gir: Makefile $(INTROSPECTION_SCANNER) libclutter-cog
--include=GObject-2.0 \ --include=GObject-2.0 \
--library=libclutter-cogl.la \ --library=libclutter-cogl.la \
--libtool="$(top_builddir)/libtool" \ --libtool="$(top_builddir)/libtool" \
--pkg gobject-2.0 \
--output $@ \ --output $@ \
$(cogl_headers) cogl-enum-types.h $(cogl_headers) cogl-enum-types.h