From a51e80459c2703d1906a4e1646de47def3550a09 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 3 Aug 2005 15:27:13 +0000
Subject: * common.mk, Makefile.in, {bcc32,win32,wince}/Makefile.sub:
 integrated   macro definitions.

* bcc32/Makefile.sub: LIBRUBY_SO should use DLDOBJS, not EXTOBJS.

* {win32,wince}/Makefile.sub: separate config.h for compiler versions.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 bcc32/Makefile.sub | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'bcc32')

diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 5b51846c77..3f19841697 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -168,7 +168,6 @@ LIBRUBYARG    = $(LIBRUBY)
 
 PREP          = miniruby$(EXEEXT)
 
-DMYOBJS       = dmyext.obj
 OBJEXT        = obj
 
 WINMAINOBJ    = winmain.$(OBJEXT)
@@ -416,16 +415,16 @@ $(PROGRAM):	$(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
 $(WPROGRAM):	$(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res
 		$(LD) $(LDFLAGS) $(WLDFLAGS) $(MAINOBJ) $(WINMAINOBJ),$@,nul,$(LIBRUBYARG) $(LIBS),,$(RUBYW_INSTALL_NAME).res
 
-$(LIBRUBY_A):	$(OBJS) dmyext.obj
+$(LIBRUBY_A):	$(OBJS) $(DMYEXT)
 		@-if exist $@ del $@
-		$(AR) $(ARFLAGS) "$@" $(OBJS) dmyext.obj
+		$(AR) $(ARFLAGS) "$@" $(OBJS) $(DMYEXT)
 
 # $(LIBRUBY):	$(LIBRUBY_SO)
 #		implib $@ $(LIBRUBY_SO)
 
-$(LIBRUBY_SO): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
-		@echo $(EXTOBJS)
-		$(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(EXTOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res
+$(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
+		@echo $(DLDOBJS)
+		$(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(DLDOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res
 
 $(LIBRUBY): $(LIBRUBY_SO)
 
-- 
cgit v1.2.3