[gstreamermm] Support Automake silent rules.

[José Alburquerque <jaalburqu src gnome org>]

commit e8303df17790d7284d65cc9486a52fcffd615f17
Author: José Alburquerque <jaalburqu svn gnome org>
Date:   Mon Sep 21 22:19:14 2009 -0400

    	Support Automake silent rules.
    
    	* autogen.sh: Pass the --verbose option to autoreconf.
    	* configure.ac:
    	* gstreamer/gstreamermm/Makefile.am:
    	* gstreamer/src/Makefile.am: Support Automake silent rules.  Also
    	check for m4 and sed for plug-in processing, and patch in maintainer
    	mode for patching generated .hg files like taglist.hg.

 ChangeLog                         |   79 +++++++++----------------------------
 autogen.sh                        |    2 +-
 configure.ac                      |   14 ++++++-
 gstreamer/gstreamermm/Makefile.am |    6 +-
 gstreamer/src/Makefile.am         |   13 +++---
 5 files changed, 42 insertions(+), 72 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a4a7bf0..b2ecd48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2009-09-21  José Alburquerque  <jaalburqu svn gnome org>
+
+	Support Automake silent rules.
+
+	* autogen.sh: Pass the --verbose option to autoreconf.
+	* configure.ac:
+	* gstreamer/gstreamermm/Makefile.am:
+	* gstreamer/src/Makefile.am: Support Automake silent rules.  Also
+	check for m4 and sed for plug-in processing, and patch in maintainer
+	mode for patching generated .hg files like taglist.hg.
+
+2009-09-21  José Alburquerque  <jaalburqu svn gnome org>
+
+	* NEWS:
+	* autogen.sh:
+	* configure.ac:
+	* gstreamer/gstreamermm/Makefile.am:
+	* gstreamer/src/Makefile.am:
+
 0.10.5.1:
 
 2009-09-14  José Alburquerque  <jaalburqu svn gnome org>
@@ -151,66 +170,6 @@
 	* tools/m4/plugingen_gstreamermm.m4:
 	* tools/m4/shared.m4: Modified these.
 
-2009-09-08  José Alburquerque  <jaalburqu svn gnome org>
-
-	* build_shared/Makefile_build.am_fragment:
-	* build_shared/Makefile_build_gensrc.am_fragment:
-	* build_shared/Makefile_gensrc.am_fragment:
-	* docs/Makefile.am:
-	* docs/reference/Doxyfile.in:
-	* docs/reference/Makefile.am:
-	* docs/reference/beautify_docs.pl.in:
-	* gstreamer/gstreamermm-0.10.pc.in:
-	* scripts/Makefile.am:
-	* scripts/README:
-	* scripts/c_std.m4:
-	* scripts/cxx.m4:
-	* scripts/cxx_std.m4:
-	* scripts/dk-warn.m4:
-	* scripts/docgen.m4:
-	* scripts/glibmm_check_perl.m4:
-	* scripts/macros.m4:
-	* scripts/reduced.m4:
-	* scripts/sun.m4:
-
-	* .gitignore:
-	* Makefile.am:
-	* autogen.sh:
-	* build/.gitignore:
-	* configure.ac:
-	* doc/Makefile.am:
-	* doc/reference/.gitignore:
-	* doc/reference/Doxyfile.in:
-	* gstreamer/.gitignore:
-	* gstreamer/gstreamermm-uninstalled.pc.in:
-	* gstreamer/gstreamermm.pc.in:
-	* gstreamer/gstreamermm/Makefile.am:
-	* gstreamer/gstreamermm/filelist.am:
-	* gstreamer/gstreamermm/private/.gitignore:
-	* gstreamer/gstreamermm/private/Makefile.am:
-	* gstreamer/gstreamermmconfig.h.in:
-	* gstreamer/src/Makefile.am:
-	* gstreamer/src/Makefile_list_of_hg.am_fragment:
-	* gstreamer/src/filelist.am:
-	* tools/Makefile.am:
-	* tools/Makefile_list_of_sources.am_fragment:
-	* tools/README:
-	* tools/TODO:
-	* tools/extra_defs_gen/Makefile.am:
-	* tools/extra_defs_gen/generate_plugin_gmmproc_file.cc:
-	* tools/generate_gst_wrap_init.pl.in:
-	* tools/m4/Makefile.am:
-	* tools/m4/Makefile_list_of_sources.am_fragment:
-	* tools/m4/class_boxedtype_extra.m4:
-	* tools/m4/class_gstminiobject.m4:
-	* tools/m4/convert.m4:
-	* tools/m4/convert_gst.m4:
-	* tools/m4/filelist.am:
-	* tools/m4/plugingen.m4:
-	* tools/m4/plugingen_base.m4:
-	* tools/m4/plugingen_gstreamermm.m4:
-	* tools/m4/shared.m4:
-
 0.10.5:
 
 2009-09-02  José Alburquerque  <jaalburqu svn gnome org>
diff --git a/autogen.sh b/autogen.sh
index fed2c5b..497c64c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,5 +3,5 @@ test -n "$srcdir" || srcdir=`dirname "$0"`
 test -n "$srcdir" || srcdir=.
 
 mm-common-prepare --force --copy "$srcdir"
-autoreconf --force --install "$srcdir"
+autoreconf --force --install --verbose "$srcdir"
 test -n "$NOCONFIGURE" || "$srcdir/configure" --enable-maintainer-mode "$@"
