[vte] Support AM_SILENT_RULES

[Christian Persch <chpe src gnome org>]

commit 80ffef9ad70e70827138f18fdd847dc8a27ebc34
Author: Christian Persch <chpe gnome org>
Date:   Sun Aug 16 22:19:25 2009 +0200

    Support AM_SILENT_RULES
    
    And sprinkle some $(AM_V_GEN) around. Silent rules are disabled by default.

 Makefile.am          |    2 +-
 configure.in         |    4 ++++
 doc/Makefile.am      |    4 ++--
 python/Makefile.am   |    2 +-
 src/Makefile.am      |   18 ++++++++++--------
 termcaps/Makefile.am |    2 +-
 6 files changed, 19 insertions(+), 13 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3216f57..2163351 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,7 @@ MAINTAINERCLEANFILES = \
 
 # Build ChangeLog from GIT  history
 ChangeLog:
-	@if test -d $(top_srcdir)/.git; then \
+	$(AM_V_GEN) if test -d $(top_srcdir)/.git; then \
 		GIT_DIR="$(top_srcdir)/.git" git log --stat > $@; \
 	fi
 
diff --git a/configure.in b/configure.in
index bedc49b..7234c8c 100644
--- a/configure.in
+++ b/configure.in
@@ -11,6 +11,8 @@ AC_CONFIG_HEADERS([config.h])
 
 AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
 
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([no])])
+
 if test -z "$enable_maintainer_mode"; then
   enable_maintainer_mode=yes
 fi
@@ -42,6 +44,8 @@ AM_PROG_CC_C_O
 
 AM_PROG_LIBTOOL
 
+AC_PROG_SED
+
 ################################################################################
 # i18n
 ################################################################################
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6f469f0..d36e90d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,9 +3,9 @@ SUBDIRS = reference openi18n
 EXTRA_DIST = ctlseqs.ms readme.txt utmpwtmp.txt boxes.txt
 
 ctlseqs.ps: ctlseqs.ms
-	tbl $^ | groff -ms > $@
+	$(AM_V_GEN) tbl $^ | groff -ms > $@
 
 ctlseqs.txt: ctlseqs.ms
-	tbl $^ | nroff -c -ms > $@
+	$(AM_V_GEN) tbl $^ | nroff -c -ms > $@
 
 -include $(top_srcdir)/git.mk
diff --git a/python/Makefile.am b/python/Makefile.am
index 92bf3e2..69233ff 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -27,7 +27,7 @@ nodist_vtemodule_la_SOURCES = vte.c
 vte.c: vte.defs vte.override
 
 .defs.c:
-	(cd $(srcdir) \
+	$(AM_V_GEN) (cd $(srcdir) \
 	 && $(PYGTK_CODEGEN) \
             --register $(PYGTK_DEFSDIR)/pango-types.defs \
             --register $(PYGTK_DEFSDIR)/gdk-types.defs \
diff --git a/src/Makefile.am b/src/Makefile.am
index b4a6eaa..b440f2e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -108,35 +108,37 @@ MAINTAINERCLEANFILES = $(VTESEQ_BUILTSOURCES)
 EXTRA_DIST += $(VTESEQ_BUILTSOURCES)
 CLEANFILES = marshal.c marshal.h vtetypebuiltins.c vtetypebuiltins.h stamp-vtetypebuiltins.h
 
-marshal.c marshal.h: marshal.list
-	$(GLIB_GENMARSHAL) --prefix=_vte_marshal --header --body --internal $^ > marshal.c
-	$(GLIB_GENMARSHAL) --prefix=_vte_marshal --header --internal $^ > marshal.h
+marshal.c: marshal.list
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_vte_marshal --header --body --internal $< > $@
+	
+marshal.h: marshal.list
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_vte_marshal --header --internal $< > $@
 
 vtetypebuiltins.h: stamp-vtetypebuiltins.h
 	@true
 stamp-vtetypebuiltins.h: vtetypebuiltins.h.template vte.h
-	$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-vtbh \
+	$(AM_V_GEN) $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-vtbh \
 	&& (cmp -s xgen-vtbh vtetypebuiltins.h || cp xgen-vtbh vtetypebuiltins.h ) \
 	&& rm -f xgen-vtbh \
 	&& echo timestamp > $(@F)
 
 vtetypebuiltins.c: vtetypebuiltins.c.template vte.h
-	$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-vtbc \
+	$(AM_V_GEN) $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-vtbc \
 	&& (cmp -s xgen-vtbc vtetypebuiltins.c || cp xgen-vtbc vtetypebuiltins.c ) \
 	&& rm -f xgen-vtbc
 
 vteseq-2.c: vteseq-2.gperf
-	@echo creating $@
+	$(AM_V_GEN)
 	$(top_srcdir)/missing --run gperf -m 100 --no-strlen $< > $  tmp && \
 	mv -f $  tmp $@
 
 vteseq-n.c: vteseq-n.gperf
-	@echo creating $@
+	$(AM_V_GEN)
 	$(top_srcdir)/missing --run gperf -m 100 $< > $  tmp && \
 	mv -f $  tmp $@
 
 vteseq-list.h: vteseq-2.gperf vteseq-n.gperf
-	@echo creating $@
+	$(AM_V_GEN)
 	echo '/* Generated file.  Do not edit */' > $  tmp && \
 	cat $^ | grep -v '^#' | grep '\<VTE_SEQUENCE_HANDLER\>'| sed 's/.*, //' | LANG=C sort -u >> $  tmp && \
 	mv -f $  tmp $@
diff --git a/termcaps/Makefile.am b/termcaps/Makefile.am
index 6bdd9f6..9f8d27a 100644
--- a/termcaps/Makefile.am
+++ b/termcaps/Makefile.am
@@ -5,7 +5,7 @@ termcap_DATA = xterm
 if VTE_DEFAULT_EMULATION
 termcap_DATA += $(VTE_DEFAULT_EMULATION)
 $(VTE_DEFAULT_EMULATION): xterm
-	sed -e s,^xterm:,$(VTE_DEFAULT_EMULATION):,g \
+	$(AM_V_GEN) $(SED) -e s,^xterm:,$(VTE_DEFAULT_EMULATION):,g \
 	    -e s,^xterm\|,$(VTE_DEFAULT_EMULATION)\|,g $< > $@
 endif