[gucharmap] Support silent build with automake 1.11

[Christian Persch <chpe src gnome org>]

commit 9f50bb08bf13ab5d57fe5fac665fa070ba8eb03a
Author: Christian Persch <chpe gnome org>
Date:   Sun Aug 16 20:42:43 2009 +0200

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

 Makefile.am                                     |    2 +-
 bindings/python/Makefile.am                     |    4 ++--
 configure.ac                                    |    2 ++
 docs/reference/tmpl/gucharmap-unicode-info.sgml |    1 +
 gucharmap/Makefile.am                           |   16 ++++++++--------
 5 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5d6cae2..6e125c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,7 +75,7 @@ endif
 
 
 ChangeLog:
-	if test -f $(top_srcdir)/.git/HEAD; then \
+	$(AM_V_GEN) if test -f $(top_srcdir)/.git/HEAD; then \
 		git log --stat > $@; \
 	fi
 
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index 90d1b91..d1aea39 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -72,7 +72,7 @@ EXTRA_DIST = \
 gucharmap.c: gucharmap.defs gucharmap.override
 
 .defs.c:
-	(cd $(srcdir)\
+	$(AM_V_GEN) (cd $(srcdir)\
 	 && $(PYGTK_CODEGEN) \
 	    --override $*.override \
 	    --prefix py$* $*.defs) > gen-$*.c \
@@ -80,7 +80,7 @@ gucharmap.c: gucharmap.defs gucharmap.override
 	&& rm -f gen-$*.c
 
 regenerate-python-binding:
-	$(PYGTK_H2DEF) \
+	$(AM_V_GEN) $(PYGTK_H2DEF) \
 		$(sort $(addprefix $(top_srcdir)/gucharmap/,$(srcdirheaders)) \
 		       $(addprefix $(top_builddir)/gucharmap/,$(builddirheaders))) \
 		> gucharmap.defs.new
diff --git a/configure.ac b/configure.ac
index 76bfba4..273d9f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,8 @@ AC_CONFIG_HEADERS([config.h])
 
 AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip])
 
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([no])])
+
 if test -z "$enable_maintainer_mode"; then
   enable_maintainer_mode=yes
 fi
diff --git a/docs/reference/tmpl/gucharmap-unicode-info.sgml b/docs/reference/tmpl/gucharmap-unicode-info.sgml
index 7f9b822..7d4228c 100644
--- a/docs/reference/tmpl/gucharmap-unicode-info.sgml
+++ b/docs/reference/tmpl/gucharmap-unicode-info.sgml
@@ -33,6 +33,7 @@ gucharmap-unicode-info
 @GUCHARMAP_UNICODE_VERSION_4_1: 
 @GUCHARMAP_UNICODE_VERSION_5_0: 
 @GUCHARMAP_UNICODE_VERSION_5_1: 
+ GUCHARMAP_UNICODE_VERSION_5_2: 
 @GUCHARMAP_UNICODE_VERSION_LATEST: 
 
 <!-- ##### FUNCTION gucharmap_get_unicode_name ##### -->
diff --git a/gucharmap/Makefile.am b/gucharmap/Makefile.am
index ec0d152..f281ed8 100644
--- a/gucharmap/Makefile.am
+++ b/gucharmap/Makefile.am
@@ -161,18 +161,18 @@ gucharmap_LDADD = \
 if OS_WIN32
 gucharmap_LDADD += gucharmaprc.o
 gucharmaprc.o: gucharmaprc.rc
-	windres -i $< -o $@
+	$(AM_V_GEN) windres -i $< -o $@
 endif
 
 gucharmap-marshal.h: $(srcdir)/gucharmap-marshal.list
-	( $(GLIB_GENMARSHAL) --prefix=_gucharmap_marshal $(srcdir)/gucharmap-marshal.list \
+	$(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=_gucharmap_marshal $(srcdir)/gucharmap-marshal.list \
                             --header \
                             --internal > gucharmap-marshal.h.tmp \
 	  && mv gucharmap-marshal.h.tmp gucharmap-marshal.h ) \
         || ( rm -f gucharmap-marshal.h.tmp && exit 1 )
 
 gucharmap-marshal.c: $(srcdir)/gucharmap-marshal.list
-	( $(GLIB_GENMARSHAL) --prefix=_gucharmap_marshal $(srcdir)/gucharmap-marshal.list \
+	$(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=_gucharmap_marshal $(srcdir)/gucharmap-marshal.list \
 			    --header \
                             --body \
                             --internal > gucharmap-marshal.c.tmp \
@@ -184,18 +184,18 @@ gucharmap-type-builtins.h: stamp-gucharmap-type-builtins.h
 	@true
 
 stamp-gucharmap-type-builtins.h: gucharmap-type-builtins.h.template $(libgucharmapinclude_HEADERS)
-	$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-gtbh \
+	$(AM_V_GEN) $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-gtbh \
 	&& (cmp -s xgen-gtbh gucharmap-type-builtins.h || cp xgen-gtbh gucharmap-type-builtins.h ) \
 	&& rm -f xgen-gtbh \
 	&& echo timestamp > $(@F)
 
 gucharmap-type-builtins.c: gucharmap-type-builtins.c.template $(libgucharmapinclude_HEADERS)
-	$(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-gtbc \
+	$(AM_V_GEN) $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-gtbc \
 	&& (cmp -s xgen-gtbc gucharmap-type-builtins.c || cp xgen-gtbc gucharmap-type-builtins.c ) \
 	&& rm -f xgen-gtbc
 
 # printoptions.h: print.glade
-# 	$(GTK_BUILDER_CONVERT) --root custom_tab_container $< - | \
+# 	$(AM_V_GEN) $(GTK_BUILDER_CONVERT) --root custom_tab_container $< - | \
 # 		$(XMLLINT) --noblanks - | \
 # 		$(HEXDUMP) -v -e '"" 1/1 "0x%02x,""\n"' > xgen-$(@F) \
 # 	&& (cmp -s xgen-$(@F) $@ || cp -f xgen-$(@F) $@) \
@@ -210,7 +210,7 @@ typelibdir = $(GIRTYPELIBDIR)
 typelib_DATA = Gucharmap-2.0.typelib
 
 Gucharmap-2.0.gir: $(G_IR_SCANNER) libgucharmap.la $(libgucharmapinclude_HEADERS) Makefile
-	PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
+	$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
 	$(G_IR_SCANNER) \
 		--verbose \
 		--namespace=Gucharmap \
@@ -228,7 +228,7 @@ Gucharmap-2.0.gir: $(G_IR_SCANNER) libgucharmap.la $(libgucharmapinclude_HEADERS
 		$(filter %.h,$^)
 
 %.typelib: %.gir $(G_IR_COMPILER)
-	$(G_IR_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@
+	$(AM_V_GEN) $(G_IR_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@
 
 endif # ENABLE_INTROSPECTION