[gnome-games] Support silent build with automake 1.11

[Christian Persch <chpe src gnome org>]

commit be1acb7b193b661bde5a94cab24368bfc09928bd
Author: Christian Persch <chpe gnome org>
Date:   Sun Aug 16 21:28:34 2009 +0200

    Support silent build with automake 1.11
    
    Add AM_SILENT_RULES, and sprinkle some $(AM_V_GEN) around. Bug #587601.

 Makefile.am                  |    2 +-
 aisleriot/Makefile.am        |    2 +-
 configure.in                 |   13 +++++++++----
 glchess/src/Makefile.am      |    6 +++---
 gnome-sudoku/src/Makefile.am |    3 +--
 libgames-support/Makefile.am |    8 ++++----
 6 files changed, 19 insertions(+), 15 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a9c083c..6606ac7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 
 # Build ChangeLog from git log
 ChangeLog:
-	@if test -f $(top_srcdir)/.git/HEAD; then \
+	$(AM_V_GEN) if test -f $(top_srcdir)/.git/HEAD; then \
 		git log --stat --no-color --since=2008-06-21 > $@; \
 	fi
 
diff --git a/aisleriot/Makefile.am b/aisleriot/Makefile.am
index 8026847..2fbd161 100644
--- a/aisleriot/Makefile.am
+++ b/aisleriot/Makefile.am
@@ -162,7 +162,7 @@ service_DATA = $(ossoservice_in_files:.service.in=.service)
 endif
 
 %.service: %.service.in Makefile
-	sed -e "s|%bindir%|$(bindir)|" $< > $@
+	$(AM_V_GEN) sed -e "s|%bindir%|$(bindir)|" $< > $@
 
 install-schemas-local: $(schema_DATA)
 if GCONF_SCHEMAS_INSTALL
diff --git a/configure.in b/configure.in
index 9bfb84e..98075fe 100644
--- a/configure.in
+++ b/configure.in
@@ -12,6 +12,13 @@ AC_CONFIG_HEADERS([config.h])
 
 AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 foreign])
 
+m4_ifdef([AM_SILENT_RULES],
+  [AM_SILENT_RULES([no])],
+  [SHAVE_INIT([],[enable])
+   AC_CONFIG_FILES([shave shave-libtool])
+   AC_SUBST([AM_V_GEN],['$(QUIET_GEN)'])
+  ])
+
 if test -z "$enable_maintainer_mode"; then
   enable_maintainer_mode=yes
 fi
@@ -859,7 +866,7 @@ AM_CONDITIONAL([INSTALL_GGZ_GTK],[false])
 AM_CONDITIONAL([GGZ_CLIENT], [test "$have_ggz" = "yes"])
 AM_CONDITIONAL([WITH_INCLUDED_GGZ],[test "$have_ggz" = "yes"])
 
-GNOME_GAMES_GGZ_DSC_RULE='%.dsc:   %.dsc.in   ; $(SED) -e "s|[ ]VERSION[@]|$(VERSION)|g" -e "s|[ ]libexecdir[@]|$(libexecdir)|g" -e "s|[ ]bindir[@]|$(bindir)|g" -e "s|[ ]ggzexecmoddir[@]|$(ggzexecmoddir)|g"< $< > $[ ]'
+GNOME_GAMES_GGZ_DSC_RULE='%.dsc:   %.dsc.in   ; $(AM_V_GEN) $(SED) -e "s|[ ]VERSION[@]|$(VERSION)|g" -e "s|[ ]libexecdir[@]|$(libexecdir)|g" -e "s|[ ]bindir[@]|$(bindir)|g" -e "s|[ ]ggzexecmoddir[@]|$(ggzexecmoddir)|g"< $< > $[ ]'
 AC_SUBST([GNOME_GAMES_GGZ_DSC_RULE])
 
 # ********
@@ -878,7 +885,7 @@ AM_GLIB_GNU_GETTEXT
 
 IT_PROG_INTLTOOL([0.35.0])
 
