diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-03 11:40:11 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-03 11:40:11 +0000 |
| commit | c2109f71a6ffde319d845558c07e6eac803aa21f (patch) | |
| tree | f327cbc644bb97a0992fd9299c5662eb72bb73e7 /common.mk | |
| parent | 5002cf082f9f621c055cb77ff90658f74f5ff3b5 (diff) | |
merges r22592 from trunk into ruby_1_9_1.
--
* common.mk (main): split from exts and makes main program after
building exts with miniruby, to get rid of overwriting running
program. [ruby-core:22339]
* Makefile.in, win32/Makefile.sub (RUNCMD, MKMAIN_CMD): macros to
run script file.
* ext/extmk.rb (parse_args): added --command-output option which
creates script file to make main program.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22737 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -122,9 +122,16 @@ BOOTSTRAPRUBY = $(BASERUBY) COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb -all: encs exts -exts: $(MKFILES) incs $(PREP) $(RBCONFIG) $(LIBRUBY) - @$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) +all: encs exts main + +main: exts + @$(RUNCMD) $(MKMAIN_CMD) MAKE=$(MAKE) + +exts: $(MKMAIN_CMD) + +$(MKMAIN_CMD): $(MKFILES) incs $(PREP) $(RBCONFIG) $(LIBRUBY) + @$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$@ $(EXTMK_ARGS) + prog: $(PROGRAM) $(WPROGRAM) loadpath: $(PREP) |