Library_merged.mk
| 81 ++++++++--
android/experimental/DocumentLoader/Makefile
| 4
android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
| 1
android/experimental/LibreOffice4Android/Makefile
| 4
android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
| 1
android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
| 1
android/qa/desktop/Makefile
| 4
android/qa/sc/Makefile
| 3
solenv/gbuild/extensions/pre_MergedLibsList.mk
| 4
9 files changed, 74 insertions(+), 29 deletions(-)
New commits:
commit 4967a9d8f96987354b8b55d861e2e3f6fa93e7a4
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Sat Apr 7 15:53:35 2012 +0200
libmerged: add fsstorage, svl, sot, vcl
Change-Id: Ibebf00d99fdf8212afbdba21ca13844d2ff1c412
diff --git a/Library_merged.mk b/Library_merged.mk
index cc54e95..da48a93 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -23,6 +23,11 @@
$(eval $(call gb_Library_Library,merged))
+# gb_MERGEDLIBS is defined in solenv/gbuild/extensions/pre_MergedLibsList.mk
+$(eval $(call gb_Library_use_library_objects,merged,\
+ $(gb_MERGEDLIBS) \
+))
+
$(eval $(call gb_Library_use_libraries,merged,\
basegfx \
comphelper \
@@ -34,21 +39,21 @@ $(eval $(call gb_Library_use_libraries,merged,\
sal \
salhelper \
sax \
- sot \
- svl \
tl \
ucbhelper \
utl \
- vcl \
xmlreader \
$(gb_STDLIBS) \
))
$(eval $(call gb_Library_use_externals,merged,\
+ graphite \
+ icule \
icuuc \
jpeg \
+ lcms2 \
libxml2 \
- telepathy \
+ nss3 \
zlib \
))
@@ -58,21 +63,57 @@ $(eval $(call gb_Library_use_externals,merged,\
))
endif
-# gb_MERGEDLIBS is defined in solenv/gbuild/extensions/pre_MergedLibsList.mk
-$(eval $(call gb_Library_use_library_objects,merged,\
- $(gb_MERGEDLIBS) \
+ifneq ($(OS),IOS)
+$(eval $(call gb_Library_use_libraries,merged,\
+ jvmaccess \
))
+endif
+
+ifeq ($(GUIBASE),unx)
+$(eval $(call gb_Library_use_externals,merged,\
+ fontconfig \
+ freetype \
+))
+endif
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_use_libraries,merged,\
+ dl \
+ m \
+ pthread \
+))
+endif
ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_libraries,merged,\
advapi32 \
gdi32 \
+ gdiplus \
+ imm32 \
+ mpr \
+ msimg32 \
+ $(gb_Library_win32_OLDNAMES) \
ole32 \
oleaut32 \
shell32 \
user32 \
uuid \
+ version \
winmm \
+ winspool \
+))
+endif
+
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_use_libraries,merged,\
+ AppleRemote \
+ objc \
+))
+$(eval $(call gb_Library_use_externals,merged,\
+ carbon \
+ cocoa \
+ corefoundation \
+ quicktime \
))
endif
@@ -80,12 +121,30 @@ ifeq ($(OS),ANDROID)
$(eval $(call gb_Library_use_libraries,merged,\
libotouch \
))
+$(eval $(call gb_Library_add_libs,merged,\
+ -llog \
+ -landroid \
+ -llo-bootstrap \
+))
endif
-ifeq ($(OS),MACOSX)
-$(eval $(call gb_Library_use_libraries,merged,\
- objc \
- Cocoa \
+ifeq ($(OS),IOS)
+$(eval $(call gb_Library_use_externals,merged,\
+ corefoundation \
+ uikit \
+))
+endif
+
+ifneq ($(ENABLE_LIBRSVG),NO)
+$(eval $(call gb_Library_use_externals,merged,\
+ cairo \
+))
+endif
+
+ifeq ($(ENABLE_TELEPATHY),TRUE)
+$(eval $(call gb_Library_use_externals,merged,\
+ gtk \
+ telepathy \
))
endif
diff --git a/android/experimental/DocumentLoader/Makefile
b/android/experimental/DocumentLoader/Makefile
index 279f6a4..b9a75ee 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -69,7 +69,6 @@ copy-stuff:
forlo \
foruilo \
frmlo \
- fsstorage.uno \
gcc3_uno \
hwplo \
i18nisolang1gcc3 \
@@ -103,11 +102,9 @@ copy-stuff:
scfiltlo \
sddlo \
smdlo \
- sotlo \
stocservices.uno \
store \
svgfilterlo \
- svllo \
swdlo \
swlo \
t602filterlo \
@@ -127,7 +124,6 @@ copy-stuff:
vbaswobj.uno \
wpftdrawlo \
wpftwriterlo \
- vcllo \
xml2 \
xmlfdlo \
xmlreader \
diff --git
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index 97797df..39a8f01 100644
---
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -933,7 +933,6 @@ public class DocumentLoader
// Load a lot of shlibs here explicitly in advance because that
// makes debugging work better, sigh
- Bootstrap.dlopen("libvcllo.so");
Bootstrap.dlopen("libmergedlo.so");
Bootstrap.dlopen("libswdlo.so");
Bootstrap.dlopen("libswlo.so");
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index 0bfbf3b..bb2c02e 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -39,7 +39,6 @@ copy-stuff:
forlo \
foruilo \
frmlo \
- fsstorage.uno \
gcc3_uno \
hwplo \
hyphenlo \
@@ -79,12 +78,10 @@ copy-stuff:
sdlo \
sddlo \
smdlo \
- sotlo \
spelllo \
stocservices.uno \
store \
svgfilterlo \
- svllo \
swdlo \
swlo \
swdlo \
@@ -105,7 +102,6 @@ copy-stuff:
vbaswobj.uno \
wpftdrawlo \
wpftwriterlo \
- vcllo \
xml2 \
xmlfdlo \
xmlreader \
diff --git
a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
index bfa3eec..9f9790c 100644
---
a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
+++
b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
@@ -963,7 +963,6 @@ public class DocumentLoader
// Load a lot of shlibs here explicitly in advance because that
// makes debugging work better, sigh
- Bootstrap.dlopen("libvcllo.so");
Bootstrap.dlopen("libmergedlo.so");
Bootstrap.dlopen("libswdlo.so");
Bootstrap.dlopen("libswlo.so");
diff --git
a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
index 2a2b22f..c2ce1d4 100644
---
a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
+++
b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -747,7 +747,6 @@ class ListItemAdapter implements ListAdapter{
// Load a lot of shlibs here explicitly in advance because
that
// makes debugging work better, sigh
- Bootstrap.dlopen("libvcllo.so");
Bootstrap.dlopen("libmergedlo.so");
Bootstrap.dlopen("libswdlo.so");
Bootstrap.dlopen("libswlo.so");
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 7ad9ac0..3c9efd7 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -101,7 +101,6 @@ copy-stuff: buildrcs
expwrap.uno \
forlo \
foruilo \
- fsstorage.uno \
gcc3_uno \
hyphenlo \
i18nisolang1gcc3 \
@@ -127,11 +126,9 @@ copy-stuff: buildrcs
reflection.uno \
reg \
saxlo \
- sotlo \
spelllo \
stocservices.uno \
store \
- svllo \
test \
tllo \
ucbhelper4gcc3 \
@@ -144,7 +141,6 @@ copy-stuff: buildrcs
unoxmllo \
utllo \
vbahelperlo \
- vcllo \
xml2 \
xmlreader \
xmlsecurity \
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index f3e4795..1c70fd8 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -91,10 +91,8 @@ copy-stuff:
saxlo \
sclo \
scfiltlo \
- sotlo \
stocservices.uno \
store \
- svllo \
textinstream.uno \
test \
tllo \
@@ -108,7 +106,6 @@ copy-stuff:
unoxmllo \
utllo \
vbahelperlo \
- vcllo \
xml2 \
xmlreader \
xstor \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index fe75c36..1c4519c 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -37,6 +37,7 @@ gb_MERGEDLIBS := \
drawinglayer \
editeng \
filterconfig \
+ fsstorage \
fwe \
fwi \
fwk \
@@ -45,7 +46,9 @@ gb_MERGEDLIBS := \
sb \
sfx \
sofficeapp \
+ sot \
spl \
+ svl \
svt \
svx \
svxcore \
@@ -53,6 +56,7 @@ gb_MERGEDLIBS := \
ucb1 \
ucpfile1 \
uui \
+ vcl \
xmlscript \
xo \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
