X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=Makefile;h=cb4d8f6011faaadaeb6c64be84a3cd41a29ac4ba;hb=139af8208d6f758a84926fb5ba349364698c6747;hp=e80e8e374de1f25bdcdc32d537084e77d0eb357a;hpb=60afd17f51bc15184a7d59f29549318c90a7242a;p=mkws-moved-to-github.git

diff --git a/Makefile b/Makefile
index e80e8e3..cb4d8f6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,33 @@
-# 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 install
+all: setup
+	${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 $@
 
+check: setup check-js phantomjs
+
+setup:
+	${MAKE} -C./test node-modules
+
 check-js:
-	${MAKE} -C./test check
+	${MAKE} -C./test $@
 
 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 | setup | clean | distclean ]"
 	@echo "     [ check | check-js | phantomjs ]"
+	@echo ""
+	@echo "If 'make check' timeout is too short, extend with: make check PHANTOMJS_TIMEOUT=40"