Module: kamailio Branch: master Commit: 2306dd47b308f99e5c22c2d6f4d2bc1200ed8453 URL: https://github.com/kamailio/kamailio/commit/2306dd47b308f99e5c22c2d6f4d2bc1… Author: Guillem Jover <gjover(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-08-01T13:29:35+02:00 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 --- Modified: doc/tutorials/rpc_list/Makefile Modified: src/modules/db_berkeley/Makefile Modified: src/modules/db_oracle/Makefile Modified: src/modules/db_sqlite/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/2306dd47b308f99e5c22c2d6f4d2bc1… Patch: https://github.com/kamailio/kamailio/commit/2306dd47b308f99e5c22c2d6f4d2bc1… --- diff --git a/doc/tutorials/rpc_list/Makefile b/doc/tutorials/rpc_list/Makefile index c9ff69051c..e105064365 100644 --- a/doc/tutorials/rpc_list/Makefile +++ b/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) diff --git a/src/modules/db_berkeley/Makefile b/src/modules/db_berkeley/Makefile index 23013003f2..a33bc58e3e 100644 --- a/src/modules/db_berkeley/Makefile +++ b/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 diff --git a/src/modules/db_oracle/Makefile b/src/modules/db_oracle/Makefile index d30c7515ba..77a52af0f2 100644 --- a/src/modules/db_oracle/Makefile +++ b/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 diff --git a/src/modules/db_sqlite/Makefile b/src/modules/db_sqlite/Makefile index c5f164cc37..92e4de58c1 100644 --- a/src/modules/db_sqlite/Makefile +++ b/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