X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=Makefile;h=a105790a5a7ff436deaecfc174abef260d100fdb;hp=7911392c0e7ec9c984b665809565a53cf88e86bc;hb=8e454e2925f75712eb67d0cd9a86cfc84e5c5605;hpb=184ab14937ca310e83cc36261753babb47b18af1

diff --git a/Makefile b/Makefile
index 7911392..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,20 +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
 
 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"