[vinagre] build: make it more silent

[Marc-Andre Lureau <malureau src gnome org>]

commit c8e8b10c6ea4704651fde3c4c369ae8aafedfd00
Author: Marc-André Lureau <marcandre lureau redhat com>
Date:   Sun Feb 20 20:48:58 2011 +0100

    build: make it more silent

 data/Makefile.am                |    4 ++--
 plugins/dummy/Makefile.am       |    2 +-
 plugins/im-status/Makefile.am   |    2 +-
 plugins/rdp/Makefile.am         |    2 +-
 plugins/reverse-vnc/Makefile.am |    2 +-
 plugins/ssh/Makefile.am         |    2 +-
 plugins/vnc/Makefile.am         |    2 +-
 vinagre/Makefile.am             |   14 +++++++-------
 8 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index e3695f0..a4cf352 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,7 +6,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = vinagre- VINAGRE_API_VERSION@.pc
 
 vinagre- VINAGRE_API_VERSION@.pc: vinagre.pc
-	cp vinagre.pc vinagre- VINAGRE_API_VERSION@.pc
+	@cp vinagre.pc vinagre- VINAGRE_API_VERSION@.pc
 
 uidir = $(datadir)/vinagre
 ui_DATA = vinagre-ui.xml GNOME_VinagreApplet.xml vinagre.ui vinagre-fav-ui.xml
@@ -66,7 +66,7 @@ service_DATA = org.freedesktop.Telepathy.Client.Vinagre.service
 
 org.freedesktop.Telepathy.Client.Vinagre.service: org.freedesktop.Telepathy.Client.Vinagre.service.in \
 		Makefile
-	@sed -e "s|[ ]bindir[@]|$(bindir)|" $< > $@
+	$(AM_V_GEN)sed -e "s|[ ]bindir[@]|$(bindir)|" $< > $@
 
 endif
 
diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am
index 72032a5..652fd74 100644
--- a/plugins/dummy/Makefile.am
+++ b/plugins/dummy/Makefile.am
@@ -21,7 +21,7 @@ libdummy_la_LIBADD  = $(VINAGRE_LIBS)
 
 plugin_in_files = dummy.vinagre-plugin.desktop.in
 
-dummy.vinagre-plugin: dummy.vinagre-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+dummy.vinagre-plugin: dummy.vinagre-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 plugin_DATA = $(plugin_in_files:.vinagre-plugin.desktop.in=.vinagre-plugin)
 
diff --git a/plugins/im-status/Makefile.am b/plugins/im-status/Makefile.am
index 6cd003c..df64694 100644
--- a/plugins/im-status/Makefile.am
+++ b/plugins/im-status/Makefile.am
@@ -1,7 +1,7 @@
 plugindir = $(VINAGRE_PLUGINS_LIBS_DIR)
 
 plugin_in_files = im-status.plugin.desktop.in
-%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 plugin_JAVASCRIPT = im-status.js
diff --git a/plugins/rdp/Makefile.am b/plugins/rdp/Makefile.am
index 356bc34..ea6308c 100644
--- a/plugins/rdp/Makefile.am
+++ b/plugins/rdp/Makefile.am
@@ -18,7 +18,7 @@ librdp_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 librdp_la_LIBADD  = $(rdp_LIBS)
 
 plugin_in_files = rdp.plugin.desktop.in
-%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 EXTRA_DIST = $(plugin_in_files)
diff --git a/plugins/reverse-vnc/Makefile.am b/plugins/reverse-vnc/Makefile.am
index 2cf9555..c0acc93 100644
--- a/plugins/reverse-vnc/Makefile.am
+++ b/plugins/reverse-vnc/Makefile.am
@@ -26,7 +26,7 @@ uidir = $(VINAGRE_PLUGINS_DATA_DIR)/reverse-vnc
 ui_DATA = reverse-vnc.ui
 
 plugin_in_files = reverse-vnc.plugin.desktop.in
-%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 EXTRA_DIST = $(ui_DATA) $(plugin_in_files)
diff --git a/plugins/ssh/Makefile.am b/plugins/ssh/Makefile.am
index dee513d..a0af68f 100644
--- a/plugins/ssh/Makefile.am
+++ b/plugins/ssh/Makefile.am
@@ -19,7 +19,7 @@ libssh_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libssh_la_LIBADD  = $(SSH_LIBS)
 
 plugin_in_files = ssh.plugin.desktop.in
