X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=Makefile;h=9504c3641d404be6e58182048d405cd9ea4e495e;hp=1b1fe3b7d76141e8f60930f55f6cf6c9a2648728;hb=e6fc2ba40e38fd0d2a746082be32d2578460174c;hpb=6e1edd743e5693aa1596b413dcc26ba21441dd4f

diff --git a/Makefile b/Makefile
index 1b1fe3b..9504c36 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,31 @@
-# Copyright (c) 2013 IndexData ApS. http://indexdata.com
+# Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
 
-**default**:
-	(cd tools/htdocs; $(MAKE))
+all:
+	${MAKE} -C./src $@
+	${MAKE} -C./doc $@
 
-clean distclean all pz2api-git-checkout:
-	${MAKE} -C./tools/htdocs $@
+clean distclean:
+	${MAKE} -C./src $@
+	${MAKE} -C./doc $@
+	${MAKE} -C./examples/htdocs $@
+	${MAKE} -C./test $@
 
-check: distclean all
+check-js:
+	${MAKE} -C./test check
+
+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: setup check-js
+	@echo ""
+	@echo "To run jasmine regression tests, type: make phantomjs"
 
 help:
-	@echo "make [ all | clean | pz2api-git-checkout ]"
+	@echo "make [ all | setup | clean | distclean ]"
+	@echo "     [ check | check-js | phantomjs ]"
+