diff options
| -rw-r--r-- | Repository.mk | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 31 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 3 |
3 files changed, 4 insertions, 34 deletions
diff --git a/Repository.mk b/Repository.mk index a97f652dc326..ab600943de1b 100644 --- a/Repository.mk +++ b/Repository.mk @@ -705,6 +705,10 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\ ) \ )) +$(eval $(call gb_Helper_register_packages_for_install,ooo,\ + xmlsec \ +)) + # External executables $(eval $(call gb_ExternalExecutable_register_executables,\ genbrk \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 046741c04aae..a6d80c1e4f3f 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -201,37 +201,6 @@ End #endif -#ifdef WNT -File gid_File_Lib_LibXMLSec_xmlseccore - PACKED_LIB_FILE_BODY; - #ifdef _gcc3 - Name = "libxmlsec1.dll"; - #else - Name = "libxmlsec.dll"; - #endif -End - -#ifdef CROSS_COMPILING -File gid_File_Lib_LibXMLSec_xmlsecnss - PACKED_LIB_FILE_BODY; - #ifdef _gcc3 - Name = "libxmlsec1-nss.dll"; - #else - Name = "libxmlsec-nss.dll"; - #endif -End -#else -File gid_File_Lib_LibXMLSec_xmlsecmscrypto - PACKED_LIB_FILE_BODY; - #ifdef _gcc3 - Name = "libxmlsec1-mscrypto.dll"; - #else - Name = "libxmlsec-mscrypto.dll"; - #endif -End -#endif -#endif - #if defined WNT && !defined _gcc3 && defined WITH_MOZAB4WIN // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and // gid_Brand_File_Lib_Msvcr80 diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 49d883f835bc..c937482cb986 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -181,9 +181,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Neon, gid_Unixlink_File_Lib_Xslt, gid_Unixlink_File_Lib_eXslt, - gid_File_Lib_LibXMLSec_xmlsecnss, - gid_File_Lib_LibXMLSec_xmlseccore, - gid_File_Lib_LibXMLSec_xmlsecmscrypto, gid_File_Lib_XSec_XmlSec, gid_File_Lib_I18n, gid_File_Lib_Accessbridge, |