Project

General

Profile

« Previous | Next » 

Revision 4640

input.Makefile: Maps building: %/map.full.csv: Generate by copying map.csv, because the content of these files now differs only in the sort order of the names

View differences:

input.Makefile
144 144
via := Veg+
145 145

  
146 146
coreMap := $(mappings)/$(via)-VegBIEN.csv
147
coreSelfMap := $(mappings)/$(via).self.csv
148 147
vocab := $(mappings)/$(via).vocab.csv
149 148
dict := $(mappings)/$(via)-VegCore.csv
150 149

  
......
276 275

  
277 276
createOnlyMaps += $(tables:%=%/src.csv)
278 277

  
279
# Must come before $(root)/% to override it
280
$(coreSelfMap): _always
281
	-+$(subMake)
282
# ignore errors if $(coreSelfMap) does not exist
283

  
284 278
# Via maps cleanup
285 279
ifneq ($(filter %/.map.csv.last_cleanup,$(MAKECMDGOALS)),)
286 280
%/.map.csv.last_cleanup: %/map.csv $(coreMap) $(vocab) $(dict)
......
296 290
	+$(selfMake) $(@:%/map.csv=%/.map.csv.last_cleanup)
297 291
endif
298 292

  
299
srcMap* = $*/src.csv
300
joinSrcMap = $(if $(hasSrc),$(bin)/in_place $@ $(bin)/intersect $(srcMap*) 0)
301
hasSrc = $(shell test -s $(word 3,$+) && echo t)
302

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

  
305
%/map.full.csv: %/map.csv $(coreSelfMap)
306
	$(makeFullCsv)
307
	$(joinSrcMap)
293
%/map.full.csv: %/map.csv
294
	$(cp)
308 295
maps += $(patsubst %/map.csv,%/map.full.csv,$(viaMaps))
309 296

  
310 297
%/VegBIEN.csv: %/map.full.csv $(coreMap)

Also available in: Unified diff