desktop/Library_sofficeapp.mk | 1 -
solenv/gbuild/extensions/pre_MergedLibsList.mk | 4 ++++
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 7931b6d3985a1846bf9db4f51d8af9c54538038b
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Thu Jul 3 13:56:23 2014 +0200
Fix dependencies for libmerged wrt. libsofficeapp
Change-Id: If1575e0bcacbc5c3c40d485063b1025017eef73a
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index d81420f..be86dd1 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_Library_use_libraries,sofficeapp,\
sfx \
svl \
svt \
- sw \
tk \
tl \
ucbhelper \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index b85d36f..99f9302 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -108,6 +108,7 @@ gb_EXTRAMERGEDLIBS := \
# we link all object files from these libraries into one, merged library
gb_MERGEDLIBS := \
avmedia \
+ $(if $(filter $(OS),ANDROID),,basebmp) \
basegfx \
canvastools \
configmgr \
@@ -152,6 +153,9 @@ gb_MERGEDLIBS := \
uui \
vcl \
vclopengl \
+ $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \
+ $(if $(ENABLE_HEADLESS),,vclplug_svp) \
+ ) \
xmlscript \
xo \
xstor \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
