Skip to content

Commit 10bef45

Browse files
committed
Update Makefile to use scripts uniformly.
1 parent 1919e83 commit 10bef45

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

Makefile

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
EXES := rubinius/bin/rbx
2-
DIST := dist/*
3-
CXX := clang++
1+
PROJ = rbx
42

53
# Allow override (e.g., `make VERSION=1.2.3`)
64
VERSION ?= $(shell (git describe --tags 2>/dev/null || echo "develop") | sed 's/^v//')
@@ -12,27 +10,23 @@ all: setup config build test
1210

1311
##@ Dependencies
1412
setup: ## Clone all components
15-
@echo Setting up all components
1613
@git submodule update --init --recursive
17-
@./.build2/scripts/setup-build2.sh rbx
14+
@./.build2/scripts/setup-build2.sh $(PROJ)
1815

1916
config: ## Configure
20-
@echo Configuring all components
21-
@./.build2/scripts/config-build2.sh rbx
17+
@./.build2/scripts/config-build2.sh $(PROJ)
2218

23-
##@ Devolpment
19+
##@ Development
2420
build: ## Build all components
25-
@echo Building all components
26-
b
21+
@./.build2/scripts/build-build2.sh $(PROJ)
2722

2823
##@ Testing
2924
test: ## Run the tests
30-
@echo Running all tests
31-
b test
25+
@./.build2/scripts/test-build2.sh $(PROJ)
3226

3327
##@ Maintenance
3428
clean: ## Remove all build artifacts
35-
rm -rf $(EXES) $(DIST)
29+
@./.build2/scripts/clean-build2.sh $(PROJ)
3630

3731
help: ## Display this help
3832
@awk 'BEGIN {FS = ":.*##"; printf "Usage:\n make \033[36m<target>\033[0m\n"} /^[.a-zA-Z_-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)

0 commit comments

Comments
 (0)