Merge remote branch 'origin/MKWS-229'

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

diff --git a/Makefile b/Makefile
index 8064965..dcd5995 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,27 +2,27 @@
 
 all:
        ${MAKE} -C./tools/htdocs $@
-
-pz2api-git-checkout:
-       ${MAKE} -C./tools/htdocs $@
+       ${MAKE} -C./doc $@
 
 clean distclean:
        ${MAKE} -C./tools/htdocs $@
+       ${MAKE} -C./doc $@
        ${MAKE} -C./examples/htdocs $@
        ${MAKE} -C./test $@
 
 check-js:
        ${MAKE} -C./test check
 
+phantomjs p:
+       ${MAKE} -C./test $@
+
 # must be called once after GIT checkout
-setup: pz2api-git-checkout
-       ${MAKE} -C./tools/htdocs mkws-js-min
-       ${MAKE} -C./examples/htdocs jasmine-links
+setup: 
        ${MAKE} -C./test node-modules
 
-check: setup check-js
+check: setup check-js phantomjs
 
 help:
        @echo "make [ all | setup | clean | distclean ]"
-       @echo "     [ pz2api-git-checkout | check-js ]"
+       @echo "     [ check | check-js | phantomjs ]"