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

diff --git a/Makefile b/Makefile
index b3e4fab..ebcb40d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 # Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
 
 all:
-	${MAKE} -C./src $@
-	${MAKE} -C./doc $@
+	${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,18 +13,17 @@ clean distclean:
 check-js:
 	${MAKE} -C./test check
 
-phantomjs:
+phantomjs p p-all phantomjs-all jsb:
 	${MAKE} -C./test $@
 
 # must be called once after GIT checkout
-setup:	
-#why?	${MAKE} -C./tools/htdocs mkws-js-min
-	${MAKE} -C./examples/htdocs jasmine-links
+setup: all
 	${MAKE} -C./test node-modules
 
-check: setup check-js
+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"