Make sure the macros work without silent rules
authorJohan Dahlin <johan@gnome.org>
Wed, 30 Dec 2009 23:21:33 +0000 (00:21 +0100)
committerJohan Dahlin <johan@gnome.org>
Wed, 30 Dec 2009 23:21:33 +0000 (00:21 +0100)
We should not require AM_DEFAULT_VERBOSITY to be present, workaround
that fact

Makefile.introspection

index 7bd0efe..9616294 100644 (file)
@@ -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)";
 
 #