From 46f934eaf28c241c300b5c163e3a8412ff744f25 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 26 Mar 2012 17:13:06 +0200 Subject: [PATCH] repair gpl build --- submodules/build/Makefile | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/submodules/build/Makefile b/submodules/build/Makefile index aa1fa2c70..074c16096 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -22,7 +22,16 @@ enable_gpl_third_parties=yes enable_zrtp=no -.NOTPARALLEL all: build warning +ifeq ($(enable_gpl_third_parties)$(enable_zrtp),noyes) +check_options: + @echo "ZRTP is not available in non-gpl build." + @exit -1 +else +check_options: + +endif + +.NOTPARALLEL all: check_options build warning ifeq ($(enable_gpl_third_parties),yes) warning: @echo @@ -40,18 +49,14 @@ warning: @echo "*****linphone SDK without GPL code ******" @echo "*****************************************************************" @echo "*****************************************************************" - ifeq($(enable_zrtp),yes) - @echo "ZRTP is not available in non-gpl build." - enable_zrtp=no - endif endif -LINPHONE_OPTIONS="enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp)" +LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) enable_zrtp=$(enable_zrtp) build: - make -f builder-iphone-os.mk all $(LINPHONE_OPTIONS) \ - && make -f builder-iphone-simulator.mk all $(LINPHONE_OPTIONS) \ - && make -f builder-iphone-os.mk host=armv7-apple-darwin all $(LINPHONE_OPTIONS) \ + make -f builder-iphone-os.mk $(LINPHONE_OPTIONS) all \ + && make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) all \ + && make -f builder-iphone-os.mk host=armv7-apple-darwin $(LINPHONE_OPTIONS) all \ && make -f builder-iphone-os.mk delivery-sdk ipa: build @@ -73,3 +78,4 @@ veryclean: make -f builder-iphone-simulator.mk veryclean \ && make -f builder-iphone-os.mk veryclean \ && make -f builder-iphone-os.mk host=armv7-apple-darwin veryclean +