summaryrefslogtreecommitdiff
path: root/cygwin
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-08-07 05:43:59 (GMT)
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-08-07 05:43:59 (GMT)
commit6f059f33ef1eae43e2648a6a8d4c8275b97a191e (patch)
tree9eb70930e68bf7d8f354c3f0d3d2ca369c5ce30d /cygwin
parent755dc335a511994e3b34a4abadb4a3332705c334 (diff)
* cygwin/GNUmakefile: better --disbale-shared option support.
* configure.in: Fix Cygwin specific naming of libraries to be net distribution compliant. (ruby-bugs PR#1077) cygwin-ruby18.dll -> cygruby18.dll git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4350 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'cygwin')
-rw-r--r--cygwin/GNUmakefile.in15
1 files changed, 11 insertions, 4 deletions
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 7e8672b..83f47f9 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -2,6 +2,12 @@ include Makefile
ENABLE_SHARED=@ENABLE_SHARED@
+ifeq (@target_os@,cygwin)
+ DLL_BASE_NAME := $(subst .dll,,$(LIBRUBY_SO))
+else
+ DLL_BASE_NAME := $(RUBY_SO_NAME)
+endif
+
ifneq ($(ENABLE_SHARED),yes)
RUBY_EXP = $(RUBY_INSTALL_NAME).exp
EXTOBJS = $(RUBY_EXP)
@@ -14,20 +20,21 @@ ifeq ($(RUBY_INSTALL_NAME),ruby)
else
RUBYW_INSTALL_NAME = $(subst ruby,rubyw,$(RUBY_INSTALL_NAME))
endif
+
WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
-SOLIBS := $(RUBY_SO_NAME).res.@OBJEXT@ $(SOLIBS)
+SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
EXTOBJS += $(@:$(EXEEXT)=.res.@OBJEXT@)
$(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO)
-$(RUBY_EXP) $(LIBRUBY_SO): $(RUBY_SO_NAME).res.@OBJEXT@
+$(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
%.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 $(DLL_BASE_NAME).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=$(DLL_BASE_NAME) \
. $(icondirs) $(srcdir)/win32
$(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@