From: Wolfram Schneider Date: Wed, 2 Jul 2014 08:49:06 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws X-Git-Tag: 1.0.0~458^2~5 X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=0c9d8d9aba4c3b78fdb7b3de5304ab8cdebdf0e7;hp=ca57eb37eb18afdf6c2abd64d60dbee32a4be695 Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws --- diff --git a/Makefile b/Makefile index 9504c36..4bb0cc2 100644 --- a/Makefile +++ b/Makefile @@ -18,12 +18,9 @@ phantomjs p: # must be called once after GIT checkout setup: -#why? ${MAKE} -C./tools/htdocs mkws-js-min ${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 ]"