diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-10 09:22:59 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-10 09:22:59 +0000 |
| commit | 6dfca4d3511700b0659b867496beca1b4f8fb383 (patch) | |
| tree | 2d8bfa467abc38cbeccfb504836dfe712784c190 /common.mk | |
| parent | c216c3e03f684ce5d1f9b5b1bed70df0d89e78cb (diff) | |
| download | ruby-6dfca4d3511700b0659b867496beca1b4f8fb383.tar.gz ruby-6dfca4d3511700b0659b867496beca1b4f8fb383.tar.xz ruby-6dfca4d3511700b0659b867496beca1b4f8fb383.zip | |
* gem_prelude.rb: new file for gem libraries. currently empty.
* common.mk: generate ext_prelude.c by prelude.rb and gem_prelude.rb.
ruby (not miniruby) is linked with ext_prelude.o instead of prelude.o.
* inits.c (rb_call_inits): don't call Init_prelude.
* ruby.c: support --disable-gems option.
(ruby_init_gems): new function to define Gem::Enable and
invoke Init_prelude.
(process_options): call ruby_init_gems just after
ruby_init_loadpath.
* tool/compile_prelude.rb: support multiple files.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -15,7 +15,7 @@ RDOCOUT = $(EXTOUT)/rdoc DMYEXT = dmyext.$(OBJEXT) MAINOBJ = main.$(OBJEXT) -EXTOBJS = +EXTOBJS = ext_prelude.$(OBJEXT) DLDOBJS = $(DMYEXT) ENCOBJS = ascii.$(OBJEXT) \ @@ -78,7 +78,6 @@ OBJS = array.$(OBJEXT) \ thread.$(OBJEXT) \ cont.$(OBJEXT) \ id.$(OBJEXT) \ - prelude.$(OBJEXT) \ $(ENCOBJS) \ $(MISSING) @@ -586,6 +585,7 @@ blockinlining.$(OBJEXT): {$(VPATH)}blockinlining.c \ {$(VPATH)}thread_$(THREAD_MODEL).h id.$(OBJEXT): {$(VPATH)}id.c {$(VPATH)}ruby.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 @@ -631,6 +631,9 @@ node_name.inc: {$(VPATH)}node.h prelude.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) + $(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/gem_prelude.rb $@ + prereq: incs {$(VPATH)}prelude.c docs: |