Project

General

Profile

« Previous | Next » 

Revision 4667

input.Makefile: Maps validation: $(newTerms): Don't hardcode the caller's first filter_out_ci by prerequisite position; instead allow them to specify the command (including the var name) themselves

View differences:

input.Makefile
282 282
# `tail -n +2`: Remove header before running filter_out_ci because filter_out_ci
283 283
# only removes the header if it matches the vocabulary's header.
284 284
define newTerms
285
tail -n +2 $<|$(bin)/cols $(1)|$(bin)/filter_out_ci 0 $(word 2,$+)$(2) >$@
285
tail -n +2 $<|$(bin)/cols $(1)$(2) >$@
286 286
$(bin)/autoremove $@
287 287
endef
288 288

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

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

  
296 297
termsSubdirs := $(tables)
297 298

  

Also available in: Unified diff