projects
/
mkws-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add mkws-templates to Mike's playground.
[mkws-moved-to-github.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
6d6441f
..
9e91192
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-2,7
+2,7
@@
all:
${MAKE} -C./tools/htdocs $@
all:
${MAKE} -C./tools/htdocs $@
- ${MAKE} -C./doc $@
+ ${MAKE} -C./doc install
clean distclean:
${MAKE} -C./tools/htdocs $@
clean distclean:
${MAKE} -C./tools/htdocs $@
@@
-13,18
+13,19
@@
clean distclean:
check-js:
${MAKE} -C./test check
check-js:
${MAKE} -C./test check
-phantomjs p:
+phantomjs p p-all phantomjs-all jsb:
${MAKE} -C./test $@
# must be called once after GIT checkout
${MAKE} -C./test $@
# must be called once after GIT checkout
-setup:
+setup:
${MAKE} -C./test node-modules
${MAKE} -C./test node-modules
+ ${MAKE} all
-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 ]"
@echo " [ check | check-js | phantomjs ]"
help:
@echo "make [ all | setup | clean | distclean ]"
@echo " [ check | check-js | phantomjs ]"
+ @echo ""
+ @echo "If 'make check' timeout is too short, extend with: make check PHANTOMJS_TIMEOUT=40"