X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=Makefile;h=a105790a5a7ff436deaecfc174abef260d100fdb;hp=9e911920712b1a0885bd0c2a5cf9454efe7f4578;hb=cf87e89209beb9e0c89bc6bf719f219746a71eb2;hpb=10fc761a0a21fb37a18b67e57c209475be5ba8cd

diff --git a/Makefile b/Makefile
index 9e91192..a105790 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +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-js:
-	${MAKE} -C./test check
-
-phantomjs p p-all phantomjs-all jsb:
-	${MAKE} -C./test $@
+check: setup check-js phantomjs
 
-# must be called once after GIT checkout
 setup:
 	${MAKE} -C./test node-modules
-	${MAKE} all
 
-check: setup check-js phantomjs
+check-js:
+	${MAKE} -C./test $@
+
+phantomjs p p-all phantomjs-all jsb:
+	${MAKE} -C./test $@
 
 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"
+	@echo "If 'make check' timeout is too short, extend with: make check PHANTOMJS_TIMEOUT=120"