diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-07-20 20:24:38 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-07-20 20:59:17 +0200 |
| commit | 140ec1e0dd2bbb574a1d468820131c7f0ecd9704 (patch) | |
| tree | afed1fecd3906674821e89b20308bb4ec583b2d9 | |
| parent | f01aa96eab0ac6b068cff53ee03c10beff662f2d (diff) | |
scp2: move xsec_xmlsec lib to AutoInstall
Change-Id: Iff2bb51047d6b8698b65b83ff79a99f6f125b53c
| -rw-r--r-- | Repository.mk | 3 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 14 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 1 |
3 files changed, 2 insertions, 16 deletions
diff --git a/Repository.mk b/Repository.mk index 763c5a4e1471..c94fff652b16 100644 --- a/Repository.mk +++ b/Repository.mk @@ -575,6 +575,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ unopkgapp \ xmlsecurity \ xsec_fw \ + xsec_xmlsec \ xstor \ $(if $(filter $(OS),MACOSX), \ macab1 \ @@ -592,8 +593,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ ) \ ) \ )) + $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - xsec_xmlsec \ $(if $(filter $(OS),ANDROID), \ lo-bootstrap \ ) \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index f756a8b64308..21b0538a25e2 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -92,20 +92,6 @@ End #endif -#if !defined(ANDROID) && !defined(IOS) //FIXME: get nss&xmlsec building -//we need the nss libs for libxmlsec (or if the internal mozilla is enabled) - -File gid_File_Lib_XSec_XmlSec - PACKED_LIB_FILE_BODY; - #ifdef UNX - Name = STRING(CONCAT2(libxsec_xmlsec,UNXSUFFIX)); - #else - Name = "xsec_xmlsec.dll"; - #endif -End - -#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 e3d2bb7f5e7d..c4db0194b010 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -152,7 +152,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Neon, gid_Unixlink_File_Lib_Xslt, gid_Unixlink_File_Lib_eXslt, - gid_File_Lib_XSec_XmlSec, gid_File_Lib_I18n, gid_File_Lib_Accessbridge, gid_File_Lib_Dl, |