-%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 EXTRA_DIST = $(plugin_in_files)
diff --git a/plugins/vnc/Makefile.am b/plugins/vnc/Makefile.am
index 48cf339..b026abb 100644
--- a/plugins/vnc/Makefile.am
+++ b/plugins/vnc/Makefile.am
@@ -20,7 +20,7 @@ libvnc_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libvnc_la_LIBADD  = $(VNC_LIBS)
 
 plugin_in_files = vnc.plugin.desktop.in
-%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 EXTRA_DIST = $(plugin_in_files)
diff --git a/vinagre/Makefile.am b/vinagre/Makefile.am
index 053c914..c7e63a7 100644
--- a/vinagre/Makefile.am
+++ b/vinagre/Makefile.am
@@ -136,7 +136,7 @@ server_DATA =					\
 	$(server_in_files:.server.in=.server)
 
 $(server_in_files): $(server_in_files:.server.in=.server.in.in)
-	sed -e "s|\ LIBEXECDIR\@|$(libexecdir)|" -e "s|\ VERSION\@|$(VERSION)|" $< > $@
+	$(AM_V_GEN)sed -e "s|\ LIBEXECDIR\@|$(libexecdir)|" -e "s|\ VERSION\@|$(VERSION)|" $< > $@
 
 @INTLTOOL_SERVER_RULE@
 
@@ -202,7 +202,7 @@ vinagre_enum_headers = \
 	$(NULL)
 
 vinagre-enums.c: @REBUILD@ $(vinagre_enum_headers)
-	glib-mkenums    --fhead "#include <glib-object.h>\n" \
+	$(AM_V_GEN)glib-mkenums    --fhead "#include <glib-object.h>\n" \
 			--fhead "#include \"vinagre-enums.h\"\n\n" \
 			--fprod "\n/* enumerations from \"@filename \" */" \
 			--fprod "\n#include \"@filename \"\n" \
@@ -217,7 +217,7 @@ vinagre-enums.c: @REBUILD@ $(vinagre_enum_headers)
 		$(vinagre_enum_headers) > $@
 
 vinagre-enums.h: @REBUILD@ $(vinagre_enum_headers)
-	glib-mkenums    --fhead "#ifndef __VINAGRE_ENUMS_H__\n" \
+	$(AM_V_GEN)glib-mkenums    --fhead "#ifndef __VINAGRE_ENUMS_H__\n" \
 			--fhead "#define __VINAGRE_ENUMS_H__ 1\n\n" \
 			--fhead "G_BEGIN_DECLS\n\n" \
 			--ftail "G_END_DECLS\n\n" \
@@ -228,10 +228,10 @@ vinagre-enums.h: @REBUILD@ $(vinagre_enum_headers)
 		$(vinagre_enum_headers) >  $@
 
 vinagre-marshal.list: $(handwritten_sources) Makefile.am
-	( cd $(srcdir) && \
+	$(AM_V_GEN)( cd $(srcdir) && \
 	sed -n -e 's/.*vinagre_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
 	$(handwritten_sources) ) \
-	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $  tmp
+	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $  tmp && \
 	if cmp -s $  tmp $@; then \
 		rm $  tmp; \
 	else \
@@ -239,10 +239,10 @@ vinagre-marshal.list: $(handwritten_sources) Makefile.am
 	fi
 
 %-marshal.h: %-marshal.list Makefile
-	glib-genmarshal --header --prefix=_$(subst -,_,$*)_marshal $< > $*-marshal.h
+	$(AM_V_GEN)glib-genmarshal --header --prefix=_$(subst -,_,$*)_marshal $< > $*-marshal.h
 
 %-marshal.c: %-marshal.list Makefile
-	echo "#include \"vinagre-marshal.h\"" > $@ && \
+	$(AM_V_GEN)echo "#include \"vinagre-marshal.h\"" > $@ && \
 	glib-genmarshal --body --prefix=_$(subst -,_,$*)_marshal $< >> $*-marshal.c
 
 BUILT_SOURCES = \