coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-02-21 10:27:46 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

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

18
test/Makefile
View File

@ -15,7 +15,7 @@ GOFLAGS =
all: deps all: deps
global-deps: global-deps:
make -C .. deps $(MAKE) -C .. deps
deps: global-deps bins 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: test_expensive
test_expensive: verify_gofmt test_expensive: verify_gofmt
make -C sharness TEST_EXPENSIVE=1 $(MAKE) -C sharness TEST_EXPENSIVE=1
make -C 3nodetest $(MAKE) -C 3nodetest
make -C dependencies $(MAKE) -C dependencies
test_cheap: verify_gofmt test_cheap: verify_gofmt
make -C sharness $(MAKE) -C sharness
make -C 3nodetest $(MAKE) -C 3nodetest
test_race: verify_gofmt test_race: verify_gofmt
make -C sharness GOFLAGS=-race TEST_EXPENSIVE=1 $(MAKE) -C sharness GOFLAGS=-race TEST_EXPENSIVE=1
make -C 3nodetest GOFLAGS=-race $(MAKE) -C 3nodetest GOFLAGS=-race
make -C dependencies GOFLAGS=-race $(MAKE) -C dependencies GOFLAGS=-race
# Misc # Misc

6
test/sharness/Makefile
View File

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