brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

introspection: Use the --quiet flag conditionally

Browse Source 
--quiet has been added to g-ir-scanner in the 0.9.1 cycle. We really
want to be able to compile clutter with 0.6.14 to be able to reuse
gir files that are distributed in current distributions.

Use the INTROSPECTION_SCANNER_ARGS (previously unused) variable to
convey --quiet when necessary.

Fixes: http://bugzilla.clutter-project.org/show_bug.cgi?id=2265
This commit is contained in:
Damien Lespiau 2010-08-12 10:36:04 -04:00 committed by Damien Lespiau
parent 1f01fd0a4c
commit 2f54f8f0ea
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/Makefile.am
View File

@ -343,7 +343,6 @@ if HAVE_INTROSPECTION
Clutter-@CLUTTER_API_VERSION@.gir: Makefile $(INTROSPECTION_SCANNER) libclutter-@CLUTTER_SONAME_INFIX@-@CLUTTER_API_VERSION@.la Clutter-@CLUTTER_API_VERSION@.gir: Makefile $(INTROSPECTION_SCANNER) libclutter-@CLUTTER_SONAME_INFIX@-@CLUTTER_API_VERSION@.la
$(QUIET_SCAN)$(INTROSPECTION_SCANNER) \ $(QUIET_SCAN)$(INTROSPECTION_SCANNER) \
$(INTROSPECTION_SCANNER_ARGS) \ $(INTROSPECTION_SCANNER_ARGS) \
--quiet \
--namespace Clutter --nsversion=@CLUTTER_API_VERSION@ \ --namespace Clutter --nsversion=@CLUTTER_API_VERSION@ \
$(INCLUDES) \ $(INCLUDES) \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \
@ -394,7 +393,6 @@ BUILT_GIRSOURCES += Cogl-@CLUTTER_API_VERSION@.gir
Cally-@CLUTTER_API_VERSION@.gir: Makefile $(INTROSPECTION_SCANNER) Clutter-@CLUTTER_API_VERSION@.gir Cally-@CLUTTER_API_VERSION@.gir: Makefile $(INTROSPECTION_SCANNER) Clutter-@CLUTTER_API_VERSION@.gir
$(QUIET_SCAN)$(INTROSPECTION_SCANNER) \ $(QUIET_SCAN)$(INTROSPECTION_SCANNER) \
$(INTROSPECTION_SCANNER_ARGS) \ $(INTROSPECTION_SCANNER_ARGS) \
--quiet \
--namespace Cally --nsversion=@CLUTTER_API_VERSION@ \ --namespace Cally --nsversion=@CLUTTER_API_VERSION@ \
$(INCLUDES) \ $(INCLUDES) \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \

1
clutter/cogl/cogl/Makefile.am
View File

@ -235,7 +235,6 @@ 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) \

1
clutter/json/Makefile.am
View File

@ -44,7 +44,6 @@ BUILT_GIRSOURCES =
ClutterJson-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-json.la ClutterJson-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-json.la
$(QUIET_SCAN)$(INTROSPECTION_SCANNER) \ $(QUIET_SCAN)$(INTROSPECTION_SCANNER) \
$(INTROSPECTION_SCANNER_ARGS) \ $(INTROSPECTION_SCANNER_ARGS) \
--quiet \
--namespace ClutterJson --nsversion=@CLUTTER_API_VERSION@ \ --namespace ClutterJson --nsversion=@CLUTTER_API_VERSION@ \
$(INCLUDES) \ $(INCLUDES) \
--add-include-path=$(srcdir) --add-include-path=. \ --add-include-path=$(srcdir) --add-include-path=. \

7
configure.ac
View File

@ -983,6 +983,13 @@ dnl === GObject-Introspection check ===========================================
GOBJECT_INTROSPECTION_CHECK([0.6.14]) GOBJECT_INTROSPECTION_CHECK([0.6.14])
# --quiet has been added in in the 0.9.1 development cycle.
PKG_CHECK_EXISTS([gobject-introspection-1.0 >= 0.9.2],
[
INTROSPECTION_SCANNER_ARGS="$INTROSPECTION_SCANNER_ARGS --quiet"
AC_SUBST(INTROSPECTION_SCANNER_ARGS)
])
dnl === GTK Doc check ========================================================= dnl === GTK Doc check =========================================================
GTK_DOC_CHECK([1.13], [--flavour no-tmpl]) GTK_DOC_CHECK([1.13], [--flavour no-tmpl])