summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-03-08 00:33:05 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-03-08 00:33:05 +0000
commitacd036bcdc2ce9d8750294e8932b0feb119e4917 (patch)
tree9173a72e72f18f670d4df22ec19f648ad9e55824 /common.mk
parent15f0e53a0698b5b7abd003f9cf305a456a98babc (diff)
* common.mk (configure-ext, build-ext), ext/extmk.rb (extmake):
support paralell-make under ext. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31059 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk13
1 files changed, 11 insertions, 2 deletions
diff --git a/common.mk b/common.mk
index 14a5b52311..5672500974 100644
--- a/common.mk
+++ b/common.mk
@@ -140,7 +140,7 @@ COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb
all: showflags main docs
main: showflags encs exts
- @$(RUNCMD) $(MKMAIN_CMD) $(MAKE)
+ @$(NULLCMD)
.PHONY: showflags
exts enc trans: showflags
@@ -162,7 +162,16 @@ showconfig:
"$(configure_args)" \
$(MESSAGE_END)
-exts: $(MKMAIN_CMD)
+exts: build-ext
+
+EXTS_MK = exts.mk
+$(EXTS_MK): $(MKFILES) incs $(PREP) $(RBCONFIG) $(LIBRUBY)
+ @$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$(EXTS_MK) $(EXTMK_ARGS) configure
+
+configure-ext: $(EXTS_MK)
+
+build-ext: $(EXTS_MK)
+ $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS)
$(MKMAIN_CMD): $(MKFILES) incs $(PREP) $(RBCONFIG) $(LIBRUBY)
@$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$@ $(EXTMK_ARGS)