From 8856653ec87c826ec5f7f7c577e01afaa64c3ed5 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sun, 15 Jan 2012 23:08:21 +0100 Subject: [PATCH] build: improve silencing of automake build system In this change, we continue the silencing of the automake build system that has been started in commit v1.11-642-g17542c3, but which has been left incomplete there for an (absent-mindness) mistake. * Makefile.am (INSTALL): Silence the recipe. (automake, aclocal): Likewise, and improve them a little since we are at it. * lib/Automake/Makefile.am (Config.pm): Likewise. --- Makefile.am | 10 ++++------ lib/Automake/Makefile.am | 8 +++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index 83bcc7cea..e8330f544 100644 --- a/Makefile.am +++ b/Makefile.am @@ -91,17 +91,15 @@ do_subst = sed \ automake: automake.in aclocal: aclocal.in automake aclocal: Makefile - rm -f $@ $@.tmp - $(do_subst) $(srcdir)/$@.in >$@.tmp - chmod +x $@.tmp - chmod a-w $@.tmp - mv -f $@.tmp $@ + $(AM_V_at)rm -f $@ $@-t + $(AM_V_GEN)$(do_subst) $(srcdir)/$@.in >$@-t + $(AM_V_at)chmod a+x,a-w $@-t && mv -f $@-t $@ ## The master location for INSTALL is lib/INSTALL. ## This is where `make fetch' will install new versions. ## Make sure we also update this copy. INSTALL: lib/INSTALL - cp $(srcdir)/lib/INSTALL $@ + $(AM_V_GEN)cp $(srcdir)/lib/INSTALL $@ ################################################################ ## diff --git a/lib/Automake/Makefile.am b/lib/Automake/Makefile.am index 0858b6875..cfc7272b8 100644 --- a/lib/Automake/Makefile.am +++ b/lib/Automake/Makefile.am @@ -64,10 +64,8 @@ do_subst = in=`echo $@ | sed 's/\.[^.]*$$//'`; sed \ ## $(datadir) or other do_subst'ituted variables change. ## Use chmod a-w to prevent people from editing the wrong file by accident. Config.pm: Config.in Makefile - rm -f Config.tmp Config.pm - $(do_subst) $(srcdir)/Config.in >Config.tmp - chmod +x Config.tmp - chmod a-w Config.tmp - mv -f Config.tmp Config.pm + $(AM_V_at)rm -f $@ $@-t + $(AM_V_GEN)$(do_subst) $(srcdir)/Config.in >$@-t + $(AM_V_at)chmod a+x,a-w $@-t && mv -f $@-t $@ EXTRA_DIST = Config.in -- 2.47.2