diff --git a/configure.ac b/configure.ac
index 091398d..c363af7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,7 @@ MM_INIT_MODULE([gstreamermm-0.10])
 AC_SUBST([GSTREAMERMM_SO_VERSION], [2:1:0])
 
 AM_INIT_AUTOMAKE([1.9 -Wno-portability check-news dist-bzip2 no-define nostdinc tar-pax])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 AM_MAINTAINER_MODE
 AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
 
@@ -38,13 +39,22 @@ AC_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
+# Check for the patch command in maintainer mode for patching generated .hg
+# files like taglist.hg.
+AS_IF([test "x$USE_MAINTAINER_MODE" != xno], AC_CHECK_PROGS([PATCH], [patch], [patch]))
+
+
+# Check for m4 and sed which are used for plug-in .hg and .ccg file generation.
+AC_CHECK_PROGS([M4], [gm4 m4], [m4])
+AC_PROG_SED
+
 min_glibmm_version='2.21.1'
 min_gtkmm_version='2.12.0'
 min_gstreamer_version='0.10.24'
 min_libxmlpp_version='2.14.0'
 
-## The format below is used so that the requirements appear nicely in the .pc
-## file.
+# The format below is used so that the requirements appear nicely in the .pc
+# file.
 AC_SUBST([GSTREAMERMM_MODULES],
          ["\
 glibmm-2.4 >= $min_glibmm_version \
diff --git a/gstreamer/gstreamermm/Makefile.am b/gstreamer/gstreamermm/Makefile.am
index cc1f330..af6c4ea 100644
--- a/gstreamer/gstreamermm/Makefile.am
+++ b/gstreamer/gstreamermm/Makefile.am
@@ -27,15 +27,15 @@ generate_gst_wrap_init = $(PERL) -- $(top_builddir)/tools/generate_gst_wrap_init
 generate_gst_wrap_init_flags = --namespace=Gst --parent_dir=gstreamermm
 
 gst_wrap_init.cc: $(generate_gst_wrap_init_in) $(files_hg:%=$(srcdir)/../src/%)
-	$(generate_gst_wrap_init) $(generate_gst_wrap_init_flags) \
+	$(AM_V_GEN)$(generate_gst_wrap_init) $(generate_gst_wrap_init_flags) \
 		$(files_hg:%=$(srcdir)/../src/%) > $@
 
 $(stampdir):
-	@(test -d $(stampdir) || mkdir $(stampdir))
+	@(test -d $(stampdir) || $(MKDIR_P) $(stampdir))
 	
 # This is to patch generated .h files in $(gensrc_destdir) (e.g. taglist.h).
 $(stampdir)/stamp-%: $(stampdir) $(srcdir)/%.h
-	patch -Ns $(srcdir)/$*.h $(srcdir)/$*.h.patch || true
+	$(PATCH) -Ns $(srcdir)/$*.h $(srcdir)/$*.h.patch || true
 	rm -f $(srcdir)/$*.h.rej $(srcdir)/$*.h.orig
 	@echo 'timestamp' > $@
 
diff --git a/gstreamer/src/Makefile.am b/gstreamer/src/Makefile.am
index d0a74d0..565cf0b 100644
--- a/gstreamer/src/Makefile.am
+++ b/gstreamer/src/Makefile.am
@@ -56,9 +56,10 @@ if MAINTAINER_MODE
 		false; \
 	fi
 endif
-	sed -n '1,/^$$/p' $(license_header_source_file) > $(srcdir)/$@
-	$(run_generate_plugin_gmmproc_file) --ccg $(plugin_name) \
-		$(cppname) | m4 -I $(m4_srcdir) >> $(srcdir)/$@
+	$(AM_V_at)$(SED) -n '1,/^$$/p' $(license_header_source_file) > \
+		$(srcdir)/$@
+	$(AM_V_GEN)$(run_generate_plugin_gmmproc_file) --ccg $(plugin_name) \
+		$(cppname) | $(M4) -I $(m4_srcdir) >> $(srcdir)/$@
 
 # This is to generate plugin .hg files.  The generated .hg file is piped
 # through m4 using the macros in tools/m4/ctocpp_base.m4 which then produces
@@ -71,8 +72,8 @@ $(plugins_hg): %.hg: $(generate_plugin_dep) \
 	$(eval plugin_def = $$(word $$(pos),$$(GSTREAMERMM_PLUGIN_DEFS)))
 	$(eval plugin_name = $$(shell echo "$$(plugin_def)" | cut -d'=' -f 1))
 	$(eval cppname = $$(subst $$(plugin_name)=,,$$(plugin_def)))
-	sed -n '1,/^$$/p' $(license_header_source_file) > $(srcdir)/$@
-	$(run_generate_plugin_gmmproc_file) --hg $(plugin_name) \
-		$(cppname) | m4 -I $(m4_srcdir) >> $(srcdir)/$@
+	$(AM_V_at)$(SED) -n '1,/^$$/p' $(license_header_source_file) > $(srcdir)/$@
+	$(AM_V_GEN)$(run_generate_plugin_gmmproc_file) --hg $(plugin_name) \
+		$(cppname) | $(M4) -I $(m4_srcdir) >> $(srcdir)/$@
 
 MAINTAINERCLEANFILES += $(plugins_hg) $(plugins_ccg)