Project

General

Profile

« Previous | Next » 

Revision 4132

input.Makefile: Maps building: $(makeFullCsv): Removed no longer needed test for whether the $(coreSelfMap) exists, because Veg+'s self map always exists

View differences:

input.Makefile
198 198
joinSrcMap = $(if $(hasSrc),$(bin)/in_place $@ $(bin)/intersect $(word 3,$+) 0)
199 199
hasSrc = $(shell test -s $(word 3,$+) && echo t)
200 200

  
201
makeFullCsv = $(if $(shell test -e $(word 2,$+) && echo t),\
202
env ignore=1 $(bin)/union <$(wordlist 1,2,$+)|,<$< )$(bin)/sort_map >$@
203
# can't use $(wildcard) because it won't recheck file after $(coreSelfMap) runs
201
makeFullCsv = env ignore=1 $(bin)/union <$(wordlist 1,2,$+)|$(bin)/sort_map >$@
204 202

  
205 203
# Must come before src/%/map.csv to override it
206 204
src/%/map.full.csv: src/%/map.csv $(coreSelfMap) $(srcMap)

Also available in: Unified diff