From 0aa31b4ebc4938627a9993e109043da6184939ad Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 10 Aug 2009 12:45:44 +0200 Subject: [PATCH] Use AM_SILENT_RULES if automake >= 1.11 is installed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1756 Based on a patch by: Javier Jardón --- Makefile.am | 6 ++++-- common/Makefile.am | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 62998a6f8..7e28f92c0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,10 @@ NULL = -V = @ -Q = $(V:1=) +if USE_SHAVE QUIET_GEN = $(Q:@=@echo ' GEN '$@;) +else +QUIET_GEN = $(AM_V_GEN) +endif # USE_SHAVE SUBDIRS = common $(CLUTTER_COGL) diff --git a/common/Makefile.am b/common/Makefile.am index 15fb295fa..6a9116900 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1,9 +1,10 @@ NULL = -V = @ -Q = $(V:1=) +if USE_SHAVE QUIET_GEN = $(Q:@=@echo ' GEN '$@;) -QUIET_CP = $(Q:@=@echo ' CP '$@;) +else +QUIET_GEN = $(AM_V_GEN) +endif # USE_SHAVE INCLUDES = \ -I$(top_srcdir) \