X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=Makefile;h=a105790a5a7ff436deaecfc174abef260d100fdb;hp=0bb0e95cfb59f4e9627edcd8d6c7a33436568a63;hb=42568f5dad10d96c73a746b927e40341fa7087cc;hpb=259678db25effef592344ba29a4290e5d21b10aa

diff --git a/Makefile b/Makefile
index 0bb0e95..a105790 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,7 @@
 # You need node.js to build MKWS. On caliban, get it using:
 # export PATH=$PATH:/home/indexdata/node/node-v0.10.32-linux-x64/bin
 
-all:
-	${MAKE} -C./test node-modules
+all: setup
 	${MAKE} -C./src
 	${MAKE} -C./doc
 	${MAKE} -C./examples/htdocs
@@ -15,21 +14,20 @@ clean distclean:
 	${MAKE} -C./examples/htdocs $@
 	${MAKE} -C./test $@
 
-check-js:
-	${MAKE} -C./test check
-
-phantomjs p p-all phantomjs-all jsb:
-	${MAKE} -C./test $@
+check: setup check-js phantomjs
 
-# must be called once after GIT checkout
 setup:
 	${MAKE} -C./test node-modules
 
-check: setup check-js phantomjs
+check-js:
+	${MAKE} -C./test $@
+
+phantomjs p p-all phantomjs-all jsb:
+	${MAKE} -C./test $@
 
 help:
 	@echo "make [ all | setup | clean | distclean ]"
 	@echo "     [ check | check-js | phantomjs ]"
 	@echo ""
-	@echo "If 'make check' timeout is too short, extend with: make check PHANTOMJS_TIMEOUT=40"
+	@echo "If 'make check' timeout is too short, extend with: make check PHANTOMJS_TIMEOUT=120"