Revision 4133
Added by Aaron Marcuse-Kubitza over 12 years ago
| inputs/input.Makefile | ||
|---|---|---|
| 195 | 195 |
-+$(subMake) |
| 196 | 196 |
# ignore errors if $(coreSelfMap) does not exist |
| 197 | 197 |
|
| 198 |
joinSrcMap = $(if $(hasSrc),$(bin)/in_place $@ $(bin)/intersect $(word 3,$+) 0) |
|
| 199 |
hasSrc = $(shell test -s $(word 3,$+) && echo t) |
|
| 200 |
|
|
| 201 |
makeFullCsv = env ignore=1 $(bin)/union <$(wordlist 1,2,$+)|$(bin)/sort_map >$@ |
|
| 202 |
|
|
| 203 |
# Must come before src/%/map.csv to override it |
|
| 204 |
src/%/map.full.csv: src/%/map.csv $(coreSelfMap) $(srcMap) |
|
| 205 |
$(makeFullCsv) |
|
| 206 |
$(joinSrcMap) |
|
| 207 |
maps += $(patsubst src/%/map.csv,src/%/map.full.csv,$(viaMaps)) |
|
| 208 |
|
|
| 209 | 198 |
# Via maps cleanup |
| 210 | 199 |
ifneq ($(filter src/%/.map.csv.last_cleanup,$(MAKECMDGOALS)),) |
| 211 | 200 |
src/%/.map.csv.last_cleanup: src/%/map.csv $(coreMap) |
| ... | ... | |
| 218 | 207 |
+$(selfMake) $(@:src/%/map.csv=src/%/.map.csv.last_cleanup) |
| 219 | 208 |
endif |
| 220 | 209 |
|
| 210 |
joinSrcMap = $(if $(hasSrc),$(bin)/in_place $@ $(bin)/intersect $(word 3,$+) 0) |
|
| 211 |
hasSrc = $(shell test -s $(word 3,$+) && echo t) |
|
| 212 |
|
|
| 213 |
makeFullCsv = env ignore=1 $(bin)/union <$(wordlist 1,2,$+)|$(bin)/sort_map >$@ |
|
| 214 |
|
|
| 215 |
src/%/map.full.csv: src/%/map.csv $(coreSelfMap) $(srcMap) |
|
| 216 |
$(makeFullCsv) |
|
| 217 |
$(joinSrcMap) |
|
| 218 |
maps += $(patsubst src/%/map.csv,src/%/map.full.csv,$(viaMaps)) |
|
| 219 |
|
|
| 221 | 220 |
src/%/VegBIEN.csv: src/%/map.full.csv $(coreMap) |
| 222 | 221 |
$(bin)/join <$+|$(bin)/sort_map >$@ |
| 223 | 222 |
maps += $(autogenMaps) |
Also available in: Unified diff
input.Makefile: Maps building: Moved src/%/map.full.csv after src/%/map.csv now that the filenames are fixed, so pattern matching order isn't an issue