From 7f80a1800f7b13e63227fb6202bee55a81cd506b Mon Sep 17 00:00:00 2001 From: eban Date: Tue, 11 Jun 2002 10:26:13 +0000 Subject: * configure.in (LIBRUBY): rename to lib$(LIBRUBY_SO).a on Cygwin/MinGW. * configure.in, cygwin/GNUmakefile: use dllwrap when --disable-shared is specified. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2551 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- cygwin/GNUmakefile.in | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'cygwin/GNUmakefile.in') diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index 4fc628f4da..3fd5b5ad53 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -2,24 +2,25 @@ include Makefile ENABLE_SHARED=@ENABLE_SHARED@ -ifneq (,$(findstring no, $(ENABLE_SHARED))) - EXTOBJS = $(RUBY_INSTALL_NAME).exp - LIBRUBYARG = $(LIBRUBY_A) -else +ifeq ($(ENABLE_SHARED),yes) CPPFLAGS += -DLIBRUBY_SO=\"$(LIBRUBY_SO)\" +else + RUBY_EXP = $(RUBY_INSTALL_NAME).exp + EXTOBJS = $(RUBY_EXP) + LIBRUBYARG = $(LIBRUBY_A) endif -ifneq (,$(findstring ruby, $(RUBY_INSTALL_NAME))) - RUBYW_INSTALL_NAME = $(subst ruby,rubyw,$(RUBY_INSTALL_NAME)) -else +ifeq ($(RUBY_INSTALL_NAME),ruby) RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME)w +else + RUBYW_INSTALL_NAME = $(subst ruby,rubyw,$(RUBY_INSTALL_NAME)) endif WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT) RUBYDEF = $(RUBY_INSTALL_NAME).def SOLIBS := $(LIBRUBY_SO).res.@OBJEXT@ $(SOLIBS) EXTOBJS += $(@:$(EXEEXT)=.res.@OBJEXT@) -$(LIBRUBY_SO): $(RUBYDEF) $(LIBRUBY_SO).res.@OBJEXT@ +$(LIBRUBY_SO): $(RUBYDEF) $(LIBRUBY_SO).res.@OBJEXT@ $(RUBY_EXP) $(LIBRUBY): $(LIBRUBY_SO) %.res.@OBJEXT@: %.rc @@ -41,3 +42,7 @@ $(RUBYDEF): $(LIBRUBY_A) echo EXPORTS > $(RUBYDEF) @NM@ --extern-only --defined-only $(LIBRUBY_A) | \ @MINIRUBY@ -ne 'puts $$1 if / [CDT] _(.*)$$/' >> $(RUBYDEF) +$(RUBY_EXP): $(RUBYDEF) + @DLLWRAP@ --output-exp=$(RUBY_EXP) --output-lib=$(LIBRUBY) \ + --def=$(RUBYDEF) $(LIBRUBY_A) $(LIBS) -o $(PROGRAM) + rm $(PROGRAM) -- cgit v1.2.3