Make sure nqp-m is built before trying to build MoarVM files

This allows us to build nqp-js in parallel via the -j option

Author: hoelzro

tools/build/Makefile-JS.in

@@ -4,13 +4,13 @@ JS_STAGE1 = $(JS_BUILD_DIR)/stage1
 JS_STAGE2 = $(JS_BUILD_DIR)/stage2
 JS_NQP = ./$(M_RUNNER)$(BAT)
 js-runner-default: js-all
-$(JS_STAGE1)/QAST/Compiler.moarvm: src/vm/js/QAST/Compiler.nqp
+$(JS_STAGE1)/QAST/Compiler.moarvm: m-all src/vm/js/QAST/Compiler.nqp
 	$(MKPATH) $(JS_STAGE1)/QAST
 	$(JS_NQP) --module-path=$(JS_STAGE1) --target=mbc --output=$(JS_STAGE1)/QAST/Compiler.moarvm src/vm/js/QAST/Compiler.nqp
 	$(MKPATH) gen/moar/stage2/QAST
 	$(CP) $(JS_STAGE1)/QAST/Compiler.moarvm gen/moar/stage2/QAST/Compiler.moarvm
 
-$(JS_STAGE1)/HLL/Backend.moarvm: src/vm/js/HLL/Backend.nqp $(JS_STAGE1)/QAST/Compiler.moarvm
+$(JS_STAGE1)/HLL/Backend.moarvm: m-all src/vm/js/HLL/Backend.nqp $(JS_STAGE1)/QAST/Compiler.moarvm
 	$(MKPATH) $(JS_STAGE1)/HLL
 	$(JS_NQP) --module-path=$(JS_STAGE1) --target=mbc --output=$(JS_STAGE1)/HLL/Backend.moarvm src/vm/js/HLL/Backend.nqp
 	$(MKPATH) gen/moar/stage2/HLL
@@ -22,7 +22,7 @@ $(JS_STAGE2)/$(NQP_MO_COMBINED): $(NQP_MO_SOURCES)
 
 	$(PERL) tools/build/gen-cat.pl js $(NQP_MO_SOURCES)  > $(JS_STAGE2)/$(NQP_MO_COMBINED)
 
-$(JS_STAGE2)/nqpmo.moarvm: $(JS_STAGE1_COMPILER) $(JS_STAGE2)/$(NQP_MO_COMBINED)
+$(JS_STAGE2)/nqpmo.moarvm: m-all $(JS_STAGE1_COMPILER) $(JS_STAGE2)/$(NQP_MO_COMBINED)
 	$(MKPATH) $(JS_STAGE2)
 	$(JS_NQP) --module-path gen/js/stage1 src/vm/js/bin/cross-compile.nqp --setting=NULL --target=mbc --output $(JS_STAGE2)/nqpmo.moarvm $(JS_STAGE2)/$(NQP_MO_COMBINED) > node_modules/nqpmo.js
 
@@ -31,7 +31,7 @@ $(JS_STAGE2)/$(CORE_SETTING_COMBINED).nqp: $(CORE_SETTING_SOURCES)
 
 	$(PERL) tools/build/gen-cat.pl js $(CORE_SETTING_SOURCES)  > $(JS_STAGE2)/$(CORE_SETTING_COMBINED).nqp
 
-$(JS_STAGE2)/NQPCORE.setting.moarvm: $(JS_STAGE1_COMPILER) $(JS_STAGE2)/$(CORE_SETTING_COMBINED).nqp $(JS_STAGE2)/nqpmo.moarvm
+$(JS_STAGE2)/NQPCORE.setting.moarvm: m-all $(JS_STAGE1_COMPILER) $(JS_STAGE2)/$(CORE_SETTING_COMBINED).nqp $(JS_STAGE2)/nqpmo.moarvm
 	$(MKPATH) $(JS_STAGE2)
 	$(JS_NQP) --module-path gen/js/stage1 src/vm/js/bin/cross-compile.nqp --setting=NULL --target=mbc --output $(JS_STAGE2)/NQPCORE.setting.moarvm $(JS_STAGE2)/$(CORE_SETTING_COMBINED).nqp > node_modules/NQPCORE.setting.js
 
@@ -40,7 +40,7 @@ $(JS_STAGE2)/$(QASTNODE_COMBINED): $(QASTNODE_SOURCES)
 
 	$(PERL) tools/build/gen-cat.pl js $(QASTNODE_SOURCES)  > $(JS_STAGE2)/$(QASTNODE_COMBINED)
 
-$(JS_STAGE2)/QASTNode.moarvm: $(JS_STAGE1_COMPILER) $(JS_STAGE2)/$(QASTNODE_COMBINED) $(JS_STAGE2)/NQPCORE.setting.moarvm
+$(JS_STAGE2)/QASTNode.moarvm: m-all $(JS_STAGE1_COMPILER) $(JS_STAGE2)/$(QASTNODE_COMBINED) $(JS_STAGE2)/NQPCORE.setting.moarvm
 	$(MKPATH) $(JS_STAGE2)
 	$(JS_NQP) --module-path gen/js/stage1 src/vm/js/bin/cross-compile.nqp --setting=NQPCORE --target=mbc --output $(JS_STAGE2)/QASTNode.moarvm $(JS_STAGE2)/$(QASTNODE_COMBINED) > node_modules/QASTNode.js
 
@@ -49,7 +49,7 @@ $(JS_STAGE2)/$(QREGEX_COMBINED): $(QREGEX_SOURCES)
 
 	$(PERL) tools/build/gen-cat.pl js $(QREGEX_SOURCES)  > $(JS_STAGE2)/$(QREGEX_COMBINED)
 
-$(JS_STAGE2)/QRegex.moarvm: $(JS_STAGE1_COMPILER) $(JS_STAGE2)/$(QREGEX_COMBINED) $(JS_STAGE2)/NQPCORE.setting.moarvm $(JS_STAGE2)/QASTNode.moarvm
+$(JS_STAGE2)/QRegex.moarvm: m-all $(JS_STAGE1_COMPILER) $(JS_STAGE2)/$(QREGEX_COMBINED) $(JS_STAGE2)/NQPCORE.setting.moarvm $(JS_STAGE2)/QASTNode.moarvm
 	$(MKPATH) $(JS_STAGE2)
 	$(JS_NQP) --module-path gen/js/stage1 src/vm/js/bin/cross-compile.nqp --setting=NQPCORE --target=mbc --output $(JS_STAGE2)/QRegex.moarvm $(JS_STAGE2)/$(QREGEX_COMBINED) > node_modules/QRegex.js