X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=Makefile;h=a105790a5a7ff436deaecfc174abef260d100fdb;hp=b3e4fab2ba2535657f7e4560c2d4b888f104bec1;hb=6867e9bed4f7cf9c211e5efeaa0b6f116a35c688;hpb=a2334d36837bb8b19a9795dd824074c5a8b3f46d

diff --git a/Makefile b/Makefile
index b3e4fab..a105790 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 $@
+all: setup
+	${MAKE} -C./src
+	${MAKE} -C./doc
+	${MAKE} -C./examples/htdocs
 
 clean distclean:
 	${MAKE} -C./src $@
@@ -10,21 +14,20 @@ clean distclean:
 	${MAKE} -C./examples/htdocs $@
 	${MAKE} -C./test $@
 
-check-js:
-	${MAKE} -C./test check
-
-phantomjs:
-	${MAKE} -C./test $@
+check: setup check-js phantomjs
 
-# must be called once after GIT checkout
-setup:	
-#why?	${MAKE} -C./tools/htdocs mkws-js-min
-	${MAKE} -C./examples/htdocs jasmine-links
+setup:
 	${MAKE} -C./test node-modules
 
-check: setup check-js
+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=120"