소스 검색

build: Call make via $(MAKE)

When we need to call make from within a Makefile, we should do so by
using the MAKE variable, which has special meaning for make itself.
This makes sure, it will get marked as recursive command, and will
make it possible to use the make jobserver.

Change-Id: I6829f3ee0a830fc8273e1dffe696382fccc6a093
Guillem Jover 6 년 전
부모
커밋
2306dd47b3
4개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 2 2
      doc/tutorials/rpc_list/Makefile
  2. 1 1
      src/modules/db_berkeley/Makefile
  3. 1 1
      src/modules/db_oracle/Makefile
  4. 1 1
      src/modules/db_sqlite/Makefile

+ 2 - 2
doc/tutorials/rpc_list/Makefile

@@ -148,7 +148,7 @@ c_defsX=-DNAME='\"kamailio\"' -DVERSION='\"5.1.0-dev3\"' -DARCH='\"x86_64\"' \
 	   -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DHAVE_EPOLL -DHAVE_SIGIO_RT \
 	   -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT
 
-c_defs=$(subst ^^,='\",$(subst ",\"',$(subst =",^^,$(shell make -s -C ../../../src printcdefs))))
+c_defs=$(subst ^^,='\",$(subst ",\"',$(subst =",^^,$(shell $(MAKE) -s -C ../../../src printcdefs))))
 
 c_defs+= -DMOD_NAME='\"rpcgen\"'
 c_defs+= -I$(COREPATH)/modules/app_sqlang/squirrel/include
@@ -176,7 +176,7 @@ get_listed_grp=$(word 2, $(subst :, ,$(1)))
 # get module interface define
 get_modiface=$(word 3, $(subst :, ,$(1)))
 
-find_modiface=$(if $(findstring modules,$(1)),$(shell make -s -C $(dir $(1)) printmiface),-DNONE)
+find_modiface=$(if $(findstring modules,$(1)),$(shell $(MAKE) -s -C $(dir $(1)) printmiface),-DNONE)
 
 # get base file name from file:grp: get_bname(file:grp)
 # => basename(file) without extension (e.g. get_bname(foo/bar.c:x) => bar)

+ 1 - 1
src/modules/db_berkeley/Makefile

@@ -25,7 +25,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
 # extra install for kamailio
 
 install-berkeley-scripts: $(bin_prefix)/$(bin_dir)
-		BERKELEYDBON=yes make -C ../../../utils/kamctl/ install-modules
+	BERKELEYDBON=yes $(MAKE) -C ../../../utils/kamctl/ install-modules
 
 install-scripts: install-berkeley-scripts
 

+ 1 - 1
src/modules/db_oracle/Makefile

@@ -17,7 +17,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
 # extra install for kamailio
 
 install-oracle-scripts: $(bin_prefix)/$(bin_dir)
-		ORACLEON=yes make -C ../../../utils/kamctl/ install-modules
+	ORACLEON=yes $(MAKE) -C ../../../utils/kamctl/ install-modules
 
 install-scripts: install-oracle-scripts
 

+ 1 - 1
src/modules/db_sqlite/Makefile

@@ -20,7 +20,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
 # extra install for kamailio
 
 install-sqlite-scripts: $(bin_prefix)/$(bin_dir)
-		SQLITEON=yes make -C ../../../utils/kamctl/ install-modules
+	SQLITEON=yes $(MAKE) -C ../../../utils/kamctl/ install-modules
 
 install-scripts: install-sqlite-scripts