solenv/gbuild/extensions/pre_MergedLibsList.mk | 3 ---
1 file changed, 3 deletions(-)
New commits:
commit df90b5a1c9b602e524d0f92c7066c912f611b03b
Author: Oliver Specht <oliver.spe...@cib.de>
Date: Thu Apr 28 20:04:55 2016 +0200
Revert "add additional modules to merged lib"
Breaks tinderbox build in cppumaker
This reverts commit 3393e04edd0f4f6baf5faeda2ed761332f45d9e5.
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 307351d..cd2a0df 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -10,7 +10,6 @@
# we link all object files from these libraries into one, merged library
MERGE_LIBRARY_LIST := \
- acc \
avmedia \
basegfx \
canvastools \
@@ -24,7 +23,6 @@ MERGE_LIBRARY_LIST := \
$(if $(USING_X11),desktop_detector) \
drawinglayer \
editeng \
- expwrap \
filterconfig \
fsstorage \
fwe \
@@ -45,7 +43,6 @@ MERGE_LIBRARY_LIST := \
sofficeapp \
sot \
$(if $(ENABLE_HEADLESS),,spl) \
- store \
svl \
svt \
svx \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
