Library_merged.mk | 56 +++----------------------
Repository.mk | 6 +-
scp2/source/ooo/file_library_ooo.scp | 15 ------
scp2/source/ooo/module_hidden_ooo.scp | 3 -
solenv/gbuild/extensions/pre_MergedLibsList.mk | 4 +
5 files changed, 14 insertions(+), 70 deletions(-)
New commits:
commit 3df1af355d8aa133cd983f15b17c740a1e9a85f7
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Wed Apr 10 13:32:44 2013 +0200
libmerged: add more libraries and cleanup
Change-Id: I68c6f4d4bae3ae495dd2033c95f47a34a4aba560
diff --git a/Library_merged.mk b/Library_merged.mk
index 43c6489..e7a407d 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -48,18 +48,25 @@ $(eval $(call gb_Library_use_externals,merged,\
$(call gb_Helper_optional,DESKTOP,clucene) \
cups \
curl \
+ dbus \
expat \
+ gconf \
+ gio \
+ graphite \
+ $(if $(ENABLE_GTK),gtk) \
hunspell \
icui18n \
icule \
icuuc \
jpeg \
lcms2 \
+ liblangtag \
libxml2 \
libxslt \
$(if $(filter-out IOS,$(OS)),lpsolve) \
mythes \
nss3 \
+ telepathy \
zlib \
))
@@ -71,12 +78,6 @@ $(eval $(call gb_Library_use_externals,merged,\
))
endif
-ifeq ($(ENABLE_GRAPHITE),TRUE)
-$(eval $(call gb_Library_use_externals,merged,\
- graphite \
-))
-endif
-
ifeq ($(GUIBASE),unx)
$(eval $(call gb_Library_use_externals,merged,\
fontconfig \
@@ -140,47 +141,4 @@ $(eval $(call
gb_Library_use_system_darwin_frameworks,merged,\
))
endif
-ifeq ($(OS),ANDROID)
-$(eval $(call gb_Library_use_libraries,merged,\
- libotouch \
-))
-
-$(eval $(call gb_Library_add_libs,merged,\
- -llog \
- -landroid \
- -llo-bootstrap \
-))
-
-$(eval $(call gb_Library_use_externals,merged,\
- fontconfig \
- freetype \
-))
-endif
-
-ifeq ($(OS),IOS)
-$(eval $(call gb_Library_use_system_darwin_frameworks,merged,\
- CoreFoundation \
- UIKit \
-))
-endif
-
-ifeq ($(ENABLE_TELEPATHY),TRUE)
-$(eval $(call gb_Library_use_externals,merged,\
- gtk \
- telepathy \
-))
-endif
-
-ifeq ($(ENABLE_DBUS),TRUE)
-$(eval $(call gb_Library_use_externals,merged,\
- dbus \
-))
-endif
-
-ifeq ($(ENABLE_LIBLANGTAG),YES)
-$(eval $(call gb_Library_use_externals,merged,\
- liblangtag \
-))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/Repository.mk b/Repository.mk
index 4bd7c68..4b2c1f0 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -445,8 +445,10 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
))
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,OOO, \
+ deployment \
fileacc \
i18nutil \
+ mcnttype \
package2 \
sofficeapp \
ucb1 \
@@ -461,7 +463,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
cached1 \
collator_data \
dbpool2 \
- deployment \
deploymentgui \
dict_ja \
dict_zh \
@@ -477,7 +478,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
localedata_others \
macab1 \
macabdrv1 \
- mcnttype \
mozbootstrap \
officebean \
pyuno \
@@ -569,6 +569,7 @@ $(eval $(call
gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \
fsstorage \
i18npool \
localebe1 \
+ ucpexpand1 \
))
$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
PresenterScreen \
@@ -607,7 +608,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
syssh \
tdebe1 \
ucpcmis1 \
- ucpexpand1 \
ucpext \
ucpgio1 \
ucpgvfs1 \
diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
index 8602c2b..b929801 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -712,17 +712,6 @@ File gid_File_Lib_Localedata_Others
Styles = (PACKED);
End
-File gid_File_Lib_Mcnttype
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- #ifdef UNX
- Name = STRING(CONCAT2(libmcnttype,UNXSUFFIX));
- #else
- Name = "mcnttype.dll";
- #endif
-End
-
#if defined(WNT)
#if defined WITH_MOZAB4WIN
@@ -791,8 +780,6 @@ STD_LIB_FILE( gid_File_Lib_Log, log)
STD_LIB_FILE( gid_File_Lib_Pdffilter, pdffilter)
-SPECIAL_LIB_FILE(gid_File_Lib_Deployment,deployment)
-
SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui)
#if defined ENABLE_NPAPI_FROM_BROWSER
@@ -1132,8 +1119,6 @@ SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucptdoc1,
ucptdoc1.uno)
SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno)
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
-
SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpcmis, ucpcmis1.uno)
File gid_File_Lib_Lnth
diff --git a/scp2/source/ooo/module_hidden_ooo.scp
b/scp2/source/ooo/module_hidden_ooo.scp
index afa4b9d..ed7729e 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -268,7 +268,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Localedata_Others,
gid_File_Lib_Hsqldb_2,
gid_File_Lib_Jdbc,
- gid_File_Lib_Mcnttype,
gid_File_Lib_Mork,
gid_File_Lib_Mozabdrv,
gid_File_Lib_Mozbootstrap,
@@ -276,7 +275,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Odbc,
gid_File_Lib_Officebean,
gid_File_Lib_Openssl,
- gid_File_Lib_Deployment,
gid_File_Lib_DeploymentGui,
gid_File_Lib_Expwrap_Uno,
gid_File_Lib_Fastsax_Uno,
@@ -291,7 +289,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Migrationoo3,
gid_File_Lib_Syssh,
gid_File_Ucptdoc1,
- gid_File_Ucpexpand1,
gid_File_Lib_Raptor,
gid_Unixlink_File_Lib_Raptor,
gid_File_Lib_Rasqal,
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk
b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 21c7f2d..441263b 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -104,6 +104,7 @@ gb_MERGEDLIBS := \
canvastools \
configmgr \
cppcanvas \
+ deployment \
deploymentmisc \
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
$(if $(filter unx,$(GUIBASE)),desktop_detector) \
@@ -120,6 +121,7 @@ gb_MERGEDLIBS := \
i18nutil \
lng \
localebe1 \
+ mcnttype \
msfilter \
package2 \
sax \
@@ -136,7 +138,9 @@ gb_MERGEDLIBS := \
tl \
$(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \
ucb1 \
+ ucpexpand1 \
ucpfile1 \
+ unoxml \
utl \
uui \
vcl \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
