Revision 418
Added by Aaron Marcuse-Kubitza about 13 years ago
inputs/input.Makefile | ||
---|---|---|
22 | 22 |
|
23 | 23 |
##### |
24 | 24 |
|
25 |
all: _always maps |
|
25 |
all: _always maps ;
|
|
26 | 26 |
|
27 | 27 |
.SUFFIXES: |
28 | 28 |
|
... | ... | |
43 | 43 |
|
44 | 44 |
##### |
45 | 45 |
|
46 |
reinstall: _always uninstall install |
|
46 |
reinstall: _always uninstall install ;
|
|
47 | 47 |
|
48 | 48 |
##### |
49 | 49 |
|
50 |
maps: $(vegbienMaps) _always |
|
50 |
maps: $(vegbienMaps) _always ;
|
|
51 | 51 |
|
52 | 52 |
all += $(vegbienMaps) |
53 | 53 |
|
... | ... | |
57 | 57 |
|
58 | 58 |
##### |
59 | 59 |
|
60 |
import: _always $(addprefix import-,$(tables)) verify |
|
60 |
import: _always $(addprefix import-,$(tables)) verify ;
|
|
61 | 61 |
|
62 | 62 |
log = $*$(if $(n),.n=$(n),).log |
63 | 63 |
|
... | ... | |
68 | 68 |
|
69 | 69 |
##### |
70 | 70 |
|
71 |
verify: _always $(addprefix verify-,$(tables)) |
|
71 |
verify: _always $(addprefix verify-,$(tables)) ;
|
|
72 | 72 |
|
73 | 73 |
verify-%: verify.%.ref verify.%.out _always |
74 | 74 |
$(DIFF) $(+_) |
... | ... | |
79 | 79 |
|
80 | 80 |
##### |
81 | 81 |
|
82 |
test: _always $(addprefix test-,$(tables)) |
|
82 |
test: _always $(addprefix test-,$(tables)) ;
|
|
83 | 83 |
|
84 | 84 |
test-%: test.%.out _always |
85 | 85 |
$(DIFF) $(<:.out=.ref) $< |
... | ... | |
113 | 113 |
|
114 | 114 |
### |
115 | 115 |
|
116 |
install: _always db |
|
116 |
install: _always db ;
|
|
117 | 117 |
|
118 |
uninstall: _always rm_db |
|
118 |
uninstall: _always rm_db ;
|
|
119 | 119 |
|
120 | 120 |
db: src.$(db).sql _always |
121 | 121 |
-$(mysqlAsRoot) <$< |
schemas/Makefile | ||
---|---|---|
7 | 7 |
|
8 | 8 |
all = vegbien.sql vegbien_empty.sql |
9 | 9 |
|
10 |
all: _always $(all) |
|
10 |
all: _always $(all) ;
|
|
11 | 11 |
|
12 | 12 |
.SUFFIXES: |
13 | 13 |
|
Makefile | ||
---|---|---|
57 | 57 |
install: _always core mysql inputs/install test |
58 | 58 |
@$(done) |
59 | 59 |
|
60 |
uninstall: _always inputs/uninstall rm_mysql rm_core |
|
60 |
uninstall: _always inputs/uninstall rm_mysql rm_core ;
|
|
61 | 61 |
|
62 |
reinstall: _always uninstall install |
|
62 |
reinstall: _always uninstall install ;
|
|
63 | 63 |
|
64 | 64 |
##### |
65 | 65 |
|
66 | 66 |
core: _always $(call forOs,python postgres) postgres_user db |
67 | 67 |
@$(done) |
68 | 68 |
|
69 |
rm_core: _always rm_db rm_postgres_user |
|
69 |
rm_core: _always rm_db rm_postgres_user ;
|
|
70 | 70 |
|
71 |
reinstall_core: _always rm_core core |
|
71 |
reinstall_core: _always rm_core core ;
|
|
72 | 72 |
|
73 | 73 |
python-Linux: _always |
74 | 74 |
-sudo apt-get install python python-dev python-dateutil python-pip |
... | ... | |
112 | 112 |
@echo 'Run the installer in it' |
113 | 113 |
@$(wait) |
114 | 114 |
|
115 |
postgres-: _always # other OSes |
|
115 |
postgres-: _always ; # other OSes
|
|
116 | 116 |
|
117 | 117 |
psqlOpts := --set ON_ERROR_STOP=1 --quiet |
118 | 118 |
psqlAsAdmin := sudo -u postgres psql $(psqlOpts) |
... | ... | |
138 | 138 |
rm_db: _always |
139 | 139 |
echo "DROP DATABASE IF EXISTS vegbien;"|$(psqlAsAdmin) |
140 | 140 |
|
141 |
reinstall_db: _always rm_db db |
|
141 |
reinstall_db: _always rm_db db ;
|
|
142 | 142 |
|
143 | 143 |
empty_db: _always schemas/vegbien_empty.sql |
144 | 144 |
$(psqlAsBien) <schemas/vegbien_empty.sql |
... | ... | |
148 | 148 |
mysql: _always $(call forOs,mysql) mysql_user |
149 | 149 |
@$(done) |
150 | 150 |
|
151 |
rm_mysql: _always rm_mysql_user |
|
151 |
rm_mysql: _always rm_mysql_user ;
|
|
152 | 152 |
|
153 | 153 |
mysql-Linux: _always |
154 | 154 |
@echo $(emph)"If asked for MySQL root password, enter $(bienPassword)"$(endEmph) |
... | ... | |
188 | 188 |
|
189 | 189 |
##### |
190 | 190 |
|
191 |
inputs: _always inputs/all |
|
191 |
inputs: _always inputs/all ;
|
|
192 | 192 |
|
193 |
import: _always inputs/import |
|
193 |
import: _always inputs/import ;
|
|
194 | 194 |
|
195 |
verify: _always inputs/verify |
|
195 |
verify: _always inputs/verify ;
|
|
196 | 196 |
|
197 |
test2: _always inputs/test |
|
197 |
test2: _always inputs/test ;
|
|
198 | 198 |
@$(done) |
199 | 199 |
|
200 | 200 |
##### |
mappings/Makefile | ||
---|---|---|
25 | 25 |
|
26 | 26 |
##### |
27 | 27 |
|
28 |
plots: _always $(subst .organisms.,.plots.,$(wildcard VegX-*.organisms.csv)) |
|
28 |
plots: _always $(subst .organisms.,.plots.,$(wildcard VegX-*.organisms.csv)) ;
|
|
29 | 29 |
|
30 | 30 |
chRoot2PlotsLeftVegx =\ |
31 | 31 |
env \ |
Also available in: Unified diff
Makefiles: Added empty rules for targets without a rule so that these rules wouldn't trigger the recursive subdir invocation for the default target