Library_merged.mk | 1 -
android/qa/desktop/Makefile | 1 -
android/qa/sc/Makefile | 3 +--
solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 +
4 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit e63ef01f4a35e4def0f6b215b21dd037cfde0ce1
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Mon Feb 13 20:37:26 2012 +0200
There is no libvclplug_svplo for Android
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 8afa932..6899483 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -117,7 +117,6 @@ copy-stuff:
utllo \
vbahelperlo \
vcllo \
- vclplug_svplo \
xcrlo \
xml2 \
xmlreader \
commit 91ff2c928abbe42312a7df04859b9b1a51617041
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Mon Feb 13 20:36:49 2012 +0200
Need libsal_textenc
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index a9425ae..8afa932 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -91,6 +91,7 @@ copy-stuff:
ooxlo \
reflection.uno \
reg \
+ sal_textenc \
saxlo \
sclo \
scfiltlo \
commit bf9cfb0f56fecb356f43d0faf107d961f9ba7453
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Mon Feb 13 20:09:38 2012 +0200
Add sb to libmerged
diff --git a/Library_merged.mk b/Library_merged.mk
index ac55cdc..d1af075 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
sal \
salhelper \
sax \
- sb \
sot \
svl \
svt \
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index efe0040..c9f4c61 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -147,7 +147,6 @@ copy-stuff: buildrcs
reflection.uno \
reg \
saxlo \
- sblo \
sclo \
scfiltlo \
sfxlo \
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index a57ecab..a9425ae 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -92,7 +92,6 @@ copy-stuff:
reflection.uno \
reg \
saxlo \
- sblo \
sclo \
scfiltlo \
sfxlo \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index ebd70a3..cff4b19 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -43,6 +43,7 @@ gb_MERGEDLIBS := \
fwm \
lng \
package2 \
+ sb \
sfx \
sofficeapp \
spl \
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
