Project

General

Profile

« Previous | Next » 

Revision 369

inputs: Don't keep *.out under version control

View differences:

input.Makefile
65 65

  
66 66
verify: _not_file $(addprefix verify-,$(tables))
67 67

  
68
verify-%: verify.%.ref.out verify.%.out _not_file
68
verify-%: verify.%.ref verify.%.out _not_file
69 69
	$(DIFF)
70 70

  
71
verify.%.out: verify.%.sql _not_file
72
	$(psqlAsBien) --no-align --tuples-only <$< >$@
73
.PRECIOUS: verify.%.out
74

  
71 75
all += $(wildcard verify.*.out)
72 76

  
73 77
#####
74 78

  
75 79
test: _not_file $(addprefix test-,$(tables))
76 80

  
77
test-%: test.%.ref.out test.%.out _not_file
81
test-%: test.%.ref test.%.out _not_file
78 82
	$(DIFF)
79 83

  
80
all += $(filter-out %.ref.out,$(wildcard test.*.out))
84
all += $(filter-out %.ref,$(wildcard test.*.out))
81 85

  
82 86
#####
83 87

  
......
101 105

  
102 106
all += $(wildcard *.out)
103 107

  
104
%.ref.out: %.ref.sql
108
%.ref: %.ref.sql
105 109
	$(mysqlAsBien) --skip-column-names $(db) <$< >$@
106
.PRECIOUS: %.ref.out
110
.PRECIOUS: %.ref
107 111

  
108 112
###
109 113

  
......
111 115

  
112 116
uninstall: _not_file rm_db
113 117

  
114
db: $(db).sql _not_file
118
db: src.$(db).sql _not_file
115 119
	-$(mysqlAsRoot) <$<
116 120
	echo "GRANT SELECT ON $(db).* TO 'bien'@'localhost';"|$(mysqlAsRoot)
117 121
# ignore errors in db import so that GRANT will still be run
......
143 147

  
144 148
# Must come after mapEnv is set
145 149
map := env $(mapEnv) out_database=vegbien $(root)/map
146

  
147
# Must come after %.ref.out and test.%.out so they get checked first
148
%.out: %.sql _not_file
149
	$(psqlAsBien) --no-align --tuples-only <$< >$@
150
.PRECIOUS: %.out

Also available in: Unified diff