-GNOME_GAMES_GGZ_INTLTOOL_ROOM_RULE='%.room:   %.room.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+GNOME_GAMES_GGZ_INTLTOOL_ROOM_RULE='%.room:   %.room.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
 AC_SUBST([GNOME_GAMES_GGZ_INTLTOOL_ROOM_RULE])
 
 # ********************
@@ -1260,8 +1267,6 @@ lightsoff/data/themes/tango/Makefile
 lightsoff/data/themes/up/Makefile
 tests/Makefile
 tests/libgames-support/Makefile
-shave
-shave-libtool
 ])
 AC_OUTPUT
 
diff --git a/glchess/src/Makefile.am b/glchess/src/Makefile.am
index 16c631b..e5662a7 100644
--- a/glchess/src/Makefile.am
+++ b/glchess/src/Makefile.am
@@ -7,7 +7,7 @@ bin_SCRIPTS = glchess
 CLEANFILES  = glchess glchess.in
 
 glchess: glchess.in
-	sed \
+	$(AM_V_GEN) sed \
 		-e "s|\#pyexecdir\#|$(pyexecdir)|" \
-	    	$< > $@
-	if test -f $@; then chmod u+x $@; fi
+	    	$< > $@ && \
+	chmod u+x $@
diff --git a/gnome-sudoku/src/Makefile.am b/gnome-sudoku/src/Makefile.am
index c37bbce..e7ebfd4 100644
--- a/gnome-sudoku/src/Makefile.am
+++ b/gnome-sudoku/src/Makefile.am
@@ -7,5 +7,4 @@ bin_SCRIPTS = gnome-sudoku
 CLEANFILES  = gnome-sudoku gnome-sudoku.in
 
 gnome-sudoku: gnome-sudoku.in
-	cp gnome-sudoku.in $@
-	if test -f $@; then chmod u+x $@; fi
+	$(AM_V_GEN) cp gnome-sudoku.in $@ && then chmod u+x
diff --git a/libgames-support/Makefile.am b/libgames-support/Makefile.am
index 37f630c..b9f1d95 100644
--- a/libgames-support/Makefile.am
+++ b/libgames-support/Makefile.am
@@ -342,13 +342,13 @@ DISTCLEANFILES = $(schema_DATA)
 games-marshal.c: stamp-games-marshal.c
 	@true
 stamp-games-marshal.c: games-marshal.list Makefile
-	$(GLIB_GENMARSHAL) --prefix=games_marshal $< --header --body $(GLIB_GENMARSHAL_INTERNAL) > games-marshal.c \
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=games_marshal $< --header --body $(GLIB_GENMARSHAL_INTERNAL) > games-marshal.c \
 	&& echo timestamp > $(@F)
 
 games-marshal.h: stamp-games-marshal.h
 	@true
 stamp-games-marshal.h: games-marshal.list Makefile
-	$(GLIB_GENMARSHAL) --prefix=games_marshal $< --header $(GLIB_GENMARSHAL_INTERNAL) > games-marshal.h \
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=games_marshal $< --header $(GLIB_GENMARSHAL_INTERNAL) > games-marshal.h \
 	&& echo timestamp > $(@F)
 
 if HAVE_INTROSPECTION
@@ -363,7 +363,7 @@ libgames_support_gi_la_LIBADD = $(libgames_support_la_LIBADD)
 BUILT_GIRSOURCES = GnomeGamesSupport-1.0.gir GGZ-1.0.gir
 
 GnomeGamesSupport-1.0.gir: $(INTROSPECTION_SCANNER) libgames-support-gi.la $(libgames_support_gi_la_SOURCES)
-	$(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
+	$(AM_V_GEN) $(INTROSPECTION_SCANNER) -v \
 	--namespace GnomeGamesSupport --nsversion=1.0 \
 	--strip-prefix=games \
 	--add-include-path=$(srcdir) --add-include=path=. \
@@ -392,7 +392,7 @@ typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
-	$(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $@
+	$(AM_V_GEN) $(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $@
 
 CLEANFILES += GnomeGamesSupport-1.0.gir $(typelibs_DATA)