Mike Gerwitz

Activist for User Freedom

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am9
-rw-r--r--progtest/Makefile6
2 files changed, 12 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 9f2e982..290fdfe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,9 +33,11 @@ export SAXON_CP
.DELETE_ON_ERROR:
-.PHONY: check test texis applies
+.PHONY: check test texis applies FORCE
-.DEFAULT_GOAL := applies
+.DEFAULT_GOAL := all
+
+all: applies progtest
test: check
check: | applies
@@ -49,5 +51,8 @@ applies: $(apply_dest)
-xsl:"$(HOXSL)/src/transform/apply-gen.xsl" \
"$<" > "$@"
+progtest: FORCE
+ $(MAKE) -C progtest
+
clean-local:
$(RM) $(apply_dest)
diff --git a/progtest/Makefile b/progtest/Makefile
index 2b01a10..72dbfa4 100644
--- a/progtest/Makefile
+++ b/progtest/Makefile
@@ -22,6 +22,10 @@
namespaces=$(shell find src/ -type d)
nsindex=$(addsuffix /index.js, $(namespaces))
+.DEFAULT_GOAL: all
+
+all: tame-progtest.js
+
test: check
check:
PATH="$(PATH):$(CURDIR)/node_modules/mocha/bin" \
@@ -32,7 +36,7 @@ modindex: $(nsindex)
$(CURDIR)/build-aux/gen-index "$*" > "$@"
browserify: tame-progtest.js
-tame-progtest.js: FORCE
+tame-progtest.js: check modindex
$(CURDIR)/node_modules/.bin/browserify \
--debug \
-r $(CURDIR)/src/index.js:progtest \