Quieten build further

8 files changed, 36 insertions, 36 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 3504d644..6bc592c3 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,12 +11,12 @@ service_DATA = org.freedesktop.Telepathy.ConnectionManager.salut.service
 # non-archaic tarballs)
 org.freedesktop.Telepathy.ConnectionManager.salut.service: salut.service.in \
 		Makefile
-	@sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
+	$(AM_V_GEN)sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@
 
 CLEANFILES = $(service_DATA) $(manager_DATA)
 
 $(manager_DATA): always-build
 	$(MAKE) -C ../src write-mgr-file
-	../src/write-mgr-file > $@
+	$(AM_V_GEN)../src/write-mgr-file > $@
 
 .PHONY: always-build
diff --git a/docs/Makefile.am b/docs/Makefile.am
index f5608c38..87f549a9 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -12,10 +12,10 @@ CLEANFILES = \
     $(html_DATA)
 
 %.8: %.8.in Makefile
-	sed -e 's,[@]libexecdir[@],@libexecdir@,' < $< > $@
+	$(AM_V_GEN)sed -e 's,[@]libexecdir[@],@libexecdir@,' < $< > $@
 
 $(html_DATA): %.html: %.xml $(tools_dir)/xep.xsl
-	$(XSLTPROC) $(tools_dir)/xep.xsl $< > $@
+	$(AM_V_GEN)$(XSLTPROC) $(tools_dir)/xep.xsl $< > $@
 
 proto-xep-upload: $(html_DATA)
 	rsync -P $(html_DATA) people.collabora.co.uk:public_html/
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index a32ff9d7..a8b5be22 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -48,45 +48,45 @@ XSLTPROCFLAGS = --nonet --novalid
 
 _gen/%.xml: %.xml $(wildcard *.xml) $(tools_dir)/identity.xsl
 	$(mkdir_p) _gen
-	$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \
+	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude $(tools_dir)/identity.xsl \
 		$< > $@
 
 extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
-	$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude \
+	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) --xinclude \
 		$(tools_dir)/doc-generator.xsl \
 		$< > $@
 
 _gen/signals-marshal.list: _gen/all.xml \
 	$(tools_dir)/glib-signals-marshal-gen.py
