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

[Tor Lillqvist]

 Makefile.in                   |    3 +++
 RepositoryModule_host.mk      |    1 -
 ios/Executable_LibreOffice.mk |    6 +-----
 3 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 685a12ac0e4867a5082d08d5cbf500b3a081c14d
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Apr 19 09:27:44 2013 +0300

    Prefer simple and working solution to obscure and non-working
    
    Change-Id: I5c7d02daced542222c2cb3881fafd2d58fe7f14d

diff --git a/Makefile.in b/Makefile.in
index 68b5024..6dea2a1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -224,6 +224,9 @@ bootstrap: compilerplugins
 #
 build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
 	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild
+ifeq ($(OS),IOS)
+	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) ios
+endif
 
 build-nocheck: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
 	$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 3b425d0..9c74108 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -99,7 +99,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	$(call gb_Helper_optional,DESKTOP,idlc) \
 	instsetoo_native \
 	io \
-	ios \
 	javaunohelper \
 	$(call gb_Helper_optional,JFREEREPORT,jfreereport) \
 	$(call gb_Helper_optional,JPEG,jpeg) \
diff --git a/ios/Executable_LibreOffice.mk b/ios/Executable_LibreOffice.mk
index 0104744..69745ad 100644
--- a/ios/Executable_LibreOffice.mk
+++ b/ios/Executable_LibreOffice.mk
@@ -34,14 +34,10 @@ $(eval $(call gb_Executable_add_objcobjects,LibreOffice,\
 
 $(call gb_Executable_use_package,LibreOffice,touch_inc)
 
-# Mark the executable as dependingf on AllModulesButInstsetNative so
-# that it is built only after all libraries that it links to (which
-# might be any of them) have been built.
-
 # Mark the executable as depending on all libraries so that it gets
 # rebuilt if any library has been rebuilt. Avoids need for "make
 # ios.clean".
 
-$(call gb_LinkTarget_get_target,Executable/LibreOffice) : $(call gb_Postprocess_get_target,AllModulesButInstsetNative) $(wildcard $(OUTDIR)/lib/lib*.a)
+$(call gb_LinkTarget_get_target,Executable/LibreOffice) : $(wildcard $(OUTDIR)/lib/lib*.a)
 
 # vim: set ts=4 sw=4 et: