diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-23 14:30:50 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-23 14:30:50 +0000 |
| commit | 2b862ea95c127696b69de6aced7014202d98ceb0 (patch) | |
| tree | 4f60311b6a85ffda6d9110a31934590eb4f24127 | |
| parent | 859ed453507cf2b793d41a934665ebaf9c847706 (diff) | |
* common.mk, win32/Makefile.sub: fixes dependencies.
patch by nobu.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
4 files changed, 8 insertions, 8 deletions
@@ -1,3 +1,8 @@ +Thu Dec 23 23:29:04 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp> + + * common.mk, win32/Makefile.sub: fixes dependencies. + patch by nobu. + Thu Dec 23 22:29:08 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp> * io.c (io_fillbuf): fixes a mistake on merging r30280, at r30321. @@ -390,11 +395,6 @@ Fri Oct 8 00:24:54 2010 James Edward Gray II <jeg2@ruby-lang.org> * lib/csv.rb: Fixing documentation typos. [ruby-core:32712] -Thu Oct 7 18:10:35 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * cygwin/GNUmakefile.in, win32/Makefile.sub (RCFILES): depend on - real config.rb file. [ruby-core:32709] - Wed Oct 6 11:52:12 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * io.c (fptr_finalize): write_mutex might have been destroyed @@ -447,7 +447,7 @@ extconf: $(PREP) $(MAKEDIRS) "$(EXTCONFDIR)" $(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS) -$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(PREP) +$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h $(PREP) @$(MINIRUBY) $(srcdir)/tool/mkconfig.rb -timestamp=$@ \ -install_name=$(RUBY_INSTALL_NAME) \ -so_name=$(RUBY_SO_NAME) rbconfig.rb @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 131 +#define RUBY_PATCHLEVEL 132 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 diff --git a/win32/Makefile.sub b/win32/Makefile.sub index e7ed93ca79..a02d3c3026 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -846,7 +846,7 @@ clean-ext distclean-ext realclean-ext:: distclean-ext realclean-ext:: @-rmdir ext -$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG) config.rb $(srcdir)/revision.h $(srcdir)/win32/resource.rb +$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb @$(MINIRUBY) $(srcdir)/win32/resource.rb \ -ruby_name=$(RUBY_INSTALL_NAME) \ -rubyw_name=$(RUBYW_INSTALL_NAME) \ |