Project

General

Profile

« Previous | Next » 

Revision 4101

View differences:

input.Makefile
105 105

  
106 106
##### Existing maps discovery
107 107

  
108
inputFiles := $(wildcard $(exts:%=src/*.%))
108
inputFiles := $(wildcard $(tablesSort:%=src/%/*))
109 109

  
110 110
srcMaps := $(wildcard maps/src.*.csv)
111 111

  
......
128 128

  
129 129
##### Sources
130 130

  
131
srcs = $(shell $(bin)/sort_filenames $(wildcard $(exts:%=src/*.$*.%)))
131
srcs = $(shell $(bin)/sort_filenames $(wildcard src/$*/*))
132 132
isCsv = $(if $(srcs),$(if $(filter %.xml,$(srcs)),,1))
133 133
    # true if $(srcs) non-empty and contains no *.xml
134 134
catSrcs = $(bin)/cat$(if $(isCsv),_csv) $(srcs)
......
253 253
map = $(if $(<in),<$(<in),\
254 254
$(if $(srcs),$(withCatSrcs),\
255 255
$(if $(mapEnv),env $(mapEnv),\
256
$(error No input file src/*.$*.{$(exts)}))))\
256
$(error No input file src/$*/*.{$(exts)}))))\
257 257
$(root)/map $(+maps)
258 258
map2db = $(if $(use_staged),env in_database=vegbien in_schema=$(datasrc)\
259 259
in_table=$*) env out_database=vegbien $(map)

Also available in: Unified diff