Mike Gerwitz

Activist for User Freedom

diff options
authorMike Gerwitz <mike.gerwitz@ryansg.com>2021-03-17 17:02:58 -0400
committerMike Gerwitz <mike.gerwitz@ryansg.com>2021-03-17 17:02:58 -0400
commit43204d1dd52a60f51f053133e4da118bc02216e3 (patch)
tree7e429ff5e573a150774b169c03f6cd571f404784 /build-aux
parent6b358124053c95529409b6b913621109d4b3d384 (diff)
build-aux/Makefile.am: Lookup table dependency fix
%.xml{=>o}: %csvo rater/core/vector/table.xmlo That is: we'll only build an object file when we try to build another object file. This was causing problems with dependency generation, because it will triggering compilation early.
Diffstat (limited to 'build-aux')
1 files changed, 8 insertions, 2 deletions
diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am
index 76b96e9..dd8a6bc 100644
--- a/build-aux/Makefile.am
+++ b/build-aux/Makefile.am
@@ -203,12 +203,18 @@ c1map: $(dest_c1map)
%.csvo: %.csv
cp $< $@
+%.xml: %.csvo
+ rater/tools/csv2xml $< > $@
+# All lookup tables rely on rater/core/vector/package. This rule applies to
+# xmlo files only when there is a corresponding csvo file. Note that this
+# relies on .SECONDARY above to work properly.
# 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 $< > $@
+%.xmlo: %.csvo rater/core/vector/table.xmlo
# This target is always run, but only update the file (and thus its
# timestamp) if the hash actually changes, so that we do not rebuild any