diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-09-11 02:38:51 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-09-11 02:38:51 +0000 |
| commit | 0eb196f281259b77efe550044c05a213122a2b91 (patch) | |
| tree | 2fd0ae441d1ea952268aadb6ab79828b38a82d98 /cygwin | |
| parent | c0d0125bc70d7fbde34bea82f9c06bf6cb57b2eb (diff) | |
| download | bundler-0eb196f281259b77efe550044c05a213122a2b91.tar.gz | |
* bcc32/Makefile.sub: remove unnecessary `.dll' from filename of
dll's resource file.
* cygwin/GNUmakefile.in: ditto. [ruby-dev:17103]
* win32/Makefile.sub: ditto. [ruby-dev:17103]
* win32/resource.rb: ditto. [ruby-dev:17103]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2843 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'cygwin')
| -rw-r--r-- | cygwin/GNUmakefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index 3fd5b5ad53..b9a436544c 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -17,19 +17,19 @@ else endif WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT) RUBYDEF = $(RUBY_INSTALL_NAME).def -SOLIBS := $(LIBRUBY_SO).res.@OBJEXT@ $(SOLIBS) +SOLIBS := $(RUBY_SO_NAME).res.@OBJEXT@ $(SOLIBS) EXTOBJS += $(@:$(EXEEXT)=.res.@OBJEXT@) -$(LIBRUBY_SO): $(RUBYDEF) $(LIBRUBY_SO).res.@OBJEXT@ $(RUBY_EXP) +$(LIBRUBY_SO): $(RUBYDEF) $(RUBY_SO_NAME).res.@OBJEXT@ $(RUBY_EXP) $(LIBRUBY): $(LIBRUBY_SO) %.res.@OBJEXT@: %.rc @WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@ -$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(LIBRUBY_SO).rc: rbconfig.rb +$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb @@MINIRUBY@ $(srcdir)/win32/resource.rb \ -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \ - -so_name=$(LIBRUBY_SO) \ + -so_name=$(RUBY_SO_NAME) \ . $(icondirs) $(srcdir)/win32 $(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@ |