diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-08-09 04:32:24 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-08-09 04:32:24 +0000 |
| commit | e0208c14e0e8161f80c14624a5d4a1f544a74a70 (patch) | |
| tree | cf8d2904f1e9ba1a42b0e68e59571e97c3695f2b /cygwin | |
| parent | 2eb957394cc2120ba77e6a3bf367d029a148ca3a (diff) | |
| download | ruby-e0208c14e0e8161f80c14624a5d4a1f544a74a70.tar.gz ruby-e0208c14e0e8161f80c14624a5d4a1f544a74a70.tar.xz ruby-e0208c14e0e8161f80c14624a5d4a1f544a74a70.zip | |
matz
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@882 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'cygwin')
| -rw-r--r-- | cygwin/GNUmakefile.in | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index 74ef208f4..2dd44042c 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -14,24 +14,23 @@ else endif WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT) RUBYDEF = $(RUBY_INSTALL_NAME).def -RUBY_SO_NAME = $(LIBRUBY_SO:.dll=) -SOLIBS := $(RUBY_SO_NAME).res.o $(SOLIBS) -EXTOBJS += $(@:$(EXEEXT)=.res.o) +SOLIBS := $(LIBRUBY_SO).res.@OBJEXT@ $(SOLIBS) +EXTOBJS += $(@:$(EXEEXT)=.res.@OBJEXT@) -$(LIBRUBY_SO): $(RUBYDEF) $(RUBY_SO_NAME).res.o +$(LIBRUBY_SO): $(RUBYDEF) $(LIBRUBY_SO).res.@OBJEXT@ $(LIBRUBY): $(LIBRUBY_SO) -%.res.o: %.rc +%.res.@OBJEXT@: %.rc @WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@ -$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb +$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(LIBRUBY_SO).rc: rbconfig.rb @@MINIRUBY@ $(srcdir)/win32/resource.rb \ -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \ - -so_name=$(RUBY_SO_NAME) \ + -so_name=$(LIBRUBY_SO) \ . $(icondirs) $(srcdir)/win32 -$(PROGRAM): $(RUBY_INSTALL_NAME).res.o -$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.o +$(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@ +$(WPROGRAM): $(RUBYW_INSTALL_NAME).res.@OBJEXT@ @rm -f $@ $(PURIFY) $(CC) -mwindows -e _mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \ $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@ |