Revision 3561
Added by Aaron Marcuse-Kubitza over 12 years ago
| input.Makefile | ||
|---|---|---|
| 207 | 207 |
$(selfMake) $(@:maps/%=maps/.%.last_cleanup) |
| 208 | 208 |
endif |
| 209 | 209 |
|
| 210 |
joinSrcMap = $(if $(wildcard maps/src.$*.csv),$(bin)/in_place $@\
|
|
| 211 |
$(bin)/intersect maps/src.$*.csv 0)
|
|
| 210 |
joinSrcMap = $(if $(hasSrc),$(bin)/in_place $@ $(bin)/intersect $(word 3,$+) 0)
|
|
| 211 |
hasSrc = $(shell test -s $(word 3,$+) && echo t)
|
|
| 212 | 212 |
|
| 213 | 213 |
makeFullCsv = $(if $(shell test -e $(word 2,$+) && echo t),\ |
| 214 |
env ignore=1 $(bin)/union <$+|,<$< )$(bin)/sort_map >$@
|
|
| 214 |
env ignore=1 $(bin)/union <$(wordlist 1,2,$+)|,<$< )$(bin)/sort_map >$@
|
|
| 215 | 215 |
# can't use $(wildcard) because it won't recheck file after $(coreSelfMap) runs |
| 216 | 216 |
|
| 217 |
maps/$(via).%.full.csv: maps/$(via).%.csv $(coreSelfMap) |
|
| 217 |
maps/$(via).%.full.csv: maps/$(via).%.csv $(coreSelfMap) $(srcMap)
|
|
| 218 | 218 |
$(makeFullCsv) |
| 219 | 219 |
$(joinSrcMap) |
| 220 | 220 |
maps += $(patsubst maps/%.csv,maps/%.full.csv,$(viaMaps)) |
Also available in: Unified diff
input.Makefile: Maps building: maps/$(via).%.full.csv: Added the src map as a prerequisite so it would be rebuilt when the src map changes. This is possible now that every datasource has at least an empty src map. (An empty src map is now treated the same way as a non-existing one.)