[Bf-blender-cvs] [410cde82e35] master: Fix "make deps" error when building deps with make and Blender with ninja

[Brecht Van Lommel]

Commit: 410cde82e352d5f4f3588a6e179a22779a7dd3ab
Author: Brecht Van Lommel
Date:   Fri Aug 30 17:47:57 2019 +0200
Branches: master
https://developer.blender.org/rB410cde82e352d5f4f3588a6e179a22779a7dd3ab

Fix "make deps" error when building deps with make and Blender with ninja

===================================================================

M	GNUmakefile

===================================================================

diff --git a/GNUmakefile b/GNUmakefile
index 4462a13207e..d17596d203d 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -233,12 +233,19 @@ endif
 ifneq "$(findstring ninja, $(MAKECMDGOALS))" ""
 	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -G Ninja
 	BUILD_COMMAND:=ninja
+	DEPS_BUILD_COMMAND:=ninja
 else
 	ifneq ("$(wildcard $(BUILD_DIR)/build.ninja)","")
 		BUILD_COMMAND:=ninja
 	else
 		BUILD_COMMAND:=make -s
 	endif
+
+	ifneq ("$(wildcard $(DEPS_BUILD_DIR)/build.ninja)","")
+		DEPS_BUILD_COMMAND:=ninja
+	else
+		DEPS_BUILD_COMMAND:=make -s
+	endif
 endif
 
 # -----------------------------------------------------------------------------
@@ -333,7 +340,7 @@ deps: .FORCE
 
 	@echo
 	@echo Building dependencies ...
-	$(BUILD_COMMAND) -C "$(DEPS_BUILD_DIR)" -j $(NPROCS) $(DEPS_TARGET)
+	$(DEPS_BUILD_COMMAND) -C "$(DEPS_BUILD_DIR)" -j $(NPROCS) $(DEPS_TARGET)
 	@echo
 	@echo Dependencies successfully built and installed to $(DEPS_INSTALL_DIR).
 	@echo