Revision 4119
Added by Aaron Marcuse-Kubitza over 12 years ago
inputs/input.Makefile | ||
---|---|---|
123 | 123 |
viaMaps += $(filter-out $(viaMaps),$(srcMaps:src/%/src.csv=src/%/map.csv)) |
124 | 124 |
viaMaps += $(filter-out $(viaMaps) $(fullViaMap),$(wildcard src/*/map.csv)) |
125 | 125 |
|
126 |
inputFiles := $(call srcsOnly,$(wildcard $(tablesSort:%=src/%/*))) |
|
127 |
|
|
128 | 126 |
autogenMaps := $(subst map.,VegBIEN.,$(viaMaps)) |
129 | 127 |
directMaps := $(autogenMaps) $(filter-out $(autogenMaps),\ |
130 | 128 |
$(wildcard src/*/VegBIEN.csv)) |
... | ... | |
261 | 259 |
|
262 | 260 |
##### Import to VegBIEN |
263 | 261 |
|
264 |
ifneq ($(inputFiles),) |
|
265 |
|
|
266 | 262 |
profileTest = $(if $(profile),$(if $(test),1)) |
267 | 263 |
profileOnly = -env profile_to=/dev/fd/3 $(map2db) 3>&1 1>&2|\ |
268 | 264 |
$(bin)/profile_stats /dev/fd/0 |
... | ... | |
281 | 277 |
# default: |
282 | 278 |
import-%: _always ; |
283 | 279 |
|
284 |
else |
|
285 |
import: _always ; |
|
286 |
endif |
|
287 |
|
|
288 | 280 |
##### Log files from import |
289 | 281 |
|
290 | 282 |
logs := $(wildcard import/*.log.sql import/*.trace) |
Also available in: Unified diff
input.Makefile: Import to VegBIEN: Removed extra test for $(inputFiles), because when there are no inputs, $(tables) will be empty and import will automatically do nothing. Removed no longer needed $(inputFiles).