diff options
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 74ef208f47..2dd44042c2 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 $@ |