Kaydet (Commit) 140ec1e0 authored tarafından Michael Stahl's avatar Michael Stahl

scp2: move xsec_xmlsec lib to AutoInstall

Change-Id: Iff2bb51047d6b8698b65b83ff79a99f6f125b53c
üst f01aa96e
...@@ -575,6 +575,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ ...@@ -575,6 +575,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
unopkgapp \ unopkgapp \
xmlsecurity \ xmlsecurity \
xsec_fw \ xsec_fw \
xsec_xmlsec \
xstor \ xstor \
$(if $(filter $(OS),MACOSX), \ $(if $(filter $(OS),MACOSX), \
macab1 \ macab1 \
...@@ -592,8 +593,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ ...@@ -592,8 +593,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
) \ ) \
) \ ) \
)) ))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
xsec_xmlsec \
$(if $(filter $(OS),ANDROID), \ $(if $(filter $(OS),ANDROID), \
lo-bootstrap \ lo-bootstrap \
) \ ) \
......
...@@ -92,20 +92,6 @@ End ...@@ -92,20 +92,6 @@ End
#endif #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 #if defined WNT && !defined _gcc3 && defined WITH_MOZAB4WIN
// see common_brand.scp gid_Brand_File_Lib_Msvcp80 and // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and
// gid_Brand_File_Lib_Msvcr80 // gid_Brand_File_Lib_Msvcr80
......
...@@ -152,7 +152,6 @@ Module gid_Module_Root_Files_5 ...@@ -152,7 +152,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Neon, gid_File_Lib_Neon,
gid_Unixlink_File_Lib_Xslt, gid_Unixlink_File_Lib_Xslt,
gid_Unixlink_File_Lib_eXslt, gid_Unixlink_File_Lib_eXslt,
gid_File_Lib_XSec_XmlSec,
gid_File_Lib_I18n, gid_File_Lib_I18n,
gid_File_Lib_Accessbridge, gid_File_Lib_Accessbridge,
gid_File_Lib_Dl, gid_File_Lib_Dl,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment