nobu	2008-05-28 17:41:52 +0900 (Wed, 28 May 2008)

  New Revision: 16668

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk
    trunk/win32/Makefile.sub

  Log:
    * Makefile.in (MKPREP): appended $(RBCONFIG).
    
    * common.mk (enc.mk, prelude.c): not depend on $(RBCONFIG) on mswin32
      to get of compiling twice each time.
    
    * win32/Makefile.sub (prelude.c): not depend on $(PREP).


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/Makefile.in?r1=16668&r2=16667&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16668&r2=16667&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/win32/Makefile.sub?r1=16668&r2=16667&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=16668&r2=16667&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16667)
+++ ChangeLog	(revision 16668)
@@ -1,3 +1,12 @@
+Wed May 28 17:41:43 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* Makefile.in (MKPREP): appended $(RBCONFIG).
+
+	* common.mk (enc.mk, prelude.c): not depend on $(RBCONFIG) on mswin32
+	  to get of compiling twice each time.
+
+	* win32/Makefile.sub (prelude.c): not depend on $(PREP).
+
 Wed May 28 17:37:07 2008  NAKAMURA Usaku  <usa@r...>
 
 	* win32/mkexports.rb (Exports::Mswin#each_export): speed up.
Index: common.mk
===================================================================
--- common.mk	(revision 16667)
+++ common.mk	(revision 16668)
@@ -377,7 +377,7 @@
 	$(MAKE) -f enc.mk $(MFLAGS)
 
 enc.mk: $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
-	$(srcdir)/lib/mkmf.rb $(MKPREP) $(RBCONFIG)
+	$(srcdir)/lib/mkmf.rb $(MKPREP)
 	$(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" $@
 
 .PRECIOUS: $(MKFILES)
@@ -742,12 +742,12 @@
 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 $(PRELUDE_SCRIPTS) $(MKPREP) $(RBCONFIG)
+prelude.c: $(srcdir)/tool/compile_prelude.rb $(PRELUDE_SCRIPTS) $(MKPREP)
 	$(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb \
 		$(PRELUDE_SCRIPTS) $@.new
 	$(IFCHANGE) "$@" "$@.new"
 
-golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(MKPREP) $(RBCONFIG)
+golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(MKPREP)
 	$(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb $(srcdir)/golf_prelude.rb $@.new
 	$(IFCHANGE) "$@" "$@.new"
 
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 16667)
+++ win32/Makefile.sub	(revision 16668)
@@ -752,11 +752,3 @@
 
 ext/extinit.obj: ext/extinit.c $(SETUP)
 	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
-
-!if !exist(prelude.c)
-prelude.c: $(PREP)
-!endif
-
-!if !exist(golf_prelude.c)
-golf_prelude.c: $(PREP)
-!endif
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 16667)
+++ Makefile.in	(revision 16668)
@@ -205,4 +205,4 @@
 ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
 	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
 
-MKPREP = $(PREP)
+MKPREP = $(PREP) $(RBCONFIG)

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