From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 22 Jul 2017 10:43:11 +0000 (+0100)
Subject: Makefile.am:  Tweak `silent-rules' machinery.
X-Git-Tag: 1.3.15~5
X-Git-Url: https://git.distorted.org.uk/~mdw/cfd/commitdiff_plain/67a6b78f5af91ca2eea8b9e2159427c28019bf6c

Makefile.am:  Tweak `silent-rules' machinery.

Since Automake 1.11, the advice for setting up custom silent-rules
recipes has changed, so use the new machinery.

Also, I'm no longer mainly working on wheezy, and Automake has made the
operation field two spaces wider while I wasn't looking, so make the
output line up properly.

This means that CFD now requires Automake 1.11.2 or later to build from
the Git tree.

(cherry picked from commit 262cdcea7d345a0e523957de46fceed547f2de44)
---

diff --git a/Makefile.am b/Makefile.am
index 5f91699..7df6892 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,9 +38,9 @@ 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  $@";
+V_SUBST = $(V_SUBST_@AM_V@)
+V_SUBST_ = $(V_SUBST_@AM_DEFAULT_V@)
+V_SUBST_0 = @echo "  SUBST    $@";
 SUBST = $(V_SUBST)$(confsubst)
 
 ###--------------------------------------------------------------------------