aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile12
-rw-r--r--build-root/Makefile2
-rw-r--r--build/external/Makefile4
-rw-r--r--build/external/packages/ipsec-mb.mk2
-rw-r--r--build/external/packages/xdp-tools.mk6
-rw-r--r--docs/Makefile6
-rw-r--r--extras/hs-test/Makefile10
-rw-r--r--extras/strongswan/vpp_sswan/Makefile4
8 files changed, 23 insertions, 23 deletions
diff --git a/Makefile b/Makefile
index 1ab387e94d4..18908faf537 100644
--- a/Makefile
+++ b/Makefile
@@ -495,17 +495,17 @@ test-cov:
.PHONY: test-cov-hs
test-cov-hs:
- @make -C extras/hs-test build-cov
- @make -C extras/hs-test test-cov
+ @$(MAKE) -C extras/hs-test build-cov
+ @$(MAKE) -C extras/hs-test test-cov
.PHONY: test-cov-both
test-cov-both:
@echo "Running Python, Golang tests and merging coverage reports."
find $(BR) -name '*.gcda' -delete
- @make test-cov
+ @$(MAKE) test-cov
find $(BR) -name '*.gcda' -delete
- @make test-cov-hs
- @make cov-merge
+ @$(MAKE) test-cov-hs
+ @$(MAKE) cov-merge
.PHONY: test-cov-build
test-cov-build:
@@ -580,7 +580,7 @@ test-shell-cov:
.PHONY: test-dep
test-dep:
- @make -C test test-dep
+ @$(MAKE) -C test test-dep
.PHONY: test-doc
test-doc:
diff --git a/build-root/Makefile b/build-root/Makefile
index d69a94c1e41..df4434d7629 100644
--- a/build-root/Makefile
+++ b/build-root/Makefile
@@ -997,7 +997,7 @@ $(PLATFORM_IMAGE_DIR)/ro.img ro-image: $(patsubst %,%-find-source,$(ROOT_PACKAGE
| xargs sign $($(PLATFORM)_public_key) \
$($(PLATFORM)_private_key_passphrase) ; \
fi ; \
- : make read-only file system ; \
+ : $(MAKE) read-only file system ; \
mksquashfs \
$${tmp_dir} $${ro_image} \
-no-exports -no-progress -no-recovery ; \
diff --git a/build/external/Makefile b/build/external/Makefile
index 046dd7484ae..3cb7b47f436 100644
--- a/build/external/Makefile
+++ b/build/external/Makefile
@@ -94,7 +94,7 @@ build-deb: $(DEV_DEB)
install-deb:
ifneq ($(INSTALLED_VER),$(DEB_VER)-$(PKG_SUFFIX))
- @make $(DEV_DEB)
+ @$(MAKE) $(DEV_DEB)
@sudo dpkg -i $(DEV_DEB)
else
@echo "=========================================================="
@@ -175,7 +175,7 @@ ifeq ($(INSTALLED_VER)$(INSTALLED_RPM_VER),)
$(MAKE) config
else
ifneq ($(INSTALLED_VER),)
- make check-deb
+ $(MAKE) check-deb
endif
ifneq ($(INSTALLED_RPM_VER),)
$(MAKE) check-rpm
diff --git a/build/external/packages/ipsec-mb.mk b/build/external/packages/ipsec-mb.mk
index d38f2e306ea..ffdbcd23fb2 100644
--- a/build/external/packages/ipsec-mb.mk
+++ b/build/external/packages/ipsec-mb.mk
@@ -32,7 +32,7 @@ define ipsec-mb_config_cmds
endef
define ipsec-mb_build_cmds
- @make -C $(ipsec-mb_src_dir)/lib -j \
+ @$(MAKE) -C $(ipsec-mb_src_dir)/lib -j \
SHARED=n \
SAFE_PARAM=n \
SAFE_LOOKUP=n \
diff --git a/build/external/packages/xdp-tools.mk b/build/external/packages/xdp-tools.mk
index b65ae1361f5..b9285971f42 100644
--- a/build/external/packages/xdp-tools.mk
+++ b/build/external/packages/xdp-tools.mk
@@ -24,15 +24,15 @@ define xdp-tools_config_cmds
endef
define xdp-tools_build_cmds
- @cd ${xdp-tools_src_dir} && make V=1 BUILD_STATIC_ONLY=y > $(xdp-tools_build_log)
+ @cd ${xdp-tools_src_dir} && $(MAKE) V=1 BUILD_STATIC_ONLY=y > $(xdp-tools_build_log)
endef
define xdp-tools_install_cmds
@rm -f $(xdp-tools_install_log)
@cd ${xdp-tools_src_dir} && \
- make -C lib/libbpf/src install V=1 BUILD_STATIC_ONLY=y PREFIX='' DESTDIR='$(xdp-tools_install_dir)' >> $(xdp-tools_install_log)
+ $(MAKE) -C lib/libbpf/src install V=1 BUILD_STATIC_ONLY=y PREFIX='' DESTDIR='$(xdp-tools_install_dir)' >> $(xdp-tools_install_log)
@cd ${xdp-tools_src_dir} && \
- make libxdp_install V=1 BUILD_STATIC_ONLY=y PREFIX='' DESTDIR='$(xdp-tools_install_dir)' >> $(xdp-tools_install_log)
+ $(MAKE) libxdp_install V=1 BUILD_STATIC_ONLY=y PREFIX='' DESTDIR='$(xdp-tools_install_dir)' >> $(xdp-tools_install_log)
endef
$(eval $(call package,xdp-tools))
diff --git a/docs/Makefile b/docs/Makefile
index 01e8d659bff..9f209357113 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -70,7 +70,7 @@ venv:
spell: venv
@( \
. ${VENV_DIR}/bin/activate; \
- make -C ${SCRIPTS_DIR} generate && \
+ $(MAKE) -C ${SCRIPTS_DIR} generate && \
$(SPHINXBUILD) -b spelling $(SPHINXOPTS) $(BUILDDIR_SRC) $(BUILDDIR_OUT); \
)
@@ -81,7 +81,7 @@ rebuild-spell: clean spell
docs: venv
@( \
. ${VENV_DIR}/bin/activate; \
- make -C ${SCRIPTS_DIR} generate && \
+ $(MAKE) -C ${SCRIPTS_DIR} generate && \
$(SPHINXBUILD) $(SPHINXOPTS) -b html $(BUILDDIR_SRC) $(BUILDDIR_OUT); \
)
@@ -90,7 +90,7 @@ rebuild: clean docs
.PHONY: clean
clean:
- @make -C ${SCRIPTS_DIR} clean
+ @$(MAKE) -C ${SCRIPTS_DIR} clean
.PHONY: build
build: docs
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)