diff options
| author | kanemoto <kanemoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-20 23:38:20 +0000 |
|---|---|---|
| committer | kanemoto <kanemoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-20 23:38:20 +0000 |
| commit | 81f7b2e7d7388254aa820369ee8169e74688e667 (patch) | |
| tree | f8b547368a8676ef8f0b54420ac4affa94cdc425 | |
| parent | c15517c9805be02241e4b04889e6375220c8796e (diff) | |
* common.mk (EXPORTOBJS): merged r24482 from trunk. [Bug #3326]
* common.mk (miniruby$(EXEEXT)): ruby.imp need to be created
before creating miniruby. [Bug #3326]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@27935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | common.mk | 13 |
2 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,10 @@ +Fri May 21 08:33:52 2010 Yutaka Kanemoto <kanemoto@ruby-lang.org> + + * common.mk (EXPORTOBJS): merged r24482 from trunk. [Bug #3326] + + * common.mk (miniruby$(EXEEXT)): ruby.imp need to be created + before creating miniruby. [Bug #3326] + Thu May 20 21:25:55 2010 NAKAMURA Usaku <usa@ruby-lang.org> * win32/Makefile.sub (miniruby.exe): merge miss of r27053, too. @@ -60,9 +60,10 @@ COMMONOBJS = array.$(OBJEXT) \ version.$(OBJEXT) \ $(MISSING) -OBJS = $(COMMONOBJS) \ - dln.$(OBJEXT) \ - prelude.$(OBJEXT) +EXPORTOBJS = $(COMMONOBJS) \ + dln.$(OBJEXT) + +OBJS = $(EXPORTOBJS) prelude.$(OBJEXT) PRELUDE_SCRIPTS = $(srcdir)/prelude.rb PRELUDES = prelude.c miniprelude.c @@ -102,7 +103,7 @@ $(MKMAIN_CMD): $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY) prog: $(PROGRAM) $(WPROGRAM) -miniruby$(EXEEXT): config.status $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) +miniruby$(EXEEXT): config.status $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(ARCHFILE) $(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP) @@ -117,8 +118,8 @@ $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) @$(RM) $@ $(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS) -ruby.imp: $(OBJS) - @$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@ +ruby.imp: $(EXPORTOBJS) + @$(NM) -Pgp $(EXPORTOBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@ install: install-$(RDOCTARGET) install-rdoc: install-all |