Build system, autotest.am: Support Automake 1.11 `silent-rules'.

[cfd] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 862491d..14de24f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,6 +36,11 @@ CLEANFILES            =
 confsubst = $(srcdir)/confsubst.in
 mkdir_p = $(srcdir)/config/install-sh -d
 
+V_SUBST = $(V_SUBST_$(V))
+V_SUBST_ = $(V_SUBST_$(AM_DEFAULT_VERBOSITY))
+V_SUBST_0 = @echo "  SUBST  $@";
+SUBST = $(V_SUBST)$(confsubst)
+
 ###--------------------------------------------------------------------------
 ### Main scripts.
 
@@ -45,10 +50,10 @@ CLEANFILES          += mklinks
 EXTRA_DIST             += mklinks.in
 
 mklinks: mklinks.in Makefile
-       $(confsubst) $(srcdir)/mklinks.in >$@.new \
+       $(SUBST) $(srcdir)/mklinks.in >$@.new \
                pkgdatadir=$(pkgdatadir) VERSION=$(VERSION)
-       chmod +x $@.new
-       mv $@.new $@
+       $(AM_V_at)chmod +x $@.new
+       $(AM_V_at)mv $@.new $@
 
 ## findlinks
 bin_SCRIPTS            += findlinks
@@ -56,10 +61,10 @@ CLEANFILES          += findlinks
 EXTRA_DIST             += findlinks.in
 
 findlinks: findlinks.in Makefile
-       $(confsubst) $(srcdir)/findlinks.in >$@.new \
+       $(SUBST) $(srcdir)/findlinks.in >$@.new \
                pkgdatadir=$(pkgdatadir) VERSION=$(VERSION)
-       chmod +x $@.new
-       mv $@.new $@
+       $(AM_V_at)chmod +x $@.new
+       $(AM_V_at)mv $@.new $@
 
 ## mdw-setup
 bin_SCRIPTS            += mdw-setup
@@ -93,10 +98,9 @@ CLEANFILES           += confsubst
 EXTRA_DIST             += confsubst.in
 
 confsubst: confsubst.in Makefile
-       $(confsubst) $(srcdir)/confsubst.in >$@.new \
-               VERSION=$(VERSION)
-       chmod +x $@.new
-       mv $@.new $@
+       $(SUBST) $(srcdir)/confsubst.in >$@.new VERSION=$(VERSION)
+       $(AM_V_at)chmod +x $@.new
+       $(AM_V_at)mv $@.new $@
 
 ## auto-version
 pkgdata_SCRIPTS                += auto-version
@@ -104,10 +108,9 @@ CLEANFILES         += auto-version
 EXTRA_DIST             += auto-version.in
 
 auto-version: auto-version.in Makefile
-       $(confsubst) $(srcdir)/auto-version.in >$@.new \
-               VERSION=$(VERSION)
-       chmod +x $@.new
-       mv $@.new $@
+       $(SUBST) $(srcdir)/auto-version.in >$@.new VERSION=$(VERSION)
+       $(AM_V_at)chmod +x $@.new
+       $(AM_V_at)mv $@.new $@
 
 ## Testsuites.
 pkgdata_DATA           += autotest.am