[gnome-session] [build] Use silent-rules instead of shave for quiet build

[Vincent Untz <vuntz src gnome org>]

commit 0d206e3ef18617c2bc7d9da2b5ca5024ea503a8f
Author: Vincent Untz <vuntz gnome org>
Date:   Tue Jul 21 18:29:56 2009 +0200

    [build] Use silent-rules instead of shave for quiet build

 compat/Makefile.am        |    4 +--
 configure.in              |    6 +---
 data/Makefile.am          |    3 +-
 doc/dbus/Makefile.am      |   13 +++----
 gnome-session/Makefile.am |   15 ++++-----
 m4/shave.m4               |   77 ---------------------------------------------
 splash/Makefile.am        |    3 +-
 7 files changed, 17 insertions(+), 104 deletions(-)
---
diff --git a/compat/Makefile.am b/compat/Makefile.am
index fd5de47..7b546b9 100644
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -1,5 +1,3 @@
-QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
-
 INCLUDES =					\
 	$(WARN_CFLAGS)				\
 	$(DISABLE_DEPRECATED_CFLAGS)		\
@@ -37,7 +35,7 @@ gnome_settings_daemon_helper_LDADD =		\
 @INTLTOOL_DESKTOP_RULE@
 
 %.desktop.in: %.desktop.in.in Makefile.am
-	$(QUIET_GEN)sed -e 's,\ helperdir\@,$(helperdir),' \
+	$(AM_V_GEN)sed -e 's,\ helperdir\@,$(helperdir),' \
 		< $< > $@
 
 EXTRA_DIST =					\
diff --git a/configure.in b/configure.in
index 2439348..0e6098a 100644
--- a/configure.in
+++ b/configure.in
@@ -2,9 +2,9 @@ AC_INIT([gnome-session], [2.27.5],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session])
 AC_CONFIG_SRCDIR([gnome-session])
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AM_MAINTAINER_MODE
 
@@ -342,12 +342,8 @@ if test "x$enable_rebuilds" = "xyes" && \
 fi
 AC_SUBST(REBUILD)
 
