nobu	2008-04-08 10:30:31 +0900 (Tue, 08 Apr 2008)

  New Revision: 15922

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
    trunk/enc/prelude.rb

  Log:
    * common.mk (prelude.c): depends on enc/prelude.rb.
    
    * enc/prelude.rb: fixed initial library names.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15922&r2=15921&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/prelude.rb?r1=15922&r2=15921&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=15922&r2=15921&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15921)
+++ ChangeLog	(revision 15922)
@@ -1,3 +1,9 @@
+Tue Apr  8 10:30:29 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk (prelude.c): depends on enc/prelude.rb.
+
+	* enc/prelude.rb: fixed initial library names.
+
 Tue Apr  8 03:39:26 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* load.c (rb_provided): check expanded path for relative path
Index: enc/prelude.rb
===================================================================
--- enc/prelude.rb	(revision 15921)
+++ enc/prelude.rb	(revision 15922)
@@ -1,4 +1,4 @@
-%w'enc/init enc/trans/init'.each do |init|
+%w'enc/encdb enc/trans/transdb'.each do |init|
   begin
     require(init)
   rescue LoadError
Index: common.mk
===================================================================
--- common.mk	(revision 15921)
+++ common.mk	(revision 15922)
@@ -85,6 +85,9 @@
 
 GOLFOBJS      = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
 
+PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(srcdir)/gem_prelude.rb
+PRELUDES      = prelude.c miniprelude.c golf_prelude.c
+
 SCRIPT_ARGS   =	--dest-dir="$(DESTDIR)" \
 		--extout="$(EXTOUT)" \
 		--mflags="$(MFLAGS)" \
@@ -734,9 +737,9 @@
 miniprelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb
 	$(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
 
-prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/gem_prelude.rb $(RBCONFIG) $(PREP)
+prelude.c: $(srcdir)/tool/compile_prelude.rb $(PRELUDE_SCRIPTS) $(RBCONFIG) $(PREP)
 	$(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb \
-		$(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(srcdir)/gem_prelude.rb $@.new
+		$(PRELUDE_SCRIPTS) $@.new
 	$(IFCHANGE) "$@" "$@.new"
 
 golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP)
@@ -747,7 +750,6 @@
 
 preludes: {$(VPATH)}miniprelude.c
 preludes: {$(srcdir)}golf_prelude.c
-PRELUDES = prelude.c miniprelude.c golf_prelude.c
 
 docs:
 	$(BASERUBY) -I$(srcdir) $(srcdir)/tool/makedocs.rb $(INSNS2VMOPT)

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