X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=c0333fa988f3a267c33861d2812341e4a68d7381;hb=b5cee14f163b48d8da1bded7120dee1eb6323b72;hp=86fca1071054d3c4e304f8497015237748bc7f5d;hpb=71a3bc5e72fdcf2a51c3d32f10b8248c0ac5399c;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index 86fca10..c0333fa 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -25,12 +25,11 @@ all: check
 clean:
 	rm -f mkws-error.png mkws-error.html 
 	rm -f images/*.png
+	${MAKE} -C./widgets $@
 
 distclean: clean clean-tmp clean-error
 	rm -rf node_modules
-	rm -f ${TMP_DIR}/jasmine-dev*.conf
 	rm -f libexec
-	make -C./widgets $@
 
 clean-error:
 	rm -f mkws-error.png.* mkws-error.html.*
@@ -41,9 +40,9 @@ clean-tmp:
 	touch ${TMP_DIR}/.gitkeep
 
 mkws-complete-syntax-check:
-	${MAKE} -C../tools/htdocs mkws-complete.min.js
+	${MAKE} -C../src ../tools/htdocs/mkws-complete.min.js
 
-check: mkws-complete-syntax-check
+check check-js: mkws-complete-syntax-check
 	@if [ ! -e node_modules ]; then echo "please run first: make node-modules"; exit 1; fi 
 	${JASMINE_NODE} --noColor --captureExceptions --forceexit ./spec
 
@@ -83,7 +82,7 @@ screenshot-indexdata:
 	ls -l ${IMAGES}
 
 screenshots:
-	make -C ./widgets $@
+	${MAKE} -C ./widgets $@
 
 jsbeautifier jsb indent:
 	for i in package.json ./spec*/*.js ./js/*.js ./phantom/*.js; do \
@@ -126,6 +125,7 @@ help:
 	@echo "DEBUG=0 APACHE_PORT=5050 make -s phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_PATH=${PHANTOMJS_PATH}"
 	@echo "DEBUG=2 make phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_URL=${PHANTOMJS_URL}"
 	@echo ""
+	@echo "make APACHE_PORT=5050 apache-start"
 	@echo "make phantomjs-all"
 	@echo ""