summaryrefslogtreecommitdiff
path: root/bcc32
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-08-03 15:27:13 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-08-03 15:27:13 +0000
commite869ff20a31c6e19b1a63adb7e131c959c3ddb61 (patch)
treef4f5d900e998d283298787dfb2c91530018732ef /bcc32
parenta0d58fef04f389082c5c397ab77688a3608abc27 (diff)
* 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/branches/ruby_1_8@8902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'bcc32')
-rw-r--r--bcc32/Makefile.sub11
1 files changed, 5 insertions, 6 deletions
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 213d5a7..58048e3 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -164,7 +164,6 @@ LIBRUBYARG = $(LIBRUBY)
PREP = miniruby$(EXEEXT)
-DMYOBJS = dmyext.obj
OBJEXT = obj
WINMAINOBJ = winmain.$(OBJEXT)
@@ -408,16 +407,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)