Project

General

Profile

« Previous | Next » 

Revision 1273

input.Makefile: maps: maps/$(via).%.full.csv: Fixed bug where $(selfMap) would be ignored if it had not yet been made

View differences:

input.Makefile
59 59
%.out: %.make _always
60 60
	./$* >$@
61 61

  
62
$(root)/%: _always
63
	+$(subMake)
64

  
65 62
##### SVN
66 63

  
67 64
svn_props: _always
......
92 89
$(wildcard maps/VegBIEN.*.csv))
93 90
tables := $(directMaps:maps/VegBIEN.%.csv=%)
94 91

  
92
# Must come before $(root)/% to override it
93
$(selfMap): _always
94
	-+$(subMake)
95
# ignore errors if $(selfMap) does not exist
96

  
97
$(root)/%: _always
98
	+$(subMake)
99

  
95 100
maps :=
96 101

  
97 102
maps/VegBIEN.%.csv: maps/$(via).%.csv $(coreMap)
......
99 104

  
100 105
maps += $(autogenMaps)
101 106

  
107
makeFullCsv = $(if $(shell test -e $(word 2,$+) && echo t),\
108
env ignore=1 $(root)/bin/union <$+|$(root)/bin/sort_map >$@,$(CP) $< $@)
109

  
102 110
maps/$(via).%.full.csv: maps/$(via).%.csv $(selfMap)
103
	env ignore=1 $(root)/bin/union <$+|$(root)/bin/sort_map >$@
104
maps/$(via).%.full.csv: maps/$(via).%.csv # fallback if no self map
105
	$(CP) $< $@
106
# note that this will also run if the self map has not yet been made
111
	$(makeFullCsv)
112
# can't use $(wildcard) because it won't recheck file after $(selfMap) is run
107 113

  
108 114
maps += $(patsubst maps/%.csv,maps/%.full.csv,$(viaMaps))
109 115

  

Also available in: Unified diff