-SHAVE_INIT([.], [enable])
-
 AC_OUTPUT([
 Makefile
-shave
-shave-libtool
 capplet/Makefile
 compat/Makefile
 compat/at-spi-registryd-wrapper.desktop.in.in
diff --git a/data/Makefile.am b/data/Makefile.am
index 262662a..f9feade 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,4 @@
 NULL =
-QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
 
 SUBDIRS = icons
 
@@ -25,7 +24,7 @@ schemasdir = $(GCONF_SCHEMA_FILE_DIR)
 schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
 
 $(schemas_in_files): $(schemas_in_files).in Makefile
-	$(QUIET_GEN)sed \
+	$(AM_V_GEN)sed \
 	     -e "s|\ DEFAULT_WM\@|$(DEFAULT_WM)|" \
 	     $< > $@
 
diff --git a/doc/dbus/Makefile.am b/doc/dbus/Makefile.am
index 0429d00..a64871a 100644
--- a/doc/dbus/Makefile.am
+++ b/doc/dbus/Makefile.am
@@ -1,5 +1,4 @@
 NULL =
-QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
 
 SPEC_XML_FILES =			\
 	gnome-session.xml		\
@@ -16,7 +15,7 @@ htmldocdir = $(docdir)/dbus
 htmldoc_DATA = gnome-session.html
 
 gnome-session.html : $(SPEC_XML_FILES)
-	$(QUIET_GEN)$(XMLTO) xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl gnome-session.xml
+	$(AM_V_GEN)$(XMLTO) xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl gnome-session.xml
 
 endif # DOCBOOK_DOCS_ENABLED
 
@@ -29,15 +28,15 @@ BUILT_SOURCES =	\
 	$(NULL)
 
 org.gnome.SessionManager.ref.xml : $(top_srcdir)/gnome-session/org.gnome.SessionManager.xml spec-to-docbook.xsl
-	$(QUIET_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
+	$(AM_V_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
 org.gnome.SessionManager.Client.ref.xml : $(top_srcdir)/gnome-session/org.gnome.SessionManager.Client.xml spec-to-docbook.xsl
-	$(QUIET_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
+	$(AM_V_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
 org.gnome.SessionManager.ClientPrivate.ref.xml : $(top_srcdir)/gnome-session/org.gnome.SessionManager.ClientPrivate.xml spec-to-docbook.xsl
-	$(QUIET_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
+	$(AM_V_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
 org.gnome.SessionManager.Inhibitor.ref.xml : $(top_srcdir)/gnome-session/org.gnome.SessionManager.Inhibitor.xml spec-to-docbook.xsl
-	$(QUIET_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
+	$(AM_V_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
 org.gnome.SessionManager.Presence.ref.xml : $(top_srcdir)/gnome-session/org.gnome.SessionManager.Presence.xml spec-to-docbook.xsl
-	$(QUIET_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
+	$(AM_V_GEN)$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
 
 CLEANFILES =				\
 	$(BUILT_SOURCES)
diff --git a/gnome-session/Makefile.am b/gnome-session/Makefile.am
index a199e82..7d9d535 100644
--- a/gnome-session/Makefile.am
+++ b/gnome-session/Makefile.am
@@ -1,5 +1,4 @@
 NULL =
-QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
 
 bin_PROGRAMS = gnome-session
 
@@ -110,26 +109,26 @@ libgsmutil_la_SOURCES =				\
 	gsm-util.h
 
 gsm-marshal.c: gsm-marshal.list
-	$(QUIET_GEN)echo "#include \"gsm-marshal.h\"" > $@ && \
+	$(AM_V_GEN)echo "#include \"gsm-marshal.h\"" > $@ && \
 	@GLIB_GENMARSHAL@ $< --prefix=gsm_marshal --body >> $@
 
 gsm-marshal.h: gsm-marshal.list
-	$(QUIET_GEN)@GLIB_GENMARSHAL@ $< --prefix=gsm_marshal --header > $@
+	$(AM_V_GEN)@GLIB_GENMARSHAL@ $< --prefix=gsm_marshal --header > $@
 
 gsm-manager-glue.h: org.gnome.SessionManager.xml Makefile.am
-	$(QUIET_GEN)dbus-binding-tool --prefix=gsm_manager --mode=glib-server --output=gsm-manager-glue.h $(srcdir)/org.gnome.SessionManager.xml
+	$(AM_V_GEN)dbus-binding-tool --prefix=gsm_manager --mode=glib-server --output=gsm-manager-glue.h $(srcdir)/org.gnome.SessionManager.xml
 
 gsm-client-glue.h: org.gnome.SessionManager.Client.xml Makefile.am
-	$(QUIET_GEN)dbus-binding-tool --prefix=gsm_client --mode=glib-server --output=gsm-client-glue.h $(srcdir)/org.gnome.SessionManager.Client.xml
+	$(AM_V_GEN)dbus-binding-tool --prefix=gsm_client --mode=glib-server --output=gsm-client-glue.h $(srcdir)/org.gnome.SessionManager.Client.xml
 
 gsm-app-glue.h: org.gnome.SessionManager.App.xml Makefile.am
-	$(QUIET_GEN)dbus-binding-tool --prefix=gsm_app --mode=glib-server --output=gsm-app-glue.h $(srcdir)/org.gnome.SessionManager.App.xml
+	$(AM_V_GEN)dbus-binding-tool --prefix=gsm_app --mode=glib-server --output=gsm-app-glue.h $(srcdir)/org.gnome.SessionManager.App.xml
 
 gsm-inhibitor-glue.h: org.gnome.SessionManager.Inhibitor.xml Makefile.am
-	$(QUIET_GEN)dbus-binding-tool --prefix=gsm_inhibitor --mode=glib-server --output=gsm-inhibitor-glue.h $(srcdir)/org.gnome.SessionManager.Inhibitor.xml
+	$(AM_V_GEN)dbus-binding-tool --prefix=gsm_inhibitor --mode=glib-server --output=gsm-inhibitor-glue.h $(srcdir)/org.gnome.SessionManager.Inhibitor.xml
 
 gsm-presence-glue.h: org.gnome.SessionManager.Presence.xml Makefile.am
-	$(QUIET_GEN)dbus-binding-tool --prefix=gsm_presence --mode=glib-server --output=gsm-presence-glue.h $(srcdir)/org.gnome.SessionManager.Presence.xml
+	$(AM_V_GEN)dbus-binding-tool --prefix=gsm_presence --mode=glib-server --output=gsm-presence-glue.h $(srcdir)/org.gnome.SessionManager.Presence.xml
 
 BUILT_SOURCES =			\
 	gsm-marshal.c           \
diff --git a/splash/Makefile.am b/splash/Makefile.am
index 21873b7..28aa3e9 100644
--- a/splash/Makefile.am
+++ b/splash/Makefile.am
@@ -1,5 +1,4 @@
 NULL =
-QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
 
 INCLUDES =					\
 	-I$(top_srcdir)/egg			\
@@ -32,7 +31,7 @@ gnome_session_splash_LDADD =			\
 @INTLTOOL_DESKTOP_RULE@
 
 %.desktop.in: %.desktop.in.in Makefile.am
-	$(QUIET_GEN)sed -e 's,\ helperdir\@,$(helperdir),' \
+	$(AM_V_GEN)sed -e 's,\ helperdir\@,$(helperdir),' \
 		< $< > $@
 
 EXTRA_DIST =					\