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

[Tor Lillqvist]

 ios/Executable_LibreOffice.mk |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 316ecfbfbda63f354b80d7f1ccd29d973fb8c6a9
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Oct 8 22:45:17 2013 +0300

    Depend on more libraries
    
    Change-Id: Ied2880861a89117294b9d29f42e6d5a6745ad1d2

diff --git a/ios/Executable_LibreOffice.mk b/ios/Executable_LibreOffice.mk
index add0875..2db76dc 100644
--- a/ios/Executable_LibreOffice.mk
+++ b/ios/Executable_LibreOffice.mk
@@ -36,6 +36,14 @@ $(eval $(call gb_Executable_add_objcobjects,LibreOffice,\
 # rebuilt if any library has been rebuilt. Avoids need for "make
 # ios.clean".
 
-$(WORKDIR)/LinkTarget/Executable/LibreOffice : $(wildcard $(OUTDIR)/lib/lib*.a)
+# Yeah, this isn't the full list. I couldn't be bothered. Do we want to
+# list everything here, too (as in gb_LinkTarget__command_dynamiclink in
+# solenv/gbuild/platform/IOS_ARM_GCC.mk)? Should we have a global gb_
+# variable for that list? (To be used for Android builds, too.)
+
+$(WORKDIR)/LinkTarget/Executable/LibreOffice : \
+    $(wildcard $(OUTDIR)/lib/lib*.a) \
+    $(wildcard $(INSTDIR)/$(LIBO_LIB_FOLDER)/lib*.a) \
+    $(wildcard $(WORKDIR)/LinkTarget/StaticLibrary/lib*.a)
 
 # vim: set ts=4 sw=4 et: