X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=Makefile;h=8d7314554f09bbbec7a45420034d6ff4c3852a6b;hp=9504c3641d404be6e58182048d405cd9ea4e495e;hb=450ecc96e4916e5960eb5400a5d0315ebfd070c4;hpb=5d307bd92d2fa1264bdee98fd6d10925f91e17ab

diff --git a/Makefile b/Makefile
index 9504c36..8d73145 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,12 @@
-# Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
+# Copyright (c) 2013-2014 Index Data ApS. http://indexdata.com
+#
+# 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./src $@
-	${MAKE} -C./doc $@
+	${MAKE} -C./test node-modules
+	${MAKE} -C./src
+	${MAKE} -C./doc
 
 clean distclean:
 	${MAKE} -C./src $@
@@ -13,19 +17,18 @@ clean distclean:
 check-js:
 	${MAKE} -C./test check
 
-phantomjs p:
+phantomjs p p-all phantomjs-all jsb:
 	${MAKE} -C./test $@
 
 # must be called once after GIT checkout
-setup:	
-#why?	${MAKE} -C./tools/htdocs mkws-js-min
+setup:
 	${MAKE} -C./test node-modules
 
-check: setup check-js
-	@echo ""
-	@echo "To run jasmine regression tests, type: make phantomjs"
+check: setup check-js phantomjs
 
 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"