From ca2eb44e26c7b2b5f5230b68c92bc104ce851997 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Mon, 19 Jan 2015 09:25:16 +0100 Subject: [PATCH] Improve Android Makefile to include check_tools.mk only when it's ready --- Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 021a17959..5ec3b3d17 100644 --- a/Makefile +++ b/Makefile @@ -66,15 +66,16 @@ APP_STL=stlport_static # Checks CHECK_MSG=$(shell ./check_tools.sh) -ifeq ($(BUILD_OPENH264),1) - ifneq ($(shell echo $(NDK_MAJOR_VERSION)\>=10 | bc),1) - $(error ndk version [$(NDK_MAJOR_VERSION)] not compatible with opensh264.) - endif -endif -include check_tools.mk ifneq ($(CHECK_MSG),) - $(error Some tools are missing.) + $(error Some tools are missing.) +else + ifeq ($(BUILD_OPENH264),1) + ifneq ($(shell echo $(NDK_MAJOR_VERSION)\>=10 | bc),1) +$(error ndk version [$(NDK_MAJOR_VERSION)] not compatible with openh264.) + endif + endif + include check_tools.mk endif OPENSSL_DIR=$(shell openssl version -d | sed "s/OPENSSLDIR: \"\(.*\)\"/\1/")