X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=Makefile;h=fd60d853fe99a948eecfd43dccb67dbb1da91bec;hb=2efff48c82f8fa48cb5e2fbcaf67213cc7488464;hp=4bb0cc21cbf875f93157a86dbb94355231436a61;hpb=7969d3285f1c7b29c5f835044f0235691910a561;p=mkws-moved-to-github.git

diff --git a/Makefile b/Makefile
index 4bb0cc2..fd60d85 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,15 @@
 # Copyright (c) 2013-2014 IndexData 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./src $@
-	${MAKE} -C./doc $@
+all: setup
+	${MAKE} -C./test node-modules
+	${MAKE} -C./tools/htdocs $@
+	${MAKE} -C./doc install
 
 clean distclean:
-	${MAKE} -C./src $@
+	${MAKE} -C./tools/htdocs $@
 	${MAKE} -C./doc $@
 	${MAKE} -C./examples/htdocs $@
 	${MAKE} -C./test $@
@@ -13,11 +17,11 @@ clean distclean:
 check-js:
 	${MAKE} -C./test check
 
-phantomjs p:
+phantomjs p p-all phantomjs-all jsb:
 	${MAKE} -C./test $@
 
 # must be called once after GIT checkout
-setup:	
+setup:
 	${MAKE} -C./test node-modules
 
 check: setup check-js phantomjs
@@ -25,4 +29,6 @@ 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"