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 /win32/Makefile.sub | |
| parent | c0d0125bc70d7fbde34bea82f9c06bf6cb57b2eb (diff) | |
* 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 'win32/Makefile.sub')
| -rw-r--r-- | win32/Makefile.sub | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index f2eebca708..b2ba3187a6 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -368,8 +368,8 @@ $(LIBRUBY_A): $(OBJS) dmyext.obj $(LIBRUBY): $(RUBYDEF) $(AR) -out:$@ -def:$(RUBYDEF) -machine:$(MACHINE) -$(LIBRUBY_SO): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $@.res - $(CC) $(LDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBY_A) $@.res $(LIBS) \ +$(LIBRUBY_SO): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $*.res + $(CC) $(LDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBY_A) $*.res $(LIBS) \ -Fe$@ -link -dll -def:$(RUBYDEF) $(RUBYDEF): $(LIBRUBY_A) miniruby$(EXEEXT) @@ -416,7 +416,7 @@ distclean-local: clean-local @if exist $(RUBYDEF) del $(RUBYDEF) @if exist $(RUBY_INSTALL_NAME).rc del $(RUBY_INSTALL_NAME).rc @if exist $(RUBYW_INSTALL_NAME).rc del $(RUBYW_INSTALL_NAME).rc - @if exist $(LIBRUBY_SO).rc del $(LIBRUBY_SO).rc + @if exist $(RUBY_SO_NAME).rc del $(RUBY_SO_NAME).rc @if exist $(PROGRAM) del $(PROGRAM) @if exist $(WPROGRAM) del $(WPROGRAM) @if exist $(LIBRUBY_SO) del $(LIBRUBY_SO) @@ -439,11 +439,11 @@ rbconfig.rb: miniruby$(EXEEXT) config.status -install_name=$(RUBY_INSTALL_NAME) \ -so_name=$(RUBY_SO_NAME) rbconfig.rb -$(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$(EXEEXT) $(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 {$(srcdir)/missing}.c.obj: |