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

diff --git a/Makefile b/Makefile
index c88ca4b..9e91192 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,19 @@ 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
+	${MAKE} all
 
-check: setup check-js
-	@echo ""
-	@echo "To run jasmine regression tests, type: make phantomjs"
+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"