nobu	2016-08-16 17:41:59 +0900 (Tue, 16 Aug 2016)

  New Revision: 55932

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

  Log:
    common.mk: MAKE_ENC
    
    * common.mk (MAKE_ENC): arguments for enc.mk

  Modified files:
    trunk/Makefile.in
    trunk/common.mk
    trunk/win32/Makefile.sub
Index: common.mk
===================================================================
--- common.mk	(revision 55931)
+++ common.mk	(revision 55932)
@@ -64,6 +64,8 @@ DLDOBJS	      = $(INITOBJS) https://github.com/ruby/ruby/blob/trunk/common.mk#L64
 EXTSOLIBS     =
 MINIOBJS      = $(ARCHMINIOBJS) miniinit.$(OBJEXT) dmyext.$(OBJEXT) miniprelude.$(OBJEXT)
 ENC_MK        = enc.mk
+MAKE_ENC      = -f $(ENC_MK) V="$(V)" UNICODE_VERSION=$(UNICODE_VERSION) \
+		RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS)
 
 COMMONOBJS    = array.$(OBJEXT) \
 		bignum.$(OBJEXT) \
@@ -665,9 +667,7 @@ encs: enc trans https://github.com/ruby/ruby/blob/trunk/common.mk#L667
 libencs: libenc libtrans
 encs enc trans libencs libenc libtrans: $(SHOWFLAGS) $(ENC_MK) $(LIBRUBY) $(PREP) PHONY
 	$(ECHO) making $@
-	$(Q) $(MAKE) -f $(ENC_MK) V="$(V)" UNICODE_VERSION=$(UNICODE_VERSION) \
-		RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" \
-		$(MFLAGS) $@
+	$(Q) $(MAKE) $(MAKE_ENC) $@
 
 
 libenc enc: {$(VPATH)}encdb.h
@@ -819,8 +819,7 @@ srcs-lib: $(LIB_SRCS) https://github.com/ruby/ruby/blob/trunk/common.mk#L819
 
 srcs-enc: $(ENC_MK)
 	$(ECHO) making srcs under enc
-	$(Q) $(MAKE) -f $(ENC_MK) UNICODE_VERSION=$(UNICODE_VERSION) \
-		RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs
+	$(Q) $(MAKE) $(MAKE_ENC) srcs
 
 all-incs: incs {$(VPATH)}encdb.h {$(VPATH)}transdb.h
 incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}known_errors.inc \
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 55931)
+++ win32/Makefile.sub	(revision 55932)
@@ -1075,7 +1075,7 @@ clean-extout: https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1075
 clean-enc distclean-enc realclean-enc:
 !if exist($(ENC_MK))
 	@echo $(@:-enc=ing) encodings
-	@-$(MAKE) -f $(ENC_MK) $(MFLAGS) V=$(V) $(@:-enc=)
+	@-$(MAKE) $(MAKE_ENC) $(@:-enc=)
 !endif
 
 $(RBCONFIG): $(PREP)
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 55931)
+++ Makefile.in	(revision 55932)
@@ -439,7 +439,7 @@ clean-extout: https://github.com/ruby/ruby/blob/trunk/Makefile.in#L439
 clean-enc distclean-enc realclean-enc:
 	@test -f "$(ENC_MK)" || exit 0; \
 	echo $(@:-enc=ing) encodings; \
-	exec $(MAKE) -f $(ENC_MK) $(MFLAGS) $(@:-enc=)
+	exec $(MAKE) $(MAKE_ENC) $(@:-enc=)
 
 ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
 	$(ECHO) compiling $@

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