[gnome-doc-utils] Use silent-rules for building gnome-doc-utils

[Shaun McCance <shaunm src gnome org>]

commit 0a01dbb1627355fcd1c7d05fa6ba133b1ec655d3
Author: Hib Eris <hib hiberis nl>
Date:   Sun Dec 25 16:08:48 2011 +0100

    Use silent-rules for building gnome-doc-utils
    
    https://bugzilla.gnome.org/show_bug.cgi?id=589278

 configure.in                   |    2 +-
 doc/gnome-doc-make/Makefile.am |    2 +-
 doc/xslt/Makefile.am           |    6 +++---
 xml2po/Makefile.am             |    2 +-
 xml2po/xml2po/Makefile.am      |    4 ++--
 xslt/gettext/Makefile.am       |    4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/configure.in b/configure.in
index dcc1721..9708e17 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT([gnome-doc-utils], [0.20.6],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-doc-utils])
 AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2])
-AC_SUBST(AM_DEFAULT_VERBOSITY,1)
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],[AC_SUBST(AM_DEFAULT_VERBOSITY,1)])
 
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/doc/gnome-doc-make/Makefile.am b/doc/gnome-doc-make/Makefile.am
index 663f16f..c8e3450 100644
--- a/doc/gnome-doc-make/Makefile.am
+++ b/doc/gnome-doc-make/Makefile.am
@@ -6,7 +6,7 @@ DOC_MODULE = gnome-doc-make
 DOC_INCLUDES = legal.xml make-ref.xml
 
 $(srcdir)/C/make-ref.xml: $(top_srcdir)/tools/gnome-doc-utils.make
-	$(GDU_AWK) -f $(srcdir)/gnome-doc-make.awk $< > $@
+	$(AM_V_GEN)$(GDU_AWK) -f $(srcdir)/gnome-doc-make.awk $< > $@
 
 EXTRA_DIST = gnome-doc-make.awk
 
diff --git a/doc/xslt/Makefile.am b/doc/xslt/Makefile.am
index 264812d..9bbbe42 100644
--- a/doc/xslt/Makefile.am
+++ b/doc/xslt/Makefile.am
@@ -20,7 +20,7 @@ xsldoc_xmls = $(patsubst %, C/%.xml, $(xsldoc_base))
 all: $(xsldoc_docs) $(xsldoc_xmls)
 
 $(xsldoc_docs): $(xsldoc_xsls) xsldoc.awk xsldoc-fill.xsl
-	$(GDU_AWK) -f "$(srcdir)/xsldoc.awk" "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
+	$(AM_V_GEN)$(GDU_AWK) -f "$(srcdir)/xsldoc.awk" "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
 	| xsltproc -o "$@" \
 	--stringparam basename "$(basename $(notdir $@))" \
 	--stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
@@ -28,7 +28,7 @@ $(xsldoc_docs): $(xsldoc_xsls) xsldoc.awk xsldoc-fill.xsl
 
 $(xsldoc_xmls): xsldoc-docbook.xsl
 $(xsldoc_xmls): C/%.xml : C/%.xsldoc
-	xsltproc -o "$@" \
+	$(AM_V_GEN)xsltproc -o "$@" \
 	--stringparam basename "$(basename $(notdir $@))" \
 	--stringparam xsl_file "$(filter %/$(basename $(notdir $@)).xsl,$(xsldoc_xsls))" \
 	"$(srcdir)/xsldoc-docbook.xsl" "$<"
@@ -75,4 +75,4 @@ EXTRA_DIST = xsldoc.awk xsldoc-fill.xsl xsldoc-check.xsl xsldoc-docbook.xsl
 DOC_MODULE = gnome-doc-xslt
 DOC_INCLUDES = legal.xml translating.xml $(patsubst %,%.xml,$(xsldoc_base))
 
-DOC_LINGUAS = de
\ No newline at end of file
+DOC_LINGUAS = de
diff --git a/xml2po/Makefile.am b/xml2po/Makefile.am
index 4aff003..e90022e 100644
--- a/xml2po/Makefile.am
+++ b/xml2po/Makefile.am
@@ -13,7 +13,7 @@ $(srcdir)/README: README.in
 	sed -e "s/\ VERSION\@/@VERSION@/g" < README.in > README
 
 xml2po.1: xml2po.1.xml
-	xsltproc --nonet $(srcdir)/xml2po.1.xml
+	$(AM_V_GEN)xsltproc --nonet $(srcdir)/xml2po.1.xml
 
 publish: dist
 	scp @PACKAGE -@VERSION  tar gz danilo kvota net:/home/danilo/kvota.net/hacks/xml2po
diff --git a/xml2po/xml2po/Makefile.am b/xml2po/xml2po/Makefile.am
index cc5469b..c4809bd 100644
--- a/xml2po/xml2po/Makefile.am
+++ b/xml2po/xml2po/Makefile.am
@@ -6,10 +6,10 @@ nodist_bin_SCRIPTS = xml2po
 CLEANFILES = xml2po
 
 xml2po: xml2po.py.in
-	sed -e "s/^VERSION =.*/VERSION = \"@VERSION \"/" \
+	$(AM_V_GEN)sed -e "s/^VERSION =.*/VERSION = \"@VERSION \"/" \
 	    -e "s+^#!.*python.*+#!$(PYTHON)+" \
 	  < $(srcdir)/xml2po.py.in > xml2po
-	chmod +x xml2po
+	$(AM_V_at)chmod +x xml2po
 
 xml2po_PYTHON = \
 	__init__.py
diff --git a/xslt/gettext/Makefile.am b/xslt/gettext/Makefile.am
index be7e5ab..d241805 100644
--- a/xslt/gettext/Makefile.am
+++ b/xslt/gettext/Makefile.am
@@ -2,8 +2,8 @@
 # in the tarball, which causes docs to be rebuilt, which causes translated
 # docs to be rebuilt, which requires xml2po, which breaks --disable-build-utils
 l10n.xml: l10n.xml.in $(wildcard $(top_srcdir)/po/*.po)
-	LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-	xmllint --noout $@ || (mv $@ $  broken && false)
+	$(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+	$(AM_V_at)xmllint --noout $@ || (mv $@ $  broken && false)
 
 xsldir=$(datadir)/xml/gnome/xslt/gettext