summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-28 08:41:52 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-28 08:41:52 +0000
commit23c2cf545c3302aa65cde911d0492475a6ad2bec (patch)
tree1d5ef3691d9246344a86acec13e08fed7c8b9265
parent72eb7e2a41b40b344e5cc6c8927485da6de106cd (diff)
* 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). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16668 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog9
-rw-r--r--Makefile.in2
-rw-r--r--common.mk6
-rw-r--r--win32/Makefile.sub8
4 files changed, 13 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index d7114b7c80..20bfe727f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed May 28 17:41:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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@ruby-lang.org>
* win32/mkexports.rb (Exports::Mswin#each_export): speed up.
diff --git a/Makefile.in b/Makefile.in
index 5f910aa4fe..5aa12a8fa7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -205,4 +205,4 @@ distclean-local::
ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
-MKPREP = $(PREP)
+MKPREP = $(PREP) $(RBCONFIG)
diff --git a/common.mk b/common.mk
index d30e4039b3..d58521229d 100644
--- a/common.mk
+++ b/common.mk
@@ -377,7 +377,7 @@ encs: enc.mk $(LIBRUBY)
$(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 @@ transdb.h: $(PREP)
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"
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index c1821bb0f2..0112921800 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -752,11 +752,3 @@ dir.$(OBJEXT) win32.$(OBJEXT): {$(srcdir)}win32/dir.h
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