X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=Makefile;h=a105790a5a7ff436deaecfc174abef260d100fdb;hp=ebcb40d9d596e0d56415f4f4675c10c5b8a23ef1;hb=9468d3f02993007bef45453a143a847db14cb6cf;hpb=788c90d9fac4106b1e8e66e9a2039ad0dc9a8bda

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