From e08122e368dc41fcdcd0940b4cb57879363b0249 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Wed, 15 Jul 2015 12:09:05 +0200
Subject: [PATCH] prepare.py: do not duplicate package-in-list for each arch
 since this is a general target

---
 prepare.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/prepare.py b/prepare.py
index 333cc5687..0b9fac314 100755
--- a/prepare.py
+++ b/prepare.py
@@ -241,12 +241,6 @@ def generate_makefile(platforms, generator):
         arch_targets += """
 {arch}: all-{arch}
 
-package-in-list-%:
-\tif ! grep -q " $* " <<< " $(packages) "; then \\
-\t\techo "$* not in list of available packages: $(packages)"; \\
-\t\texit 3; \\
-\tfi
-
 {arch}-build:
 \t@for package in $(packages); do \\
 \t\t$(MAKE) {arch}-build-$$package; \\
@@ -272,6 +266,7 @@ package-in-list-%:
 \trm -f WORK/ios-{arch}/Stamp/EP_$*/EP_$*-install;
 
 {arch}-veryclean-%: package-in-list-%
+\ttest -f WORK/ios-{arch}/Build/$*/install_manifest.txt && \\
 \tcat WORK/ios-{arch}/Build/$*/install_manifest.txt | xargs rm; \\
 \trm -rf WORK/ios-{arch}/Build/$*/*; \\
 \trm -f WORK/ios-{arch}/Stamp/EP_$*/*; \\
@@ -331,6 +326,12 @@ all-%:
 \tdone
 \t{generator} WORK/ios-$*/cmake
 
+package-in-list-%:
+\tif ! grep -q " $* " <<< " $(packages) "; then \\
+\t\techo "$* not in list of available packages: $(packages)"; \\
+\t\texit 3; \\
+\tfi
+
 build-%: package-in-list-%
 \t@for arch in $(archs); do \\
 \t\techo "==== starting build of $* for arch $$arch ===="; \\