From dfe315ac5fcf0ea049c18e61a847c6d7e7d7c2ce Mon Sep 17 00:00:00 2001 From: jimying Date: Tue, 14 Mar 2023 17:36:44 +0800 Subject: [PATCH] makefile: use $(MAKE) replace make (for BSD compatibility) (#3436) --- Makefile | 4 ++-- build/rules.mak | 2 +- self-test.mak | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index ec285aa2b..2d5c31c90 100644 --- a/Makefile +++ b/Makefile @@ -125,10 +125,10 @@ pjsua-test: cmp_wav cd tests/pjsua && python runall.py -t 2 cmp_wav: - cd tests/pjsua/tools && make + $(MAKE) -C tests/pjsua/tools fuzz: - cd tests/fuzz && make + $(MAKE) -C tests/fuzz install: mkdir -p $(DESTDIR)$(libdir)/ diff --git a/build/rules.mak b/build/rules.mak index eeb6996d8..a7735d08e 100644 --- a/build/rules.mak +++ b/build/rules.mak @@ -149,7 +149,7 @@ $(OBJDIR)/$(app).ko: $(OBJDIR)/$(app).o | $(OBJDIRS) @echo all: >> $(OBJDIR)/Makefile @echo -e "\tmake -C $(KERNEL_DIR) M=`pwd`/$(OBJDIR) modules $(KERNEL_ARCH)" >> $(OBJDIR)/Makefile @echo Invoking kbuild... - make -C $(OBJDIR) + $(MAKE) -C $(OBJDIR) ../lib/$(app).ko: $(LIB) $(OBJDIR)/$(app).ko cp $(OBJDIR)/$(app).ko ../lib diff --git a/self-test.mak b/self-test.mak index 7685f9eff..6ec22fdf8 100644 --- a/self-test.mak +++ b/self-test.mak @@ -23,17 +23,17 @@ CPP_DIR=pjlib pjlib-util pjnath pjmedia pjsip .PHONY: build_test distclean rm_build_mak build_mak everything pjlib_test pjlib_util_test pjnath_test pjsip_test cpp_prep cpp_test cpp_post pjsua_test distclean: - make distclean + $(MAKE) distclean rm_build_mak: rm -f build.mak build_mak: ./configure - make dep + $(MAKE) dep everything: - make + $(MAKE) pjlib_test: cd pjlib/bin && ./pjlib-test-`../../config.guess` @@ -49,14 +49,14 @@ pjsip_test: cpp_prep: for dir in $(CPP_DIR); do \ - make -C $$dir/build clean; \ + $(MAKE) -C $$dir/build clean; \ done cpp_test: - make -f c++-build.mak + $(MAKE) -f c++-build.mak cpp_post: - make -f c++-build.mak clean + $(MAKE) -f c++-build.mak clean pjsua_test: pjsua_config_file pjsua_local_port0 pjsua_ip_addr pjsua_no_tcp pjsua_no_udp pjsua_outbound pjsua_use_ice pjsua_add_codec pjsua_clock_rate pjsua_play_file pjsua_play_tone pjsua_rec_file pjsua_rtp_port pjsua_quality pjsua_ptime pjsua_ectail @echo pjsua_test completed successfully