X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=Makefile;h=e3dea3aeed4328147f5cb94feb7dd2c95b94d242;hb=23fbc9b73a9f01cb8480604964e6fcf0e1c9307b;hp=62ced87b0cd517001900a8f937c9b4408b637e2d;hpb=8666572efcb1b0377e4234682f3927f04c69481a;p=mkws-moved-to-github.git

diff --git a/Makefile b/Makefile
index 62ced87..e3dea3a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,34 @@
-# Copyright (c) 2013 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 clean:
-	${MAKE} -C./tools/htdocs $@
-	${MAKE} -C./examples/htdocs $@
+all:
+	${MAKE} -C./test node-modules
+	${MAKE} -C./src
+	${MAKE} -C./doc
 
-pz2api-git-checkout distclean:
+clean distclean:
 	${MAKE} -C./tools/htdocs $@
+	${MAKE} -C./doc $@
+	${MAKE} -C./examples/htdocs $@
+	${MAKE} -C./test $@
 
 check-js:
 	${MAKE} -C./test check
 
-check: distclean all
+phantomjs p p-all phantomjs-all jsb:
+	${MAKE} -C./test $@
+
+# must be called once after GIT checkout
+setup:
+	${MAKE} -C./test node-modules
+
+check: setup check-js phantomjs
 
 help:
-	@echo "make [ all | clean | pz2api-git-checkout | check-js ]"
+	@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"
+