use $(MAKE) instead of 'make' in Makefiles

License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
This commit is contained in:
Jakub Sztandera 2016-07-27 15:38:09 +01:00
parent 63072758a9
commit f3dc11c566
3 changed files with 21 additions and 21 deletions

View File

@ -58,19 +58,19 @@ vendor: godep
godep save -r ./...
install: deps
make -C cmd/ipfs install
$(MAKE) -C cmd/ipfs install
build: deps
make -C cmd/ipfs build
$(MAKE) -C cmd/ipfs build
nofuse: deps
make -C cmd/ipfs nofuse
$(MAKE) -C cmd/ipfs nofuse
clean:
make -C cmd/ipfs clean
$(MAKE) -C cmd/ipfs clean
uninstall:
make -C cmd/ipfs uninstall
$(MAKE) -C cmd/ipfs uninstall
PHONY += all help godep gx_check
PHONY += go_check deps vendor install build nofuse clean uninstall
@ -97,16 +97,16 @@ test_go_race:
$(go_test) ./... -race
test_sharness_short:
make -j1 -C test/sharness/
$(MAKE) -j1 -C test/sharness/
test_sharness_expensive:
TEST_EXPENSIVE=1 make -j1 -C test/sharness/
TEST_EXPENSIVE=1 $(MAKE) -j1 -C test/sharness/
test_all_commits:
@echo "testing all commits between origin/master..HEAD"
@echo "WARNING: this will 'git rebase --exec'."
@test/bin/continueyn
GIT_EDITOR=true git rebase -i --exec "make test" origin/master
GIT_EDITOR=true git rebase -i --exec "$(MAKE) test" origin/master
test_all_commits_travis:
# these are needed because travis.
@ -114,7 +114,7 @@ test_all_commits_travis:
git config --global user.email "nemo@ipfs.io"
git config --global user.name "IPFS BOT"
git fetch origin master:master
GIT_EDITOR=true git rebase -i --exec "make test" master
GIT_EDITOR=true git rebase -i --exec "$(MAKE) test" master
# since we have CI for osx and linux but not windows, this should help
windows_build_check:

View File

@ -15,7 +15,7 @@ GOFLAGS =
all: deps
global-deps:
make -C .. deps
$(MAKE) -C .. deps
deps: global-deps bins
@ -71,18 +71,18 @@ bin/iptb: iptb_src $(call find_go_files, $(IPTB_SRC)) IPFS-BUILD-OPTIONS
test: test_expensive
test_expensive: verify_gofmt
make -C sharness TEST_EXPENSIVE=1
make -C 3nodetest
make -C dependencies
$(MAKE) -C sharness TEST_EXPENSIVE=1
$(MAKE) -C 3nodetest
$(MAKE) -C dependencies
test_cheap: verify_gofmt
make -C sharness
make -C 3nodetest
$(MAKE) -C sharness
$(MAKE) -C 3nodetest
test_race: verify_gofmt
make -C sharness GOFLAGS=-race TEST_EXPENSIVE=1
make -C 3nodetest GOFLAGS=-race
make -C dependencies GOFLAGS=-race
$(MAKE) -C sharness GOFLAGS=-race TEST_EXPENSIVE=1
$(MAKE) -C 3nodetest GOFLAGS=-race
$(MAKE) -C dependencies GOFLAGS=-race
# Misc

View File

@ -34,7 +34,7 @@ aggregate: clean-test-results $(T)
lib/test-aggregate-results.sh
global-deps:
make -C ../.. deps
$(MAKE) -C ../.. deps
deps: global-deps $(SHARNESS) $(BINS) curl
@ -43,10 +43,10 @@ $(SHARNESS): FORCE
lib/install-sharness.sh
bin/%: FORCE
make -C .. GOFLAGS=$(GOFLAGS) $@
$(MAKE) -C .. GOFLAGS=$(GOFLAGS) $@
race:
make GOFLAGS=-race all
$(MAKE) GOFLAGS=-race all
.PHONY: all clean $(T) aggregate FORCE