nobu	2014-10-21 22:48:16 +0900 (Tue, 21 Oct 2014)

  New Revision: 48075

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

  Log:
    common.mk: UNICODE_FILES
    
    * common.mk (UNICODE_FILES): revert the rule that Unicode data
      files depend on downloader target, and add missing dependency of
      lib/unicode_normalize/tables.rb
    
    * common.mk (after-configure): removed as srcdir should be
      read-only after update.

  Modified files:
    trunk/common.mk
    trunk/configure.in
    trunk/win32/setup.mak
Index: configure.in
===================================================================
--- configure.in	(revision 48074)
+++ configure.in	(revision 48075)
@@ -4231,5 +4231,4 @@ AC_CONFIG_FILES($ruby_pc:template/ruby.p https://github.com/ruby/ruby/blob/trunk/configure.in#L4231
 
 AC_OUTPUT
 }
-${MAKE-make} after-configure
 }
Index: common.mk
===================================================================
--- common.mk	(revision 48074)
+++ common.mk	(revision 48075)
@@ -913,14 +913,19 @@ INSNS2VMOPT = --srcdir="$(srcdir)" https://github.com/ruby/ruby/blob/trunk/common.mk#L913
 
 {$(VPATH)}vm.inc: $(srcdir)/template/vm.inc.tmpl
 
-srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}newline.c {$(VPATH)}id.c srcs-ext srcs-enc
+srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}newline.c {$(VPATH)}id.c \
+      srcs-lib srcs-ext srcs-enc
 
 EXT_SRCS = $(srcdir)/ext/ripper/ripper.c $(srcdir)/ext/json/parser/parser.c \
 	   $(srcdir)/ext/dl/callback/callback.c  $(srcdir)/ext/rbconfig/sizeof/sizes.c
 
 srcs-ext: $(EXT_SRCS)
 
-srcs-enc: $(ENC_MK) lib/unicode_normalize/tables.rb
+LIB_SRCS = $(srcdir)/lib/unicode_normalize/tables.rb
+
+srcs-lib: $(LIB_SRCS)
+
+srcs-enc: $(ENC_MK)
 	$(ECHO) making srcs under enc
 	$(Q) $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs
 
@@ -1075,9 +1080,7 @@ dist: https://github.com/ruby/ruby/blob/trunk/common.mk#L1080
 up::
 	-$(Q)$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(REVISION_H)"
 
-after-update:: after-configure update-gems
-
-after-configure:: update-unicode
+after-update:: update-unicode update-gems
 
 update-config_files: PHONY
 	$(Q) $(BASERUBY) -C "$(srcdir)/tool" \
@@ -1095,16 +1098,21 @@ update-gems: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L1098
 
 # ALWAYS_UPDATE_UNICODE = yes
 
-update-unicode: PHONY
+UNICODE_FILES = $(srcdir)/enc/unicode/data/UnicodeData.txt \
+		$(srcdir)/enc/unicode/data/CompositionExclusions.txt \
+		$(srcdir)/enc/unicode/data/NormalizationTest.txt
+
+update-unicode: $(UNICODE_FILES) PHONY
+
+$(UNICODE_FILES):
 	$(ECHO) Downloading Unicode data files...
 	$(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data"
 	$(Q) $(BASERUBY) -C "$(srcdir)/enc/unicode/data" \
 	    ../../../tool/downloader.rb -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \
 	    UnicodeData.txt CompositionExclusions.txt NormalizationTest.txt
 
-lib/unicode_normalize/tables.rb: $(srcdir)/tool/unicode_norm_gen.rb \
-				 $(srcdir)/enc/unicode/data/UnicodeData.txt \
-				 $(srcdir)/enc/unicode/data/CompositionExclusions.txt
+$(srcdir)/lib/unicode_normalize/tables.rb: \
+		$(srcdir)/tool/unicode_norm_gen.rb $(UNICODE_FILES)
 	$(BASERUBY) -s -C "$(srcdir)" tool/unicode_norm_gen.rb \
 		-input=enc/unicode/data -ouput=lib/unicode_normalize
 
Index: win32/setup.mak
===================================================================
--- win32/setup.mak	(revision 48074)
+++ win32/setup.mak	(revision 48075)
@@ -218,5 +218,4 @@ $(CPU) = $(PROCESSOR_LEVEL) https://github.com/ruby/ruby/blob/trunk/win32/setup.mak#L218
 $(BANG)include $$(srcdir)/win32/Makefile.sub
 <<
 	@$(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat config.h config.status
-	@$(MAKE) -l after-configure
 	@echo "type `nmake' to make ruby."

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