[totem] Bug 590551 - Nicer build with AM_SILENT_RULES Automake option

[Bastien Nocera <hadess src gnome org>]

commit cb608927f3c43cfeb578745a3454c9b20a002518
Author: Robin Stocker <robin nibor org>
Date:   Fri Sep 4 10:25:25 2009 +0100

    Bug 590551 - Nicer build with AM_SILENT_RULES Automake option
    
    With an additional sprinkling of AM_V_GEN

 configure.in                              |    3 +++
 data/Makefile.am                          |   12 ++++++------
 src/Makefile.am                           |   12 ++++++------
 src/plugins/media-player-keys/Makefile.am |    4 ++--
 4 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/configure.in b/configure.in
index 21c8e69..10011d9 100644
--- a/configure.in
+++ b/configure.in
@@ -13,6 +13,9 @@ AC_CONFIG_HEADERS([config.h])
 
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip check-news subdir-objects])
 
+# Enable silent build when available (Automake 1.11)
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
 dnl Add the languages which your application supports to po/LINGUAS
 GETTEXT_PACKAGE=totem
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define to the Gettext package name])
diff --git a/data/Makefile.am b/data/Makefile.am
index 58b3f73..0677ae7 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -43,27 +43,27 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 totem.desktop.in: totem.desktop.in.in mime-type-list.txt desktop.sh
-	cat totem.desktop.in.in | sed 's,@FULL_LIBEXECDIR@,$(FULL_LIBEXECDIR),' > $@ &&\
+	$(AM_V_GEN) cat totem.desktop.in.in | sed 's,@FULL_LIBEXECDIR@,$(FULL_LIBEXECDIR),' > $@ &&\
 	$(SHELL) $(srcdir)/desktop.sh $(srcdir)/mime-type-list.txt	\
 	>> $@
 
 nodist_noinst_HEADERS = totem-mime-types.h nautilus-audio-mime-types.h
 totem-mime-types.h: mime-type-include.sh mime-type-list.txt mime-functions.sh
-	$(srcdir)/mime-type-include.sh $(srcdir)/mime-type-list.txt	\
+	$(AM_V_GEN) $(srcdir)/mime-type-include.sh $(srcdir)/mime-type-list.txt	\
 	> $@
 nautilus-audio-mime-types.h: mime-type-include.sh mime-type-list.txt mime-functions.sh
-	$(srcdir)/mime-type-include.sh --nautilus $(srcdir)/mime-type-list.txt	\
+	$(AM_V_GEN) $(srcdir)/mime-type-include.sh --nautilus $(srcdir)/mime-type-list.txt	\
 	> $@
 
 update-gconf.sh: totem-video-thumbnail.schemas.in
 
 totem-video-thumbnail.schemas.in: schemas.sh mime-type-list.txt mime-functions.sh
-	$(srcdir)/schemas.sh $(srcdir)/mime-type-list.txt $(bindir)	\
+	$(AM_V_GEN) $(srcdir)/schemas.sh $(srcdir)/mime-type-list.txt $(bindir)	\
 	> $@								\
 	3> update-gconf.sh
 
 totem-handlers.schemas.in: handlers.sh
-	$(srcdir)/handlers.sh > $@
+	$(AM_V_GEN) $(srcdir)/handlers.sh > $@
 
 generated_schema_in_files = totem-video-thumbnail.schemas.in totem-handlers.schemas.in
 schema_in_files = totem.schemas.in $(generated_schema_in_files)
@@ -72,7 +72,7 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
 
 totem-video-thumbnailer.1: totem-video-thumbnailer.pod
-	pod2man -c "" -s 1 -q none -n totem-video-thumbnailer -r GNOME $< > $@
+	$(AM_V_GEN) pod2man -c "" -s 1 -q none -n totem-video-thumbnailer -r GNOME $< > $@
 
 install-data-local: $(schema_DATA)
 if GCONF_SCHEMAS_INSTALL
diff --git a/src/Makefile.am b/src/Makefile.am
index a797b25..2d70fc3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -154,17 +154,17 @@ GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
 BUILT_SOURCES = $(TOTEMMARSHALFILES)
 
 totemobject-marshal.h: totemobject-marshal.list Makefile
-	( $(GLIB_GENMARSHAL) --prefix=totemobject_marshal $(srcdir)/totemobject-marshal.list --header > totemobject-marshal.h )
+	$(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=totemobject_marshal $(srcdir)/totemobject-marshal.list --header > totemobject-marshal.h )
 totemobject-marshal.c: totemobject-marshal.h Makefile
-	( $(GLIB_GENMARSHAL) --prefix=totemobject_marshal $(srcdir)/totemobject-marshal.list --header --body > totemobject-marshal.c )
+	$(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=totemobject_marshal $(srcdir)/totemobject-marshal.list --header --body > totemobject-marshal.c )
 totemplaylist-marshal.h: totemplaylist-marshal.list Makefile
-	( $(GLIB_GENMARSHAL) --prefix=totemplaylist_marshal $(srcdir)/totemplaylist-marshal.list --header > totemplaylist-marshal.h )
+	$(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=totemplaylist_marshal $(srcdir)/totemplaylist-marshal.list --header > totemplaylist-marshal.h )
 totemplaylist-marshal.c: totemplaylist-marshal.h Makefile
-	( $(GLIB_GENMARSHAL) --prefix=totemplaylist_marshal $(srcdir)/totemplaylist-marshal.list --header --body > totemplaylist-marshal.c )
+	$(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=totemplaylist_marshal $(srcdir)/totemplaylist-marshal.list --header --body > totemplaylist-marshal.c )
 totemvideolist-marshal.h: totemvideolist-marshal.list Makefile
-	( $(GLIB_GENMARSHAL) --prefix=totemvideolist_marshal $(srcdir)/totemvideolist-marshal.list --header > totemvideolist-marshal.h )
+	$(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=totemvideolist_marshal $(srcdir)/totemvideolist-marshal.list --header > totemvideolist-marshal.h )
 totemvideolist-marshal.c: totemvideolist-marshal.h Makefile
-	( $(GLIB_GENMARSHAL) --prefix=totemvideolist_marshal $(srcdir)/totemvideolist-marshal.list --header --body > totemvideolist-marshal.c )
+	$(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=totemvideolist_marshal $(srcdir)/totemvideolist-marshal.list --header --body > totemvideolist-marshal.c )
 
 totem_SOURCES = totem.c
 
diff --git a/src/plugins/media-player-keys/Makefile.am b/src/plugins/media-player-keys/Makefile.am
index 9c1860d..48f158b 100644
--- a/src/plugins/media-player-keys/Makefile.am
+++ b/src/plugins/media-player-keys/Makefile.am
@@ -42,10 +42,10 @@ BUILT_SOURCES =			\
 
 #Rule to generate the marshal files
 totem-marshal.c: totem-marshal.list
-	@GLIB_GENMARSHAL@ --prefix=totem_marshal $< --header --body > $@
+	$(AM_V_GEN) @GLIB_GENMARSHAL@ --prefix=totem_marshal $< --header --body > $@
 
 totem-marshal.h: totem-marshal.list
-	@GLIB_GENMARSHAL@ --prefix=totem_marshal $< --header > $@
+	$(AM_V_GEN) @GLIB_GENMARSHAL@ --prefix=totem_marshal $< --header > $@
 
 EXTRA_DIST = totem-marshal.list $(plugin_in_files)