X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=Makefile;h=9e911920712b1a0885bd0c2a5cf9454efe7f4578;hp=e37daa0cffd052df3f3a60ca11658f6786595048;hb=3b37b7798cab326907f2e48223371ff1737b94fb;hpb=6acb2a89222c90a55a9e051a386450452f1873cf

diff --git a/Makefile b/Makefile
index e37daa0..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,17 +13,19 @@ 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
+setup:
 	${MAKE} -C./test node-modules
+	${MAKE} all
 
-check: setup check-js
+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"