Project

General

Profile

« Previous | Next » 

Revision 4645

input.Makefile: Maps building: Removed no longer used %/src.csv, because it is no longer needed to generate map.full.csv from map.csv

View differences:

input.Makefile
126 126
tables := $(allTables)
127 127
endif
128 128

  
129
srcMaps := $(wildcard */src.csv)
130

  
131
srcMap := %/src.csv
132 129
viaMap := %/map.csv
133 130
directMap := %/VegBIEN.csv
134
anyMap := $(srcMap) $(viaMap) $(directMap) %/unmapped_terms.csv\
131
anyMap := $(viaMap) $(directMap) %/unmapped_terms.csv\
135 132
%/new_terms.csv
136 133

  
137 134
extsFilter := $(addprefix %.,$(exts))
......
147 144
dict := $(mappings)/$(via)-VegCore.csv
148 145

  
149 146
viaMaps := $(wildcard $(tables:%=%/map.csv))
150
viaMaps += $(filter-out $(viaMaps),$(srcMaps:%/src.csv=%/map.csv))
151 147
viaMaps += $(filter-out $(viaMaps),$(wildcard */map.csv))
152 148

  
153 149
autogenMaps := $(subst map.,VegBIEN.,$(viaMaps))
......
258 254
srcRoot = $(mappings)/root.sh
259 255
mkSrcMap = $(catSrcs)|(. $(srcRoot); env datasrc=$(datasrc) $(bin)/src_map >$@)
260 256

  
261
# Src maps cleanup
262
ifneq ($(filter %/.src.csv.last_cleanup,$(MAKECMDGOALS)),)
263
%/.src.csv.last_cleanup: %/src.csv
264
	$(bin)/in_place $< $(bin)/cols +
265
	touch $@
266
else
267
# Autogen src maps with known table names
268
%/src.csv: _always
269
	$(if $(wildcard $@),,$(if $(nonXml),$(mkSrcMap)))
270
	+$(if $(nonXml),$(selfMake) $(@:%/src.csv=%/.src.csv.last_cleanup))
271
# only build if doesn't exist
272
# only build if CSV srcs exist for that table name
273
endif
274

  
275
createOnlyMaps += $(tables:%=%/src.csv)
276

  
277 257
# Via maps cleanup
278 258
ifneq ($(filter %/.map.csv.last_cleanup,$(MAKECMDGOALS)),)
279 259
%/.map.csv.last_cleanup: %/map.csv $(coreMap) $(vocab) $(dict)

Also available in: Unified diff