X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=Makefile;h=e3dea3aeed4328147f5cb94feb7dd2c95b94d242;hp=e37daa0cffd052df3f3a60ca11658f6786595048;hb=23fbc9b73a9f01cb8480604964e6fcf0e1c9307b;hpb=6acb2a89222c90a55a9e051a386450452f1873cf

diff --git a/Makefile b/Makefile
index e37daa0..e3dea3a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,15 @@
-# 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 $@
+	${MAKE} -C./tools/htdocs $@
 	${MAKE} -C./doc $@
 	${MAKE} -C./examples/htdocs $@
 	${MAKE} -C./test $@
@@ -13,17 +17,18 @@ clean distclean:
 check-js:
 	${MAKE} -C./test check
 
-phantomjs:
+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
+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"