Update comment to suggest longer timeout in tests.

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

diff --git a/Makefile b/Makefile
index 362f874..a105790 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,33 @@
-# Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
+# Copyright (c) 2013-2014 Index Data ApS. http://indexdata.com
+#
+# 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 clean:
-       ${MAKE} -C./tools/htdocs $@
+all: setup
+       ${MAKE} -C./src
+       ${MAKE} -C./doc
+       ${MAKE} -C./examples/htdocs
+
+clean distclean:
+       ${MAKE} -C./src $@
+       ${MAKE} -C./doc $@
        ${MAKE} -C./examples/htdocs $@
+       ${MAKE} -C./test $@
 
-pz2api-git-checkout distclean:
-       ${MAKE} -C./tools/htdocs $@
+check: setup check-js phantomjs
 
-check-js:
-       ${MAKE} -C./test check
+setup:
+       ${MAKE} -C./test node-modules
 
-setup: pz2api-git-checkout
-       ${MAKE} -C./tools/htdocs mkws-js-min
-       ${MAKE} -C./examples/htdocs jasmine-links
+check-js:
+       ${MAKE} -C./test $@
 
-check: distclean all
+phantomjs p p-all phantomjs-all jsb:
+       ${MAKE} -C./test $@
 
 help:
-       @echo "make [ all | setup | clean ]"
-       @echo "     [ pz2api-git-checkout | check-js ]"
+       @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=120"