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

diff --git a/Makefile b/Makefile
index 6d6441f..7911392 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,16 @@
-# 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./tools/htdocs $@
-	${MAKE} -C./doc $@
+	${MAKE} -C./test node-modules
+	${MAKE} -C./src
+	${MAKE} -C./doc
+	${MAKE} -C./examples/htdocs
 
 clean distclean:
-	${MAKE} -C./tools/htdocs $@
+	${MAKE} -C./src $@
 	${MAKE} -C./doc $@
 	${MAKE} -C./examples/htdocs $@
 	${MAKE} -C./test $@
@@ -13,18 +18,17 @@ 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"