X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=Makefile;h=9504c3641d404be6e58182048d405cd9ea4e495e;hp=9c558051b6607de7969bc5c359df1b1f5803bed8;hb=5d307bd92d2fa1264bdee98fd6d10925f91e17ab;hpb=0d118a9fada6dd3f9f1fcc77063b0cbd5e6823c6

diff --git a/Makefile b/Makefile
index 9c55805..9504c36 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,31 @@
 # Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
 
-all clean:
-	${MAKE} -C./tools/htdocs $@
-	${MAKE} -C./examples/htdocs $@
+all:
+	${MAKE} -C./src $@
+	${MAKE} -C./doc $@
 
-pz2api-git-checkout distclean:
-	${MAKE} -C./tools/htdocs $@
+clean distclean:
+	${MAKE} -C./src $@
+	${MAKE} -C./doc $@
+	${MAKE} -C./examples/htdocs $@
+	${MAKE} -C./test $@
 
 check-js:
 	${MAKE} -C./test check
 
-setup:	pz2api-git-checkout
-	${MAKE} -C./tools/htdocs mkws-js-min
-	${MAKE} -C./examples/htdocs jasmine-links
+phantomjs p:
+	${MAKE} -C./test $@
+
+# must be called once after GIT checkout
+setup:	
+#why?	${MAKE} -C./tools/htdocs mkws-js-min
 	${MAKE} -C./test node-modules
 
-check: distclean all
+check: setup check-js
+	@echo ""
+	@echo "To run jasmine regression tests, type: make phantomjs"
 
 help:
-	@echo "make [ all | setup | clean ]"
-	@echo "     [ pz2api-git-checkout | check-js ]"
+	@echo "make [ all | setup | clean | distclean ]"
+	@echo "     [ check | check-js | phantomjs ]"