X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=Makefile;h=a105790a5a7ff436deaecfc174abef260d100fdb;hp=e3dea3aeed4328147f5cb94feb7dd2c95b94d242;hb=b2f105ea2c3a05d605daf133da207220b7f639b0;hpb=23fbc9b73a9f01cb8480604964e6fcf0e1c9307b

diff --git a/Makefile b/Makefile
index e3dea3a..a105790 100644
--- a/Makefile
+++ b/Makefile
@@ -3,32 +3,31 @@
 # 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./test node-modules
+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
 
-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"