Skip to content

Commit 96fb017

Browse files
authored
Merge pull request #230 from acrellin/makefile_patch
Update Makefile to use newly included `baselayer` targets
2 parents abec3b6 + 45643af commit 96fb017

File tree

2 files changed

+5
-35
lines changed

2 files changed

+5
-35
lines changed

Makefile

+4-34
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,15 @@
11
.DEFAULT_GOAL := run
22

3-
baselayer/README.md:
3+
-include baselayer/Makefile # always clone baselayer if it doesn't exist
4+
5+
baselayer/Makefile:
46
git submodule update --init --remote
57
$(MAKE) baselayer-update
68

7-
.PHONY: baselayer-update run log
9+
.PHONY: baselayer-update
810
baselayer-update:
911
./baselayer/tools/submodule_update.sh
1012

11-
log:
12-
make -C baselayer log
13-
14-
run:
15-
make -C baselayer run
16-
17-
run_testing:
18-
make -C baselayer run_testing
19-
20-
run_production:
21-
make -C baselayer run_production
22-
23-
test:
24-
make -C baselayer test
25-
26-
test_headless:
27-
make -C baselayer test_headless
28-
29-
db_init:
30-
make -C baselayer db_init
31-
32-
db_clear:
33-
make -C baselayer db_clear
34-
35-
attach:
36-
make -C baselayer attach
37-
38-
clean:
39-
make -C baselayer clean
40-
4113
docker-images:
4214
# Add --no-cache flag to rebuild from scratch
4315
docker build -t cesium/web . && docker push cesium/web
44-
45-
-include "baselayer/README.md" # always clone baselayer if it doesn't exist

0 commit comments

Comments
 (0)