diff options
| author |   Renato Botelho do Couto <renato@netgate.com> | 2024-06-05 18:11:46 +0000 |
|---|---|---|
| committer |   Damjan Marion <dmarion@0xa5.net> | 2024-06-10 13:13:31 +0000 |
| commit | 893dacae3f93dcab24fdeb0c7e4a44d30b2db0ee (patch) | |
| tree | 56d5bfe824098b8c729bebaf87cfef056c8b97f4 /extras | |
| parent | fa500e98543989e4cdcbedac19a525d55a8558d5 (diff) | |
build: Use $(MAKE) instead of direct call to make
No functional changes, just make it to respect original make binary
name used to start building
Type: improvement
Change-Id: Ic8568237fbb39c6a0d3b7405a9670e9410aeb752
Signed-off-by: Renato Botelho do Couto <renato@netgate.com>
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/hs-test/Makefile | 10 | ||||
| -rw-r--r-- | extras/strongswan/vpp_sswan/Makefile | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/extras/hs-test/Makefile b/extras/hs-test/Makefile index dc34e5332ea..d459d9d916c 100644 --- a/extras/hs-test/Makefile +++ b/extras/hs-test/Makefile @@ -87,15 +87,15 @@ list-tests: .PHONY: build-vpp-release build-vpp-release: - @make -C ../.. build-release + @$(MAKE) -C ../.. build-release .PHONY: build-vpp-debug build-vpp-debug: - @make -C ../.. build + @$(MAKE) -C ../.. build .PHONY: build-vpp-gcov build-vpp-gcov: - @make -C ../.. build-vpp-gcov + @$(MAKE) -C ../.. build-vpp-gcov .build.ok: build @touch .build.ok @@ -129,7 +129,7 @@ test-cov: .deps.ok .build.cov.ok -bash ./test --persist=$(PERSIST) --verbose=$(VERBOSE) \ --unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST-HS) --cpus=$(CPUS) \ --vppsrc=$(VPPSRC) - @make -C ../.. test-cov-post HS_TEST=1 + @$(MAKE) -C ../.. test-cov-post HS_TEST=1 @bash ./script/compress.sh .PHONY: build-go @@ -155,7 +155,7 @@ build-debug: .deps.ok build-vpp-debug build-go @touch .build.ok .deps.ok: - @sudo make install-deps + @sudo $(MAKE) install-deps .PHONY: install-deps install-deps: diff --git a/extras/strongswan/vpp_sswan/Makefile b/extras/strongswan/vpp_sswan/Makefile index 254b90b3b09..85fb506f346 100644 --- a/extras/strongswan/vpp_sswan/Makefile +++ b/extras/strongswan/vpp_sswan/Makefile @@ -76,8 +76,8 @@ install-swan: echo "SSWAN not downloaded, please run "make" or "make pull-swan" first." ; \ exit 1 ; \ fi - cd ${SWANDIR} && make -j$(nproc) - cd ${SWANDIR} && sudo make install + cd ${SWANDIR} && $(MAKE) -j$(nproc) + cd ${SWANDIR} && sudo $(MAKE) install # check if VPP is installed ifneq ($(shell test "$(shell ldconfig -p | grep vppinfra.so | awk 'NR==1{print $$1;}')" && echo "yes"), yes) |