Revision 6157
Added by Aaron Marcuse-Kubitza about 12 years ago
| inputs/input.Makefile | ||
|---|---|---|
| 155 | 155 |
coreMap := $(mappings)/VegCore-VegBIEN.csv |
| 156 | 156 |
dict := $(mappings)/Veg+-VegCore.csv |
| 157 | 157 |
|
| 158 |
viaMaps := $(tables:%=%/map.csv)
|
|
| 158 |
viaMaps := $(importTables:%=%/map.csv)
|
|
| 159 | 159 |
|
| 160 | 160 |
autogenMaps := $(subst map.,VegBIEN.,$(viaMaps)) |
| 161 | 161 |
directMaps := $(autogenMaps) $(filter-out $(autogenMaps),\ |
| ... | ... | |
| 175 | 175 |
withCatSrcs = $(catSrcs:$(bin)/%=$(bin)/with_%) -- |
| 176 | 176 |
|
| 177 | 177 |
# Usage: `make {--silent|-s} inputs/<datasrc>/cat` (don't echo make commands)
|
| 178 |
cat: $(tables:%=%/cat) _always ;
|
|
| 178 |
cat: $(importTables:%=%/cat) _always ;
|
|
| 179 | 179 |
|
| 180 | 180 |
%/cat: _always |
| 181 | 181 |
$(catSrcs) |
| ... | ... | |
| 342 | 342 |
$(dict) $(if $(wildcard $(word 4,$+)),|$(bin)/filter_out_ci 0 $(word 4,$+))\ |
| 343 | 343 |
|grep -vE '^"?:' >$@; exit 0# because grep exits nonzero if no match |
| 344 | 344 |
|
| 345 |
termsSubdirs := $(tables)
|
|
| 345 |
termsSubdirs := $(importTables)
|
|
| 346 | 346 |
|
| 347 | 347 |
include $(root)/lib/mappings.Makefile |
| 348 | 348 |
|
| ... | ... | |
| 476 | 476 |
tests += %/test.by_col.xml |
| 477 | 477 |
endif |
| 478 | 478 |
|
| 479 |
testOutputs := $(foreach test,$(tests),$(tables:%=$(test)))
|
|
| 479 |
testOutputs := $(foreach test,$(tests),$(importTables:%=$(test)))
|
|
| 480 | 480 |
|
| 481 | 481 |
.PRECIOUS: $(testOutputs) # save outputs of failed tests so they can be accepted |
| 482 | 482 |
|
Also available in: Unified diff
input.Makefile: $(tables): Fixed bug where need to use $(importTables) instead of $(tables) in all places that should use only imported tables, rather than just in the import process itself