From: Johan Dahlin <johan@gnome.org>
Date: Wed, 30 Dec 2009 23:21:33 +0000 (+0100)
Subject: Make sure the macros work without silent rules
X-Git-Tag: GOBJECT_INTROSPECTION_0_6_8~32
X-Git-Url: http://git.roojs.org/?p=gnome.gobject-introspection;a=commitdiff_plain;h=8be17d491115ff1a13ec7591580488dac6b80ab2

Make sure the macros work without silent rules

We should not require AM_DEFAULT_VERBOSITY to be present, workaround
that fact
---

diff --git a/Makefile.introspection b/Makefile.introspection
index 7bd0efe..9616294 100644
--- a/Makefile.introspection
+++ b/Makefile.introspection
@@ -63,12 +63,14 @@ _gir_includes = $(foreach include,$($(_gir_name)_INCLUDES),--include=$(include))
 _gir_libtool = $(if $(LIBTOOL),--libtool="$(LIBTOOL)")
 
 # Macros for AM_SILENT_RULES prettiness
+_gir_verbosity = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1)
+
 _gir_silent_scanner = $(_gir_silent_scanner_$(V))
-_gir_silent_scanner_ = $(_gir_silent_scanner_$(AM_DEFAULT_VERBOSITY))
+_gir_silent_scanner_ = $(_gir_silent_scanner_$(_gir_verbosity))
 _gir_silent_scanner_0 = @echo "  GISCAN $(1)";
 
 _gir_silent_compiler = $(_gir_silent_compiler_$(V))
-_gir_silent_compiler_ = $(_gir_silent_compiler_$(AM_DEFAULT_VERBOSITY))
+_gir_silent_compiler_ = $(_gir_silent_compiler_$(_gir_verbosity))
 _gir_silent_compiler_0 = @echo "  GICOMP $(1)";
 
 #