diff options
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | template/GNUmakefile.in | 1 | ||||
| -rw-r--r-- | template/Makefile.in | 7 |
3 files changed, 7 insertions, 3 deletions
@@ -200,7 +200,7 @@ TESTRUN_SCRIPT = $(srcdir)/test.rb COMPILE_PRELUDE = $(tooldir)/generic_erb.rb $(srcdir)/template/prelude.c.tmpl \ $(tooldir)/ruby_vm/helpers/c_escape.rb -SHOWFLAGS = showflags +SHOWFLAGS = $(no_silence:no=showflags) MAKE_LINK = $(MINIRUBY) -rfileutils -e "include FileUtils::Verbose" \ -e "src, dest = ARGV" \ diff --git a/template/GNUmakefile.in b/template/GNUmakefile.in index 444e44b3d3..74fbe84140 100644 --- a/template/GNUmakefile.in +++ b/template/GNUmakefile.in @@ -1,6 +1,7 @@ gnumake = yes include Makefile +override silence := $(if $(findstring s,$(firstword $(MFLAGS))),yes,no) ifeq ($(HAVE_BASERUBY),yes) override REVISION_FORCE := PHONY diff --git a/template/Makefile.in b/template/Makefile.in index 1f911524fe..b787615890 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -2,6 +2,9 @@ SHELL = /bin/sh NULLCMD = @NULLCMD@ +silence = no # yes/no +yes_silence = $(silence:no=) +no_silence = $(silence:yes=) n=$(NULLCMD) ECHO1 = $(V:1=$n) RUNCMD = $(SHELL) @@ -356,8 +359,8 @@ uncommon.mk: $(srcdir)/common.mk sed 's/{\$$([^(){}]*)[^{}]*}//g' $< > $@ .PHONY: reconfig -reconfig-args = $(srcdir)/$(CONFIGURE) $(configure_args) -config.status-args = ./config.status --recheck +reconfig-args = $(srcdir)/$(CONFIGURE) $(yes_silence:yes=-s) $(configure_args) +config.status-args = ./config.status $(yes_silence:yes=-s) --recheck reconfig-exec-0 = test -t 1 && { : $${CONFIGURE_TTY=yes}; export CONFIGURE_TTY; }; exec 3>&1; exit `exec 4>&1; { "$$@" 3>&- 4>&-; echo $$? 1>&4; } | fgrep -v '(cached)' 1>&3 3>&- 4>&-` reconfig-exec-1 = set -x; "$$@" |