Project

General

Profile

« Previous | Next » 

Revision 1386

input.Makefile: Added tsv to $(exts). Strip extra whitespace from $(inputs) so that it's the empty string if $(<in) (and $(<in).header) don't exist, and can be used in $(if ...).

View differences:

inputs/input.Makefile
2 2

  
3 3
log ?= $(if $(test),,1)
4 4
profile ?=
5
exts ?= csv txt xml
5
exts ?= csv tsv txt xml
6 6
test_n ?= 2
7 7
tablesSort ?= plots organisms stems
8 8

  
......
135 135

  
136 136
+maps = $(filter maps/% $(mappings)/%,$(+_))
137 137
<in = $(firstword $(filter-out $(+maps),$(+_)) $(wildcard $(exts:%=src/*.$*.%)))
138
inputs = $(wildcard $(<in).header $(<in))
138
inputs = $(strip $(wildcard $(<in).header) $(<in))
139 139
map = $(if $(inputs),$(bin)/with_cat $(inputs) -- ,$(if $(mapEnv),env $(mapEnv)\
140
,$(error No input file src/*.$*.{$(exts)} )))$(root)/map $(+maps)
140
,$(error No input file src/*.$*.{$(exts)})))$(root)/map $(+maps)
141 141
map2db = env out_database=vegbien $(map)
142 142

  
143 143
##### Import to VegBIEN

Also available in: Unified diff