Mike Gerwitz

Activist for User Freedom

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Gerwitz <mike.gerwitz@ryansg.com>2020-01-02 10:42:07 -0500
committerMike Gerwitz <mike.gerwitz@ryansg.com>2020-01-02 10:42:08 -0500
commitbe296a241ad7459181b45dfe15fe02b435d0f7f0 (patch)
treed2d4b7ab00dba1cb92bc7efb83c47ba3346b5ce0 /build-aux
parent3cb67109ecd9c56e6d42746939270e2969d9af19 (diff)
downloadtame-be296a241ad7459181b45dfe15fe02b435d0f7f0.tar.gz
tame-be296a241ad7459181b45dfe15fe02b435d0f7f0.tar.bz2
tame-be296a241ad7459181b45dfe15fe02b435d0f7f0.zip
build-aux/Makefile.am: Optional timestamping
Note that, because of the way this is implemented, the timestamps may become mangled (multiple per line) for parallel builds. Output can be prettied up in the future.
Diffstat (limited to 'build-aux')
-rw-r--r--build-aux/Makefile.am22
-rwxr-xr-xbuild-aux/gen-make3
2 files changed, 22 insertions, 3 deletions
diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am
index 16267c6..5b1f23d 100644
--- a/build-aux/Makefile.am
+++ b/build-aux/Makefile.am
@@ -99,6 +99,12 @@ export TAMED_STALL_SECONDS
TAMED_SPAWNER_PID=$(shell echo $$PPID)
export TAMED_SPAWNER_PID
+# Optional timestamping for TAME commands
+TS_FMT=%s
+tame__ts_0 = :
+tame__ts_1 = @printf '[%($(TS_FMT))T] '
+TAME_TS = $(tame__ts_$(TS))
+
all: program-data-copy
# Building all common files is useful in a distributed pipeline so that
@@ -107,6 +113,11 @@ common: $(xmlo_common)
program-ui: ui/package.strip.js ui/Program.js ui/html/index.phtml
+# Individual dependencies appear in suppliers.mk (see below)
+%.xmlo: %.xml
+ $(TAME_TS)
+ $(TAME) compile $< $@
+
# Note the `$()' here to prevent Automake from inlining this file---it is
# to be generated when imports change, which can be at any time.
include $()suppliers.mk
@@ -114,13 +125,16 @@ include $()suppliers.mk
summary-html: $(dest_summary_html) ;
%.html: %.js %.xmle
+ $(TAME_TS)
$(TAME) summary $*.xmle $@
standalones: $(dest_standalone)
strip: $(dest_standalone_strip) ui/package.strip.js
%.xmle: %.xmlo
+ $(TAME_TS)
$(TAME) link $< $@
%.js: %.xmle
+ $(TAME_TS)
$(TAME) standalone $< $@
%.strip.js: %.js
cp $< $@
@@ -130,8 +144,10 @@ strip: $(dest_standalone_strip) ui/package.strip.js
c1map: $(dest_c1map)
%.dot: %.xmlo
+ $(TAME_TS)
$(TAME) dot $< $@
%.dote: %.xmle
+ $(TAME_TS)
$(TAME) dot $< $@
%.svg: %.dote
@@ -164,16 +180,21 @@ version: .version.xml
git log HEAD^.. -1 --pretty=format:'<version>%h</version>' > .version.xml
ui/program.expanded.xml: ui/program.xml $(program_fragments)
+ $(TAME_TS)
$(TAME) progui-expand $< $@
ui/Program.js: ui/program.expanded.xml ui/package.js
+ $(TAME_TS)
$(TAME) progui-class $< $@ include-path=../../../ui/
ui/html/index.phtml: ui/program.expanded.xml
+ $(TAME_TS)
$(TAME) progui-html $< $@ out-path=./
ui/package-dfns.xmlo: ui/package-dfns.xml
ui/package-dfns.xml: ui/program.expanded.xml
+ $(TAME_TS)
$(TAME) progui-pkg $< $@
ui/package-map.xmlo: ui/package-map.xml ui/package-dfns.xmlo
ui/package-map.xml: ui/program.expanded.xml ui/package-dfns.xml
+ $(TAME_TS)
$(TAME) progui-pkg-map $< $@
# for the time being, this does not depend on clean-rate-tables because $(ant) will
@@ -298,6 +319,7 @@ test: check
kill-tamed: tamed-die
tamed-die:
+ $(TAME_TS)
$(TAME) --kill
me-a-sandwich:
diff --git a/build-aux/gen-make b/build-aux/gen-make
index 2f4c31b..2710d5c 100755
--- a/build-aux/gen-make
+++ b/build-aux/gen-make
@@ -54,9 +54,6 @@ resolv-path()
# rule for building
[ -z "$GEN_MAKE" ] && {
- echo "%.xmlo: %.xml"
- echo -e '\t$(TAME) compile $< $@'
-
export GEN_MAKE="$( pwd )/$0"
exec "$GEN_MAKE" "$@"
}