-	$(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py $< > $@
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-signals-marshal-gen.py $< > $@
 
 _gen/signals-marshal.h: _gen/signals-marshal.list Makefile.am
-	$(GLIB_GENMARSHAL) --header --prefix=_salut_ext_marshal $< > $@
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_salut_ext_marshal $< > $@
 
 _gen/signals-marshal.c: _gen/signals-marshal.list Makefile.am
-	{ echo '#include "_gen/signals-marshal.h"' && \
+	$(AM_V_GEN){ echo '#include "_gen/signals-marshal.h"' && \
 	$(GLIB_GENMARSHAL) --body --prefix=_salut_ext_marshal $< ; } > $@
 
 _gen/register-dbus-glib-marshallers-body.h: _gen/all.xml \
 	$(tools_dir)/glib-client-marshaller-gen.py
-	$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< \
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< \
 		_salut_ext > $@
 
 _gen/enums.h: _gen/all.xml $(tools_dir)/c-constants-generator.xsl
-	$(XSLTPROC) $(XSLTPROCFLAGS) \
+	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
 		--stringparam mixed-case-prefix Salut \
 		$(tools_dir)/c-constants-generator.xsl \
 		$< > $@
 
 _gen/gtypes.h _gen/gtypes-body.h: _gen/all.xml \
 	$(tools_dir)/glib-gtypes-generator.py Makefile.am
-	$(PYTHON) $(tools_dir)/glib-gtypes-generator.py \
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-gtypes-generator.py \
 		$< _gen/gtypes Salut
 
 _gen/interfaces.h: _gen/all.xml \
 	$(tools_dir)/glib-interfaces-generator.xsl \
 	$(tools_dir)/c-interfaces-generator.xsl
-	$(XSLTPROC) $(XSLTPROCFLAGS) \
+	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
 		--stringparam mixed-case-prefix Salut \
 		$(tools_dir)/glib-interfaces-generator.xsl \
 		$< > $@
@@ -94,13 +94,13 @@ _gen/interfaces.h: _gen/all.xml \
 _gen/interfaces-body.h: _gen/all.xml \
 	$(tools_dir)/glib-interfaces-body-generator.xsl \
 	$(tools_dir)/c-interfaces-generator.xsl
-	$(XSLTPROC) $(XSLTPROCFLAGS) \
+	$(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
 		--stringparam mixed-case-prefix Salut \
 		$(tools_dir)/glib-interfaces-body-generator.xsl \
 		$< > $@
 
 _gen/svc.c _gen/svc.h: _gen/all.xml $(tools_dir)/glib-ginterface-gen.py
-	$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
+	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
 		--filename=_gen/svc \
 		--signal-marshal-prefix=_salut_ext \
 		--include='<telepathy-glib/dbus.h>' \
diff --git a/lib/gibber/Makefile.am b/lib/gibber/Makefile.am
index bec4168b..9480fa93 100644
--- a/lib/gibber/Makefile.am
+++ b/lib/gibber/Makefile.am
@@ -109,7 +109,7 @@ dist-hook:
 	$(shell for x in $(BUILT_SOURCES); do rm -f $(distdir)/$$x ; done)
 
 gibber-signals-marshal.list: $(HANDWRITTEN_SOURCES) Makefile.am
-	( cd $(srcdir) && \
+	$(AM_V_GEN)( cd $(srcdir) && \
 	sed -n -e 's/.*_gibber_signals_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
 	$(HANDWRITTEN_SOURCES) ) \
 	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
@@ -120,10 +120,10 @@ gibber-signals-marshal.list: $(HANDWRITTEN_SOURCES) Makefile.am
 	fi
 
 %-signals-marshal.h: %-signals-marshal.list Makefile.am
-	glib-genmarshal --header --prefix=_$(subst -,_,$*)_signals_marshal $< > $@
+	$(AM_V_GEN)glib-genmarshal --header --prefix=_$(subst -,_,$*)_signals_marshal $< > $@
 
 %-signals-marshal.c: %-signals-marshal.list Makefile.am
-	{ echo '#include "$*-signals-marshal.h"' && \
+	$(AM_V_GEN){ echo '#include "$*-signals-marshal.h"' && \
 	glib-genmarshal --body --prefix=_$(subst -,_,$*)_signals_marshal $< ; \
 	} > $@
 
@@ -150,7 +150,7 @@ endif
 
 # rules for making the glib enum objects
 %-enumtypes.h: %.h Makefile.in
-	glib-mkenums \
+	$(AM_V_GEN)glib-mkenums \
 	--fhead "#ifndef __$(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n#define __$(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
 	--fprod "/* enumerations from \"@filename@\" */\n" \
 	--vhead "GType @enum_name@_get_type (void);\n#define $(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"         \
@@ -158,7 +158,7 @@ endif
 	$< > $@
 
 %-enumtypes.c: %.h Makefile.in
-	glib-mkenums \
+	$(AM_V_GEN)glib-mkenums \
 	--fhead "#include <$*.h>\n#include <$*-enumtypes.h>" \
 	--fprod "\n/* enumerations from \"@filename@\" */" \
 	--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {"     \
diff --git a/src/Makefile.am b/src/Makefile.am
index cd7fc494..9e193070 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -174,7 +174,7 @@ $(top_builddir)/lib/gibber/libgibber.la:
 .PHONY: $(top_builddir)/lib/gibber/libgibber.la
 
 salut-signals-marshal.list: $(CORE_SOURCES) $(AVAHI_BACKEND_SOURCES) $(DUMMY_BACKEND_SOURCES) Makefile.am
-	( cd $(srcdir) && \
+	$(AM_V_GEN)( cd $(srcdir) && \
 	sed -n -e 's/.*salut_signals_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
 	$(CORE_SOURCES) $(AVAHI_BACKEND_SOURCES) $(DUMMY_BACKEND_SOURCES) ) \
 	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
@@ -185,16 +185,16 @@ salut-signals-marshal.list: $(CORE_SOURCES) $(AVAHI_BACKEND_SOURCES) $(DUMMY_BAC
 	fi
 
 %-signals-marshal.h: %-signals-marshal.list Makefile.am
-	glib-genmarshal --header --prefix=$(subst -,_,$*)_signals_marshal $< > $@
+	$(AM_V_GEN)glib-genmarshal --header --prefix=$(subst -,_,$*)_signals_marshal $< > $@
 
 %-signals-marshal.c: %-signals-marshal.list Makefile.am
-	{ echo '#include "$*-signals-marshal.h"' && \
+	$(AM_V_GEN){ echo '#include "$*-signals-marshal.h"' && \
 	glib-genmarshal --body --prefix=$(subst -,_,$*)_signals_marshal $< ; \
 	} > $@
 
 # rules for making the glib enum objects
 %-enumtypes.h: %.h Makefile.in
-	glib-mkenums \
+	$(AM_V_GEN)glib-mkenums \
 	--fhead "#ifndef __$(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n#define __$(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
 	--fprod "/* enumerations from \"@filename@\" */\n" \
 	--vhead "GType @enum_name@_get_type (void);\n#define $(shell echo $* | LC_ALL=C tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"         \
@@ -202,7 +202,7 @@ salut-signals-marshal.list: $(CORE_SOURCES) $(AVAHI_BACKEND_SOURCES) $(DUMMY_BAC
 	$< > $@
 
 %-enumtypes.c: %.h Makefile.in
-	glib-mkenums \
+	$(AM_V_GEN)glib-mkenums \
 	--fhead "#include <$*.h>\n#include <$*-enumtypes.h>" \
 	--fprod "\n/* enumerations from \"@filename@\" */" \
 	--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {"     \
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 5a46a38e..e8b3a746 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -84,7 +84,7 @@ check-twisted:
 	fi
 
 config.py: Makefile
-	echo "PACKAGE_STRING = \"$(PACKAGE_STRING)\"" > config.py
+	$(AM_V_GEN)echo "PACKAGE_STRING = \"$(PACKAGE_STRING)\"" > config.py
 
 BUILT_SOURCES = config.py
 
diff --git a/tests/twisted/tools/Makefile.am b/tests/twisted/tools/Makefile.am
index d4459b47..386ebeaf 100644
--- a/tests/twisted/tools/Makefile.am
+++ b/tests/twisted/tools/Makefile.am
@@ -1,15 +1,15 @@
 exec-with-log.sh: exec-with-log.sh.in
-	sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
-	chmod +x $@
+	$(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
+	@chmod +x $@
 
 %.conf: %.conf.in
-	sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
+	$(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
 
 # We don't use the full filename for the .in because > 99 character filenames
 # in tarballs are non-portable (and automake 1.8 doesn't let us build
 # non-archaic tarballs)
 org.freedesktop.Telepathy.ConnectionManager.%.service: %.service.in
-	sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
+	$(AM_V_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
 
 # D-Bus service file for testing
 service_in_files = salut.service.in
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 1ebea7ef..e21cbed5 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -19,18 +19,18 @@ EXTRA_DIST = \
     xep.xsl
 
 glib-client-marshaller-gen.py: libglibcodegen.py
-	touch $@
+	@touch $@
 glib-ginterface-gen.py: libglibcodegen.py
-	touch $@
+	@touch $@
 glib-gtypes-generator.py: libglibcodegen.py
-	touch $@
+	@touch $@
 glib-signals-marshal-gen.py: libglibcodegen.py
-	touch $@
+	@touch $@
 
 glib-interfaces-generator.xsl: c-interfaces-generator.xsl
-	touch $@
+	@touch $@
 glib-interfaces-body-generator.xsl: c-interfaces-generator.xsl
-	touch $@
+	@touch $@
 
 maintainer-update-from-xmpp.org:
 	set -e; \