[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[shepherd] 03/07: build: Improve display for silent rules.
From: |
Ludovic Courtès |
Subject: |
[shepherd] 03/07: build: Improve display for silent rules. |
Date: |
Sun, 17 Jan 2016 14:15:29 +0000 |
civodul pushed a commit to branch master
in repository shepherd.
commit 56c3e57fd58124ea3cc15da0518ae455e766c7ca
Author: Mathieu Lirzin <address@hidden>
Date: Sat Jan 16 20:26:48 2016 +0100
build: Improve display for silent rules.
* Makefile.am (AM_V_INSTANTIATE, AM_V_INSTANTIATE_, AM_V_INSTANTIATE_0):
Delete variables.
(%): Use the predefined variable AM_V_GEN instead of AM_V_INSTANTIATE.
(AM_V_GUILEC_0): Fix spacing between the command and the file name.
(%.go): Close standard output when silent rules are enabled, to prevent
'guild compile' to make any noise.
Signed-off-by: Ludovic Courtès <address@hidden>
---
Makefile.am | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index fa05468..7b3e59f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -104,17 +104,13 @@ instantiate =
\
# Instantiate templates.
-AM_V_INSTANTIATE = $(AM_V_INSTANTIATE_$(V))
-AM_V_INSTANTIATE_ = $(AM_V_INSTANTIATE_$(AM_DEFAULT_VERBOSITY))
-AM_V_INSTANTIATE_0 = @echo " INSTANTIATE" $@;
-
# Emit a 'chmod +x' command only if $@ matches one of the scripts.
maybe_executable = \
$(subst $@,chmod +x $@, \
$(findstring $@,$(bin_SCRIPTS) $(sbin_SCRIPTS)))
%: %.in Makefile
- $(AM_V_INSTANTIATE)$(MKDIR_P) "`dirname address@hidden" ; \
+ $(AM_V_GEN)$(MKDIR_P) "`dirname address@hidden" ; \
$(SED) $(instantiate) < $< >$@ ; \
$(maybe_executable)
@@ -124,19 +120,20 @@ modules/shepherd/config.scm:
modules/shepherd/config.scm.in Makefile
AM_V_GUILEC = $(AM_V_GUILEC_$(V))
AM_V_GUILEC_ = $(AM_V_GUILEC_$(AM_DEFAULT_VERBOSITY))
-AM_V_GUILEC_0 = @echo " GUILEC" $@;
+AM_V_GUILEC_0 = @echo " GUILEC " $@;
# Make sure 'modules/shepherd/{config,system.scm}' are built first.
# XXX: Use the C locale for when Guile lacks
#
<http://git.sv.gnu.org/cgit/guile.git/commit/?h=stable-2.0&id=e2c6bf3866d1186c60bacfbd4fe5037087ee5e3f>.
%.go: %.scm $(templates:%.in=%)
$(AM_V_GUILEC)$(MKDIR_P) "`dirname "$@"`" ; \
+ $(AM_V_P) && out=1 || out=- ; \
LC_ALL=C \
$(GUILD) compile --target="$(host)" \
-L "$(top_builddir)/modules" \
-L "$(top_srcdir)/modules" \
-Wformat -Wunbound-variable -Warity-mismatch \
- -o "$@" "$<"
+ -o "$@" "$<" >&$$out
SUFFIXES = .go
- [shepherd] branch master updated (4fb3a18 -> f158e63), Ludovic Courtès, 2016/01/17
- [shepherd] 01/07: build: Add missing backslash in AM_TESTS_ENVIRONMENT., Ludovic Courtès, 2016/01/17
- [shepherd] 05/07: maint: Fix version checking for Guile., Ludovic Courtès, 2016/01/17
- [shepherd] 03/07: build: Improve display for silent rules.,
Ludovic Courtès <=
- [shepherd] 04/07: maint: Update .gitignore., Ludovic Courtès, 2016/01/17
- [shepherd] 06/07: maint: Add .dir-locals.el., Ludovic Courtès, 2016/01/17
- [shepherd] 07/07: support: Add a keyword argument '#:secure?' to verify-dir., Ludovic Courtès, 2016/01/17
- [shepherd] 02/07: Rename 'deco' command to 'herd'., Ludovic Courtès, 2016/01/17