nobu	2015-10-22 23:56:37 +0900 (Thu, 22 Oct 2015)

  New Revision: 52221

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=52221

  Log:
    common.mk: showflags only once
    
    * common.mk (showflags): do not show flags from recursive make.

  Modified files:
    trunk/common.mk
    trunk/defs/gmake.mk
    trunk/ext/extmk.rb
Index: defs/gmake.mk
===================================================================
--- defs/gmake.mk	(revision 52220)
+++ defs/gmake.mk	(revision 52221)
@@ -18,7 +18,7 @@ ifeq ($(if $(filter all main exts enc tr https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L18
 		    wprogram rubyw rubyw$(EXEEXT) \
 		    miniruby$(EXEEXT) mini,\
 	     $(MAKECMDGOALS)),,$(MAKECMDGOALS)),)
--include showflags
+-include $(SHOWFLAGS)
 endif
 
 ifneq ($(filter universal-%,$(arch)),)
Index: common.mk
===================================================================
--- common.mk	(revision 52220)
+++ common.mk	(revision 52221)
@@ -156,13 +156,15 @@ TESTRUN_SCRIPT = $(srcdir)/test.rb https://github.com/ruby/ruby/blob/trunk/common.mk#L156
 
 COMPILE_PRELUDE = $(srcdir)/tool/generic_erb.rb $(srcdir)/template/prelude.c.tmpl
 
-all: showflags main docs
+SHOWFLAGS = showflags
 
-main: showflags $(ENCSTATIC:static=lib)encs exts
+all: $(SHOWFLAGS) main docs
+
+main: $(SHOWFLAGS) $(ENCSTATIC:static=lib)encs exts
 	@$(NULLCMD)
 
 .PHONY: showflags
-exts enc trans: showflags
+exts enc trans: $(SHOWFLAGS)
 showflags:
 	$(MESSAGE_BEGIN) \
 	"	CC = $(CC)" \
@@ -219,8 +221,8 @@ Doxyfile: $(srcdir)/template/Doxyfile.tm https://github.com/ruby/ruby/blob/trunk/common.mk#L221
 	$(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \
 	--srcdir="$(srcdir)" --miniruby="$(MINIRUBY)"
 
-program: showflags $(PROGRAM)
-wprogram: showflags $(WPROGRAM)
+program: $(SHOWFLAGS) $(PROGRAM)
+wprogram: $(SHOWFLAGS) $(WPROGRAM)
 mini: PHONY miniruby$(EXEEXT)
 
 $(PROGRAM) $(WPROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
@@ -631,7 +633,7 @@ yes-runnable: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L633
 
 encs: enc trans
 libencs: libenc libtrans
-encs enc trans libencs libenc libtrans: showflags $(ENC_MK) $(LIBRUBY) $(PREP) PHONY
+encs enc trans libencs libenc libtrans: $(SHOWFLAGS) $(ENC_MK) $(LIBRUBY) $(PREP) PHONY
 	$(ECHO) making $@
 	$(Q) $(MAKE) -f $(ENC_MK) V="$(V)" \
 		RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" \
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 52220)
+++ ext/extmk.rb	(revision 52221)
@@ -703,6 +703,7 @@ if $configure_only and $command_output https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L703
     end
     submakeopts << 'EXTLDFLAGS="$(EXTLDFLAGS)"'
     submakeopts << 'UPDATE_LIBRARIES="$(UPDATE_LIBRARIES)"'
+    submakeopts << 'SHOWFLAGS='
     mf.macro "SUBMAKEOPTS", submakeopts
     mf.puts
     targets = %w[all install static install-so install-rb clean distclean realclean]

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/