[Xfce4-commits] <xfconf:master> Silent the build.

[Nick Schermer]

Updating branch refs/heads/master
         to 4fe47563165e533d4c62c0e8a770ca9751567da0 (commit)
       from 96984ae53774f2a0d230ec5d81aded3cfc3ac01c (commit)

commit 4fe47563165e533d4c62c0e8a770ca9751567da0
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Feb 1 19:22:02 2010 +0100

    Silent the build.

 common/Makefile.am  |   12 ++++++------
 configure.ac.in     |    1 +
 xfconf/Makefile.am  |    6 +++---
 xfconfd/Makefile.am |    4 ++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/common/Makefile.am b/common/Makefile.am
index c229977..a73ae2b 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -38,11 +38,11 @@ BUILT_SOURCES = \
 xfconf-marshal.h: stamp-xfconf-marshal.h
 	@true
 stamp-xfconf-marshal.h: $(srcdir)/xfconf-marshal.list Makefile
-	glib-genmarshal --prefix=_xfconf_marshal $(srcdir)/xfconf-marshal.list --header > xfconf-marshal.h
-	echo timestamp > $(@F)
+	$(AM_V_GEN) glib-genmarshal --prefix=_xfconf_marshal $(srcdir)/xfconf-marshal.list --header > xfconf-marshal.h \
+	&& echo timestamp > $(@F)
 xfconf-marshal.c: $(srcdir)/xfconf-marshal.list Makefile
-	echo '#include "xfconf-marshal.h"' > xfconf-marshal.c
-	glib-genmarshal --prefix=_xfconf_marshal $(srcdir)/xfconf-marshal.list --body >> xfconf-marshal.c
+	$(AM_V_GEN) echo '#include "xfconf-marshal.h"' > xfconf-marshal.c \
+	&& glib-genmarshal --prefix=_xfconf_marshal $(srcdir)/xfconf-marshal.list --body >> xfconf-marshal.c
 
 
 
@@ -57,10 +57,10 @@ BUILT_SOURCES += \
 	$(libxfconf_built_sources)
 
 xfconf-alias.h: make-exo-alias.pl $(top_srcdir)/xfconf/xfconf.symbols
-	$(PERL) $(srcdir)/make-exo-alias.pl <$(top_srcdir)/xfconf/xfconf.symbols >xfconf-alias.h
+	$(AM_V_GEN) $(PERL) $(srcdir)/make-exo-alias.pl <$(top_srcdir)/xfconf/xfconf.symbols >xfconf-alias.h
 
 xfconf-aliasdef.c: make-exo-alias.pl $(top_srcdir)/xfconf/xfconf.symbols
-	$(PERL) $(srcdir)/make-exo-alias.pl -def <$(top_srcdir)/xfconf/xfconf.symbols >xfconf-aliasdef.c
+	$(AM_V_GEN) $(PERL) $(srcdir)/make-exo-alias.pl -def <$(top_srcdir)/xfconf/xfconf.symbols >xfconf-aliasdef.c
 
 endif
 
diff --git a/configure.ac.in b/configure.ac.in
index 5344d2b..dc865d7 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -26,6 +26,7 @@ dnl init automake
 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 check for UNIX variants
 AC_AIX
diff --git a/xfconf/Makefile.am b/xfconf/Makefile.am
index 3b0bf15..f636564 100644
--- a/xfconf/Makefile.am
+++ b/xfconf/Makefile.am
@@ -54,9 +54,9 @@ BUILT_SOURCES = \
 	xfconf-dbus-bindings.h
 
 xfconf-dbus-bindings.h: $(top_srcdir)/common/xfconf-dbus.xml Makefile
-	dbus-binding-tool --mode=glib-client $< > $(@).tmp
-	sed -e 's/^\([[:space:]]\+GValue[[:space:]]\+[^=]\+\).*;$$/\1 = { 0, };/' <$(@).tmp >$@
-	-rm -f $(@).tmp
+	$(AM_V_GEN) dbus-binding-tool --mode=glib-client $< > $(@).tmp \
+	&& sed -e 's/^\([[:space:]]\+GValue[[:space:]]\+[^=]\+\).*;$$/\1 = { 0, };/' <$(@).tmp >$@ \
+	&& rm -f $(@).tmp
 # the above fixes a bug in dbus-binding-tool's output
 # dbus-binding-tool doesn't initialise GValues to { 0, } properly
 
diff --git a/xfconfd/Makefile.am b/xfconfd/Makefile.am
index 28062ff..1b4c1c8 100644
--- a/xfconfd/Makefile.am
+++ b/xfconfd/Makefile.am
@@ -55,7 +55,7 @@ service_in_files = org.xfce.Xfconf.service.in
 service_DATA = $(service_in_files:.service.in=.service)
 
 %.service: %.service.in
-	sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
+	$(AM_V_GEN) sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
 
 CLEANFILES = \
 	$(service_DATA)
@@ -78,7 +78,7 @@ BUILT_SOURCES = \
 	$(xfconf_built_sources)
 
 xfconf-dbus-server.h: $(top_srcdir)/common/xfconf-dbus.xml
-	dbus-binding-tool --mode=glib-server --prefix=xfconf $< > $@
+	$(AM_V_GEN) dbus-binding-tool --mode=glib-server --prefix=xfconf $< > $@
 
 endif