Project

General

Profile

« Previous | Next » 

Revision 4668

input.Makefile: Maps validation: %/new_terms.csv: Filter out $(coreMap) and $(dict) successively instead of $(vocab), to avoid requiring intermediate mapping files not edited by the user

View differences:

inputs/input.Makefile
289 289
%/unmapped_terms.csv: %/map.csv $(coreMap)
290 290
	$(call newTerms,1,|$(bin)/filter_out_ci 0 $(coreMap))
291 291

  
292
%/new_terms.csv: %/map.csv $(vocab) %/unmapped_terms.csv
292
%/new_terms.csv: %/map.csv $(coreMap) $(dict) %/unmapped_terms.csv
293 293
	$(call newTerms,0,$(rmNewTerms))
294
rmNewTerms = |$(bin)/filter_out_ci 0 $(vocab)\
295
$(if $(wildcard $(word 3,$+)),|$(bin)/filter_out_ci 0 $(word 3,$+))
294
rmNewTerms = |$(bin)/filter_out_ci 0 $(coreMap)|$(bin)/filter_out_ci 0 $(dict)\
295
$(if $(wildcard $(word 4,$+)),|$(bin)/filter_out_ci 0 $(word 4,$+))
296 296

  
297 297
termsSubdirs := $(tables)
298 298

  

Also available in: Unified diff