diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | cygwin/GNUmakefile.in | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 3 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +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] + Thu Oct 7 09:14:28 2010 NARUSE, Yui <naruse@ruby-lang.org> * vm_exec.c (vm_exec_core): Treat clang as non gcc on this diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index eb6967aef5..5e2b467641 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -40,7 +40,7 @@ $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@ %.res.@OBJEXT@: %.rc @WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@ -$(RCFILES): $(RBCONFIG) +$(RCFILES): $(RBCONFIG) config.rb @$(MINIRUBY) $(srcdir)/win32/resource.rb \ -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \ -so_name=$(DLL_BASE_NAME) \ diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 654e70b185..ebd51e9aca 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -237,6 +237,7 @@ CPPFLAGS = $(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) -implib:dummy.lib -def:$(RUBYDEF) @@ -873,7 +874,7 @@ clean-enc distclean-enc realclean-enc: @-$(MAKE) -f $(ENC_MK) $(MFLAGS) $(@F) !endif -$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb +$(RCFILES): $(RBCONFIG) config.rb $(srcdir)/revision.h $(srcdir)/win32/resource.rb @$(MINIRUBY) $(srcdir)/win32/resource.rb \ -ruby_name=$(RUBY_INSTALL_NAME) \ -rubyw_name=$(RUBYW_INSTALL_NAME) \ |