From ab48064b08552c677ace81b1b00e2e7659e43596 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Mon, 27 Oct 2014 16:54:00 +0100 Subject: [PATCH] Remove armv7s target, since it is not used anymore by Xcode --- submodules/build/Makefile | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/submodules/build/Makefile b/submodules/build/Makefile index c7a0cfcc5..d52396a5b 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -87,24 +87,19 @@ LINPHONE_OPTIONS=enable_gpl_third_parties=$(enable_gpl_third_parties) \ armv7-%: make -f builder-iphone-os.mk $(LINPHONE_OPTIONS) $* -armv7s-%: - make -f builder-iphone-os.mk host=armv7s-apple-darwin $(LINPHONE_OPTIONS) $* - simu-%: make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) $* build-% clean-% veryclean-%: make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) $@ \ - && make -f builder-iphone-os.mk $(LINPHONE_OPTIONS) $@ \ - && make -f builder-iphone-os.mk host=armv7s-apple-darwin $(LINPHONE_OPTIONS) $@ + && make -f builder-iphone-os.mk $(LINPHONE_OPTIONS) $@ -# sends the target after 'broadcast_' to all sub-architectures (armv7, armv7s, simulator) +# sends the target after 'broadcast_' to all sub-architectures (armv7, simulator) broadcast_%: @echo "Broadcasting target '$*' to all sub-architectures" make -f builder-iphone-simulator.mk $(LINPHONE_OPTIONS) $* \ - && make -f builder-iphone-os.mk $(LINPHONE_OPTIONS) $* \ - && make -f builder-iphone-os.mk host=armv7s-apple-darwin $(LINPHONE_OPTIONS) $* + && make -f builder-iphone-os.mk $(LINPHONE_OPTIONS) $* sdk: make -f builder-iphone-os.mk delivery-sdk @@ -127,7 +122,7 @@ zipres: help: @echo "(please read the README file first)" - @echo "Available architectures: armv7, armv7s, simu" + @echo "Available architectures: armv7, simu" @echo "Available targets:" @echo "" @echo " * all : builds all architectures and creates the liblinphone sdk" @@ -142,7 +137,6 @@ help: @echo " * veryclean-[package] : completely clean the package for all architectures" @echo "" @echo " * armv7-build-[package] : builds a package for the armv7 architecture" - @echo " * armv7s-build-[package] : builds a package for the armv7s architecture" @echo " * simu-build-[package] : builds a package for the simulator architecture" @echo "" @echo " * [arch]-clean-[package] : clean the package for the selected architecture"