Project

General

Profile

« Previous | Next » 

Revision 4135

input.Makefile: src/%/map.full.csv: Fixed bug where couldn't have $(srcMap) in prerequisites because this would for some reason cause src/%/map.full.csv to always be remade

View differences:

input.Makefile
207 207
	+$(selfMake) $(@:src/%/map.csv=src/%/.map.csv.last_cleanup)
208 208
endif
209 209

  
210
joinSrcMap = $(if $(hasSrc),$(bin)/in_place $@ $(bin)/intersect $(word 3,$+) 0)
210
srcMap* = src/$*/src.csv
211
joinSrcMap = $(if $(hasSrc),$(bin)/in_place $@ $(bin)/intersect $(srcMap*) 0)
211 212
hasSrc = $(shell test -s $(word 3,$+) && echo t)
212 213

  
213 214
makeFullCsv = env ignore=1 $(bin)/union <$(wordlist 1,2,$+)|$(bin)/sort_map >$@
214 215

  
215
src/%/map.full.csv: src/%/map.csv $(coreSelfMap) $(srcMap)
216
src/%/map.full.csv: src/%/map.csv $(coreSelfMap)
216 217
	$(makeFullCsv)
217 218
	$(joinSrcMap)
218 219
maps += $(patsubst src/%/map.csv,src/%/map.full.csv,$(viaMaps))

Also available in: Unified diff