diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-14 05:06:36 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-14 05:06:36 +0000 |
| commit | e81b38e3782d280c1577b78b35f8a1c5cd217a3f (patch) | |
| tree | cd61d5c4d6f8bda4cb3c11f4bf6de30105a27217 | |
| parent | d907cbc81d6aa67502695df21a6f31c55325db0c (diff) | |
| download | ruby-e81b38e3782d280c1577b78b35f8a1c5cd217a3f.tar.gz | |
* common.mk, Makefile.in: rename prelude.c to miniprelude.c.
rename ext_prelude.c to prelude.c
* win32/Makefile.sub: ditto.
* bcc32/Makefile.sub: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13921 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 2 | ||||
| -rw-r--r-- | common.mk | 10 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
5 files changed, 17 insertions, 8 deletions
@@ -1,3 +1,12 @@ +Wed Nov 14 14:04:42 2007 Tanaka Akira <akr@fsij.org> + + * common.mk, Makefile.in: rename prelude.c to miniprelude.c. + rename ext_prelude.c to prelude.c + + * win32/Makefile.sub: ditto. + + * bcc32/Makefile.sub: ditto. + Wed Nov 14 07:09:48 2007 Koichi Sasada <ko1@atdot.net> * blockinlining.c, compile.c, compile.h, debug.c, debug.h, diff --git a/Makefile.in b/Makefile.in index 26a1aa7807..82e5a235bd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -50,7 +50,7 @@ LDSHARED = @LIBRUBY_LDSHARED@ DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@ SOLIBS = @SOLIBS@ MAINLIBS = @MAINLIBS@ -MINIOBJS = @MINIOBJS@ prelude.$(OBJEXT) +MINIOBJS = @MINIOBJS@ miniprelude.$(OBJEXT) RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@ RUBY_SO_NAME=@RUBY_SO_NAME@ diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index d3ba0cadd0..c79e586402 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -186,7 +186,7 @@ ASMEXT = asm INSTALLED_LIST= .installed.list WINMAINOBJ = winmain.$(OBJEXT) -MINIOBJS = dmydln.$(OBJEXT) prelude.$(OBJEXT) +MINIOBJS = dmydln.$(OBJEXT) miniprelude.$(OBJEXT) arch_hdrdir = $(EXTOUT)/include/$(arch) hdrdir = $(srcdir)/include @@ -81,7 +81,7 @@ COMMONOBJS = array.$(OBJEXT) \ $(MISSING) OBJS = dln.$(OBJEXT) \ - ext_prelude.$(OBJEXT) \ + prelude.$(OBJEXT) \ $(COMMONOBJS) SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \ @@ -592,8 +592,8 @@ blockinlining.$(OBJEXT): {$(VPATH)}blockinlining.c \ {$(VPATH)}debug.h {$(VPATH)}vm_opts.h \ {$(VPATH)}thread_$(THREAD_MODEL).h id.$(OBJEXT): {$(VPATH)}id.c {$(VPATH)}ruby.h +miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c {$(VPATH)}ruby.h {$(VPATH)}vm_core.h prelude.$(OBJEXT): {$(VPATH)}prelude.c {$(VPATH)}ruby.h {$(VPATH)}vm_core.h -ext_prelude.$(OBJEXT): {$(VPATH)}ext_prelude.c {$(VPATH)}ruby.h {$(VPATH)}vm_core.h ascii.$(OBJEXT): {$(VPATH)}ascii.c {$(VPATH)}regenc.h \ {$(VPATH)}oniguruma.h {$(VPATH)}config.h {$(VPATH)}defines.h @@ -636,13 +636,13 @@ incs: $(INSNS) node_name.inc node_name.inc: {$(VPATH)}node.h $(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@ -prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb +miniprelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(BASERUBY) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@ -ext_prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/gem_prelude.rb $(RBCONFIG) +prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/gem_prelude.rb $(RBCONFIG) $(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/gem_prelude.rb $@ -prereq: incs {$(VPATH)}prelude.c +prereq: incs {$(VPATH)}miniprelude.c docs: $(BASERUBY) -I$(srcdir) $(srcdir)/tool/makedocs.rb $(INSNS2VMOPT) diff --git a/win32/Makefile.sub b/win32/Makefile.sub index fb15e92652..50dcc09aea 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -198,7 +198,7 @@ ASMEXT = asm INSTALLED_LIST= .installed.list WINMAINOBJ = winmain.$(OBJEXT) -MINIOBJS = dmydln.$(OBJEXT) prelude.$(OBJEXT) +MINIOBJS = dmydln.$(OBJEXT) miniprelude.$(OBJEXT) arch_hdrdir = $(EXTOUT)/include/$(arch) hdrdir = $(srcdir)/include |