kanemoto	2010-05-21 08:38:20 +0900 (Fri, 21 May 2010)

  New Revision: 27935

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27935

  Log:
    * common.mk (EXPORTOBJS): merged r24482 from trunk. [Bug #3326]
    
            * common.mk (miniruby$(EXEEXT)): ruby.imp need to be created
              before creating miniruby. [Bug #3326]

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/common.mk

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 27934)
+++ ruby_1_8/ChangeLog	(revision 27935)
@@ -1,3 +1,10 @@
+Fri May 21 08:33:52 2010  Yutaka Kanemoto  <kanemoto@r...>
+
+	* 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@r...>
 
 	* win32/Makefile.sub (miniruby.exe): merge miss of r27053, too.
Index: ruby_1_8/common.mk
===================================================================
--- ruby_1_8/common.mk	(revision 27934)
+++ ruby_1_8/common.mk	(revision 27935)
@@ -60,10 +60,11 @@
 		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 @@
 
 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 @@
 	@$(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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/