ios/Executable_LibreOffice.mk | 21 +--------------------
sc/Library_sc.mk | 1 +
sw/Library_sw.mk | 4 ++++
3 files changed, 6 insertions(+), 20 deletions(-)
New commits:
commit cc8ca7fad08e7268e7409ce5d0103d6a3c3aef4d
Author: Tor Lillqvist <t...@iki.fi>
Date: Fri Apr 5 08:50:49 2013 +0300
Try again to use AllModulesButInstsetNative to unbreak tinderbox build
Change-Id: Ib9da3de2cedf423a18819aa83fa55de77a288a72
diff --git a/ios/Executable_LibreOffice.mk b/ios/Executable_LibreOffice.mk
index 07c040e..f4daea8 100644
--- a/ios/Executable_LibreOffice.mk
+++ b/ios/Executable_LibreOffice.mk
@@ -32,26 +32,7 @@ $(eval $(call gb_Executable_add_objcobjects,LibreOffice,\
ios/experimental/LibreOffice/LibreOffice/ViewController \
))
-# The executables built for iOS link to all LO libs statically. The
-# link command just uses the wildcard function to list all of them.
-# Instead of tediously here declare dependencies on the transitive
-# closure of those from which some object ends up being linked in, we
-# list a few libraries that are high in the dependency forest to make
-# it likely that all necessary libraries are built before this
-# executable is.
-$(eval $(call gb_Executable_use_libraries,LibreOffice,\
- for \
- msfilter \
- msword \
- oox \
- sal \
- sc \
- scfilt \
- sdfilt \
- svt \
- svx \
- swui \
-))
+$(call gb_LinkTarget_get_target,Executable/LibreOffice) : $(call
gb_Postprocess_get_target,AllModulesButInstsetNative)
# Mark the executable as depending on all libraries so that it gets
# rebuilt if any library has been rebuilt. Avoids need for "make
commit 2218ff176394892092bd1777201a85615edef442
Author: Tor Lillqvist <t...@iki.fi>
Date: Fri Apr 5 08:50:12 2013 +0300
We need the vbahelper headers especially when DISABLE_SCRIPTING
Change-Id: I632c3f14e4babbdbe2c35810a17bb39d5a42baf6
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 8d89830..0728846 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_add_defs,sc,\
$(eval $(call gb_Library_use_packages,sc,\
oox_inc \
+ vbahelper_inc \
))
$(eval $(call gb_Library_use_sdk_api,sc))
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index d2ba82c..8438bb4 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -73,6 +73,10 @@ $(eval $(call gb_Library_use_libraries,sw,\
$(gb_UWINAPI) \
))
+$(eval $(call gb_Library_use_packages,sw,\
+ vbahelper_inc \
+))
+
$(eval $(call gb_Library_use_externals,sw,\
boost_headers \
icuuc \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
