[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

[jan Iversen]

 ios/CustomTarget_iOS_setup.mk |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit bccb5c54cdcaaea09ee8a3929c7bcc4b94972c11
Author: jan Iversen <jani at libreoffice.org>
Date:   Thu Jan 18 11:38:16 2018 +0100

    iOS, avoid racing conflict in dependencies
    
    WORDIR might be deleted, but generated kept, situation solved
    
    Change-Id: I5847d590affa7f80ef734bf314dbee9a6fc81669

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 28636c7f0759..81dac6686fbb 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -20,19 +20,22 @@ $(call gb_CustomTarget_get_target,ios/iOS_setup): $(IOSGEN)/native-code.h
 
 
 #- Generate dynamic files  ---------------------------------------------------
-$(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
-                         $(SRCDIR)/ios/CustomTarget_iOS_setup.mk \
-	                 $(SRCDIR)/solenv/bin/native-code.py
+$(IOSGEN) $(WORKDIR)/ios:
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
-
-	# prepare directories
 	mkdir -p $(IOSGEN) $(IOSRES) $(IOSRES)/services \
 	         $(IOSRES)/share/config $(IOSRES)/share/filter $(IOSRES)/program \
 	         $(IOSGEN)/simulator \
 	         $(IOSGEN)/debug \
 	         $(IOSGEN)/release \
 	         $(IOSGEN) $(WORKDIR)/ios;
-	# generate file with call declarations
+
+
+
+$(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
+                         $(SRCDIR)/ios/CustomTarget_iOS_setup.mk \
+	                 $(SRCDIR)/solenv/bin/native-code.py
+	                 $(IOSGEN)/ios:
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
 	$(SRCDIR)/solenv/bin/native-code.py \
 	    -C -g core -g writer -g calc -g draw -g edit \
 	    > $(IOSGEN)/native-code.h