From d1aa5f5704a3298a7bb6ce3636d92c00f0acf8fe Mon Sep 17 00:00:00 2001 From: Mike Gerwitz Date: Fri, 23 Feb 2018 10:40:00 -0500 Subject: [PATCH] progtest/Makefile: Build tame-progtest.js as default target --- Makefile.am | 9 +++++++-- progtest/Makefile | 6 +++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9f2e9823..290fdfee 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 2b01a103..72dbfa43 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 \