diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-22 07:22:16 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-22 07:22:16 +0000 |
| commit | c233358e654fd345820efcdfc4b01d1e34d7e993 (patch) | |
| tree | 64a990ae589a8720cd40530dfb62e07780751071 /win32 | |
| parent | 658da719bf86713cd350adcba78f93190719baa0 (diff) | |
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@ruby-lang.org>
* 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@ruby-lang.org>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29864 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 2a644d1f4a..cfbecc9489 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -181,6 +181,7 @@ CPPFLAGS = $(CRTDEFFLAGS) $(DEFS) $(ARCHDEFS) $(CPPFLAGS) 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 @@ distclean-local:: @$(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) \ |