"all" target depends on "setup", not the other way around.

[mkws-moved-to-github.git] / Makefile

diff --git a/Makefile b/Makefile
index 6d6441f..869fc26 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
 # Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
 
-all:
+all: setup
+       ${MAKE} -C./test node-modules
        ${MAKE} -C./tools/htdocs $@
-       ${MAKE} -C./doc $@
+       ${MAKE} -C./doc install
 
 clean distclean:
        ${MAKE} -C./tools/htdocs $@
@@ -13,18 +14,18 @@ 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
-       @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"