X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=Makefile;h=fd60d853fe99a948eecfd43dccb67dbb1da91bec;hp=6d6441f4c29f8bf4bf021d3862bb456180a23c5d;hb=2a819e540b0395b557e807801be8f9998b14de1b;hpb=62d9f6628a30dc7540071108473b0ea94e58a39e

diff --git a/Makefile b/Makefile
index 6d6441f..fd60d85 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,12 @@
 # Copyright (c) 2013-2014 IndexData 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:
+all: setup
+	${MAKE} -C./test node-modules
 	${MAKE} -C./tools/htdocs $@
-	${MAKE} -C./doc $@
+	${MAKE} -C./doc install
 
 clean distclean:
 	${MAKE} -C./tools/htdocs $@
@@ -13,18 +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:	
+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"