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

diff --git a/Makefile b/Makefile
index 4fe1fe5..9504c36 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +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:
+	${MAKE} -C./src $@
+	${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:	
+#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 ]"
+	@echo "make [ all | setup | clean | distclean ]"
+	@echo "     [ check | check-js | phantomjs ]"
+