X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=Makefile;h=a105790a5a7ff436deaecfc174abef260d100fdb;hp=26c0ca4e28f29c4dcb2c451b98786e8c499c25b2;hb=3954594bfad6247bd4bbe577268d2b7cd18fa685;hpb=a068570888ee5ada50611617c2e0d2428909fb0c

diff --git a/Makefile b/Makefile
index 26c0ca4..a105790 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,33 @@
-# 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
 
-**default**:
-	(cd tools/htdocs; $(MAKE))
+all: setup
+	${MAKE} -C./src
+	${MAKE} -C./doc
+	${MAKE} -C./examples/htdocs
 
-clean distclean all pz2api-git-checkout:
-	${MAKE} -C./tools/htdocs $@
+clean distclean:
+	${MAKE} -C./src $@
+	${MAKE} -C./doc $@
+	${MAKE} -C./examples/htdocs $@
+	${MAKE} -C./test $@
+
+check: setup check-js phantomjs
+
+setup:
+	${MAKE} -C./test node-modules
 
 check-js:
-	${MAKE} -C./test check
+	${MAKE} -C./test $@
 
-check: distclean all
+phantomjs p p-all phantomjs-all jsb:
+	${MAKE} -C./test $@
 
 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=120"
+