Mike Gerwitz

Activist for User Freedom

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Gerwitz <mike.gerwitz@rtspecialty.com>2019-04-03 15:26:22 -0400
committerMike Gerwitz <mike.gerwitz@rtspecialty.com>2019-04-04 14:41:07 -0400
commit1a35232bd8c96a2938a11356184019971823f2c9 (patch)
treeee91072688b1178c2afca5b5cc25371880fb358b /build-aux
parent7b7cf13607489a150a7eb9aab2616b71cbeec18c (diff)
downloadtame-1a35232bd8c96a2938a11356184019971823f2c9.tar.gz
tame-1a35232bd8c96a2938a11356184019971823f2c9.tar.bz2
tame-1a35232bd8c96a2938a11356184019971823f2c9.zip
Parallel build support
tamed was originally designed with support for parallel builds in mind, but I hadn't completed that work because we didn't have enough hardware that we'd benefit strongly from it. That has since changed. tamed will now spawn additional runners as needed to fulfill requests, which works around the issue of not knowing how many jobs GNU Make is going to try to do at once. There were a couple minor dependency fixes/workarounds for now in the Makefile, but otherwise everything appears to be working great.
Diffstat (limited to 'build-aux')
-rw-r--r--build-aux/Makefile.am9
1 files changed, 6 insertions, 3 deletions
diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am
index c6f536f..16267c6 100644
--- a/build-aux/Makefile.am
+++ b/build-aux/Makefile.am
@@ -86,7 +86,6 @@ ant = @ANT@ -e
default: program-ui c1map FORCE
.DELETE_ON_ERROR:
-.NOTPARALLEL:
# keep all intermediate files for easy introspection
.SECONDARY:
@@ -153,7 +152,11 @@ c1map: $(dest_c1map)
%.csvo: %.csv
cp $< $@
-%.xml: %.csvo
+# TODO: This is necessary right now because of the current depgen
+# process. Once that is eliminated in favor of individual dependency files
+# (e.g. the %.d convention), this can go away since dependency generation
+# can properly take place for the various file formats.
+%.xml: %.csvo rater/core/vector/table.xmlo
rater/tools/csv2xml $< > $@
version: .version.xml
@@ -169,7 +172,7 @@ ui/html/index.phtml: ui/program.expanded.xml
ui/package-dfns.xmlo: ui/package-dfns.xml
ui/package-dfns.xml: ui/program.expanded.xml
$(TAME) progui-pkg $< $@
-ui/package-map.xmlo: ui/package-map.xml
+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) progui-pkg-map $< $@