[Xfce4-commits] <xfce4-screenshooter:master> Use silent build rules if available.

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to 9b5719784a44d80d2e5c2d720c7fa58cf13a81bc (commit)
       from f5a3691e4f54dca7c5eb6c9813511eced5a1499a (commit)

commit 9b5719784a44d80d2e5c2d720c7fa58cf13a81bc
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Wed Oct 14 16:40:49 2009 +0200

    Use silent build rules if available.

 Makefile.am     |   28 ++++++++++++++++++----------
 configure.ac.in |    1 +
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8e71208..639b108 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,14 +59,18 @@ BUILT_SOURCES =	$(lib_libscreenshooter_built_sources)
 lib/screenshooter-marshal.h: lib/stamp-screenshooter-marshal.h
 	@true
 lib/stamp-screenshooter-marshal.h: lib/screenshooter-marshal.list Makefile
-	@echo '/* this file is autogenerated -- do not edit */' >lib/screenshooter-marshal.h
-	glib-genmarshal --prefix=_screenshooter_marshal --header $(top_srcdir)/lib/screenshooter-marshal.list >>lib/screenshooter-marshal.h
-	echo timestamp >$@
+	$(AM_V_GEN) ( \
+		echo '/* this file is autogenerated -- do not edit */' >lib/screenshooter-marshal.h \
+		&& glib-genmarshal --prefix=_screenshooter_marshal --header $(top_srcdir)/lib/screenshooter-marshal.list >>lib/screenshooter-marshal.h \
+		&& echo timestamp >$@ \
+	)
 
 lib/screenshooter-marshal.c: lib/screenshooter-marshal.list Makefile
-	@echo '/* this file is autogenerated -- do not edit */' >$@
-	@echo '#include "screenshooter-marshal.h"' >>$@
-	glib-genmarshal --prefix=_screenshooter_marshal --body $(top_srcdir)/lib/screenshooter-marshal.list >>$@
+	$(AM_V_GEN) ( \
+		echo '/* this file is autogenerated -- do not edit */' >$@ \
+		&& echo '#include "screenshooter-marshal.h"' >>$@ \
+		&& glib-genmarshal --prefix=_screenshooter_marshal --body $(top_srcdir)/lib/screenshooter-marshal.list >>$@ \
+	)
 
 # Main application
 src_xfce4_screenshooter_CFLAGS = \
@@ -99,8 +103,10 @@ app_desktop_DATA = $(app_desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 src/xfce4-screenshooter.desktop.in: src/xfce4-screenshooter.desktop.in.in
-	sed -e "s^@PLUGIN_PATH@^$(libexecdir)/applications^" 	\
-		$< > $@
+	$(AM_V_GEN) ( \
+		sed -e "s^@PLUGIN_PATH@^$(libexecdir)/applications^" 	\
+			$< > $@
+	)
 
 # Panel plugin
 plugindir = $(libexecdir)/xfce4/panel-plugins
@@ -132,8 +138,10 @@ panel_desktop_DATA = $(panel_desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 panel-plugin/screenshooter.desktop.in: panel-plugin/screenshooter.desktop.in.in
-	sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" 	\
-		$< > $@
+	$(AM_V_GEN) ( \
+		sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" 	\
+			$< > $@
+	)
 
 # Fallback icons
 
diff --git a/configure.ac.in b/configure.ac.in
index e546e48..12f5e40 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -20,6 +20,7 @@ dnl ***************************
 AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE()
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 dnl ********************************
 dnl *** Check for basic programs ***