From 262cdcea7d345a0e523957de46fceed547f2de44 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Sat, 22 Jul 2017 11:43:11 +0100 Subject: [PATCH] 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. --- Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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) ###-------------------------------------------------------------------------- -- 2.11.0