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

[Jannis Pohlmann]

Updating branch refs/heads/master
         to dde5678ffb9e97c0664210e15220e2b25bc1e66b (commit)
       from 7afa5c9ca5f8718fdbef923e447438f1b8473b65 (commit)

commit dde5678ffb9e97c0664210e15220e2b25bc1e66b
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Wed Oct 14 14:30:55 2009 +0200

    Use silent build rules if available.

 configure.ac         |    1 +
 tumbler/Makefile.am  |   40 ++++++++++++++++++++++------------------
 tumblerd/Makefile.am |    6 +++---
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/configure.ac b/configure.ac
index ee69471..4918c87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_SUBST([ACLOCAL_AMFLAGS], ["$ACLOCAL_FLAGS -I m4"])
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE()
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 dnl **************************
 dnl *** Libtool versioning ***
diff --git a/tumbler/Makefile.am b/tumbler/Makefile.am
index 9ff6d2c..e1d53ed 100644
--- a/tumbler/Makefile.am
+++ b/tumbler/Makefile.am
@@ -114,23 +114,27 @@ tumbler-marshal.h: stamp-tumbler-marshal.h
 	@true
 
 stamp-tumbler-marshal.h: tumbler-marshal.list Makefile
-	cd $(top_builddir)/tumbler \
-	&& echo "#ifndef __TUMBLER_MARSHAL_H__" > xgen-emh \
-	&& echo "#define __TUMBLER_MARSHAL_H__" >> xgen-emh \
-	&& ( glib-genmarshal \
-		--prefix=tumbler_marshal \
-		--header $(srcdir)/tumbler-marshal.list ) >> xgen-emh \
-	&& echo "#endif /* !__TUMBLER_MARSHAL_H__ */" >> xgen-emh \
-	&& ( cmp -s xgen-emh tumbler-marshal.h \
-		|| cp xgen-emh tumbler-marshal.h ) \
-	&& rm -f xgen-emh \
-	&& echo timestamp > $(@F)
+	$(AM_V_GEN) ( \
+	  cd $(top_builddir)/tumbler \
+	  && echo "#ifndef __TUMBLER_MARSHAL_H__" > xgen-emh \
+	  && echo "#define __TUMBLER_MARSHAL_H__" >> xgen-emh \
+	  && ( glib-genmarshal \
+	  	--prefix=tumbler_marshal \
+	  	--header $(srcdir)/tumbler-marshal.list ) >> xgen-emh \
+	  && echo "#endif /* !__TUMBLER_MARSHAL_H__ */" >> xgen-emh \
+	  && ( cmp -s xgen-emh tumbler-marshal.h \
+	  	|| cp xgen-emh tumbler-marshal.h ) \
+	  && rm -f xgen-emh \
+	  && echo timestamp > $(@F) \
+	)
 
 tumbler-marshal.c: tumbler-marshal.list Makefile
-	cd $(top_builddir)/tumbler \
-	&& echo "#include <tumbler/tumbler-marshal.h>" > xgen-emc \
-	&& ( glib-genmarshal \
-		--prefix=tumbler_marshal \
-		--body $(srcdir)/tumbler-marshal.list ) >> xgen-emc \
-	&& cp xgen-emc tumbler-marshal.c \
-	&& rm -f xgen-emc
+	$(AM_V_GEN) ( \
+	  cd $(top_builddir)/tumbler \
+	  && echo "#include <tumbler/tumbler-marshal.h>" > xgen-emc \
+	  && ( glib-genmarshal \
+	  	--prefix=tumbler_marshal \
+	  	--body $(srcdir)/tumbler-marshal.list ) >> xgen-emc \
+	  && cp xgen-emc tumbler-marshal.c \
+	  && rm -f xgen-emc \
+	)
diff --git a/tumblerd/Makefile.am b/tumblerd/Makefile.am
index 6526dc0..230468b 100644
--- a/tumblerd/Makefile.am
+++ b/tumblerd/Makefile.am
@@ -99,10 +99,10 @@ BUILT_SOURCES =								\
 	$(tumblerd_built_sources)
 
 tumbler-cache-service-dbus-bindings.h: tumbler-cache-service-dbus.xml Makefile
-	$(DBUS_BINDING_TOOL) --mode=glib-server --prefix=tumbler_cache_service $< > $@
+	$(AM_V_GEN) $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=tumbler_cache_service $< > $@
 
 tumbler-manager-dbus-bindings.h: tumbler-manager-dbus.xml Makefile
-	$(DBUS_BINDING_TOOL) --mode=glib-server --prefix=tumbler_manager $< > $@
+	$(AM_V_GEN) $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=tumbler_manager $< > $@
 
 tumbler-service-dbus-bindings.h: tumbler-service-dbus.xml Makefile
-	$(DBUS_BINDING_TOOL) --mode=glib-server --prefix=tumbler_service $< > $@
+	$(AM_V_GEN) $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=tumbler_service $< > $@