shyouhei	2010-11-22 16:22:16 +0900 (Mon, 22 Nov 2010)

  New Revision: 29864

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

  Log:
    Thu, 7 Oct 2010 09:10:47 +0000  nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
     merge revision(s) 29420:29424:
     
     	* cygwin/GNUmakefile.in, win32/Makefile.sub (RCFILES): depend on
     	  real config.rb file.  [ruby-core:32709]
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29421 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
    Signed-off-by: URABE, Shyouhei <shyouhei@r...>
    
    * common.mk (RBCONFIG): depends on version.h due to
      RUBY_PATCHLEVEL.  [ruby-core:32709]
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29424 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
    Signed-off-by: URABE, Shyouhei <shyouhei@r...>

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/common.mk
    branches/ruby_1_8_7/cygwin/GNUmakefile.in
    branches/ruby_1_8_7/version.h
    branches/ruby_1_8_7/win32/Makefile.sub

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 29863)
+++ ruby_1_8_7/ChangeLog	(revision 29864)
@@ -1,3 +1,13 @@
+Fri Oct  8 10:51:56 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk (RBCONFIG): depends on version.h due to
+	  RUBY_PATCHLEVEL.  [ruby-core:32709]
+
+Thu Oct  7 18:10:35 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* cygwin/GNUmakefile.in, win32/Makefile.sub (RCFILES): depend on
+	  real config.rb file.  [ruby-core:32709]
+
 Sun Oct  3 18:30:23 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (rb_intern): should check symbol table overflow.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 29863)
+++ ruby_1_8_7/version.h	(revision 29864)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-11-22"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20101122
-#define RUBY_PATCHLEVEL 313
+#define RUBY_PATCHLEVEL 314
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/common.mk
===================================================================
--- ruby_1_8_7/common.mk	(revision 29863)
+++ ruby_1_8_7/common.mk	(revision 29864)
@@ -312,7 +312,7 @@
 	$(MINIRUBY) -run -e mkdir -- -p "$(EXTCONFDIR)"
 	$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
 
-$(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP)
+$(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(srcdir)/version.h $(PREP)
 	@$(MINIRUBY) $(srcdir)/mkconfig.rb -timestamp=$@ \
 		-install_name=$(RUBY_INSTALL_NAME) \
 		-so_name=$(RUBY_SO_NAME) rbconfig.rb
Index: ruby_1_8_7/cygwin/GNUmakefile.in
===================================================================
--- ruby_1_8_7/cygwin/GNUmakefile.in	(revision 29863)
+++ ruby_1_8_7/cygwin/GNUmakefile.in	(revision 29864)
@@ -38,7 +38,7 @@
 %.res.@OBJEXT@: %.rc
 	@WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
 
-$(RCFILES): $(RBCONFIG)
+$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
 	@$(MINIRUBY) $(srcdir)/win32/resource.rb \
 	  -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \
 	  -so_name=$(DLL_BASE_NAME) \
Index: ruby_1_8_7/win32/Makefile.sub
===================================================================
--- ruby_1_8_7/win32/Makefile.sub	(revision 29863)
+++ ruby_1_8_7/win32/Makefile.sub	(revision 29864)
@@ -181,6 +181,7 @@
 
 DLDFLAGS = $(LDFLAGS) -dll
 SOLIBS = 
+RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
 
 LIBRUBY_LDSHARED = $(LDSHARED)
 LIBRUBY_DLDFLAGS = $(EXTLDFLAGS) -def:$(RUBYDEF)
@@ -614,7 +615,7 @@
 		@$(RM) ext\config.cache $(RBCONFIG:/=\) $(CONFIG_H:/=\)
 		@$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
 
-$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG)
+$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
 		@$(MINIRUBY) $(srcdir)/win32/resource.rb \
 			-ruby_name=$(RUBY_INSTALL_NAME) \
 			-rubyw_name=$(RUBYW_INSTALL_NAME) \

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