@cryptotaxi247 / kubo / commits / f3dc11c56

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

License: MIT Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>

Jakub Sztandera committed Jul 27, 2016 at 15:38 UTC f3dc11c56604079a1fe73c8cd951e89d3e28ef69
3 files changed +21 -21
Makefile
+9 -9
@@ -58,19 +58,19 @@ vendor: godep
58 godep save -r ./...
59
60 install: deps
61 - make -C cmd/ipfs install
61 + $(MAKE) -C cmd/ipfs install
62
63 build: deps
64 - make -C cmd/ipfs build
64 + $(MAKE) -C cmd/ipfs build
65
66 nofuse: deps
67 - make -C cmd/ipfs nofuse
67 + $(MAKE) -C cmd/ipfs nofuse
68
69 clean:
70 - make -C cmd/ipfs clean
70 + $(MAKE) -C cmd/ipfs clean
71
72 uninstall:
73 - make -C cmd/ipfs uninstall
73 + $(MAKE) -C cmd/ipfs uninstall
74
75 PHONY += all help godep gx_check
76 PHONY += go_check deps vendor install build nofuse clean uninstall
@@ -97,16 +97,16 @@ test_go_race:
97 $(go_test) ./... -race
98
99 test_sharness_short:
100 - make -j1 -C test/sharness/
100 + $(MAKE) -j1 -C test/sharness/
101
102 test_sharness_expensive:
103 - TEST_EXPENSIVE=1 make -j1 -C test/sharness/
103 + TEST_EXPENSIVE=1 $(MAKE) -j1 -C test/sharness/
104
105 test_all_commits:
106 @echo "testing all commits between origin/master..HEAD"
107 @echo "WARNING: this will 'git rebase --exec'."
108 @test/bin/continueyn
109 - GIT_EDITOR=true git rebase -i --exec "make test" origin/master
109 + GIT_EDITOR=true git rebase -i --exec "$(MAKE) test" origin/master
110
111 test_all_commits_travis:
112 # these are needed because travis.
@@ -114,7 +114,7 @@ test_all_commits_travis:
114 git config --global user.email "nemo@ipfs.io"
115 git config --global user.name "IPFS BOT"
116 git fetch origin master:master
117 - GIT_EDITOR=true git rebase -i --exec "make test" master
117 + GIT_EDITOR=true git rebase -i --exec "$(MAKE) test" master
118
119 # since we have CI for osx and linux but not windows, this should help
120 windows_build_check:
test/Makefile
+9 -9
@@ -15,7 +15,7 @@ GOFLAGS =
15 all: deps
16
17 global-deps:
18 - make -C .. deps
18 + $(MAKE) -C .. deps
19
20 deps: global-deps bins
21
@@ -71,18 +71,18 @@ bin/iptb: iptb_src $(call find_go_files, $(IPTB_SRC)) IPFS-BUILD-OPTIONS
71 test: test_expensive
72
73 test_expensive: verify_gofmt
74 - make -C sharness TEST_EXPENSIVE=1
75 - make -C 3nodetest
76 - make -C dependencies
74 + $(MAKE) -C sharness TEST_EXPENSIVE=1
75 + $(MAKE) -C 3nodetest
76 + $(MAKE) -C dependencies
77
78 test_cheap: verify_gofmt
79 - make -C sharness
80 - make -C 3nodetest
79 + $(MAKE) -C sharness
80 + $(MAKE) -C 3nodetest
81
82 test_race: verify_gofmt
83 - make -C sharness GOFLAGS=-race TEST_EXPENSIVE=1
84 - make -C 3nodetest GOFLAGS=-race
85 - make -C dependencies GOFLAGS=-race
83 + $(MAKE) -C sharness GOFLAGS=-race TEST_EXPENSIVE=1
84 + $(MAKE) -C 3nodetest GOFLAGS=-race
85 + $(MAKE) -C dependencies GOFLAGS=-race
86
87 # Misc
88
test/sharness/Makefile
+3 -3
@@ -34,7 +34,7 @@ aggregate: clean-test-results $(T)
34 lib/test-aggregate-results.sh
35
36 global-deps:
37 - make -C ../.. deps
37 + $(MAKE) -C ../.. deps
38
39 deps: global-deps $(SHARNESS) $(BINS) curl
40
@@ -43,10 +43,10 @@ $(SHARNESS): FORCE
43 lib/install-sharness.sh
44
45 bin/%: FORCE
46 - make -C .. GOFLAGS=$(GOFLAGS) $@
46 + $(MAKE) -C .. GOFLAGS=$(GOFLAGS) $@
47
48 race:
49 - make GOFLAGS=-race all
49 + $(MAKE) GOFLAGS=-race all
50
51 .PHONY: all clean $(T) aggregate FORCE
52