[Libreoffice-commits] core.git: external/libxml2 external/libxslt

[Michael Stahl]

 external/libxml2/ExternalPackage_xml2.mk |    2 +-
 external/libxslt/ExternalPackage_xslt.mk |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 8ce49bb3f45d2dbae594b24c4a3b936cc4feaf09
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Oct 22 15:38:45 2013 +0200

    libxml2/libxslt: no need for libfoo.so.X.Y.Z files
    
    Change-Id: I0ed69bcfee650ae403d793b27db4ad906132efed

diff --git a/external/libxml2/ExternalPackage_xml2.mk b/external/libxml2/ExternalPackage_xml2.mk
index 24dd5ef..cbd06b2 100644
--- a/external/libxml2/ExternalPackage_xml2.mk
+++ b/external/libxml2/ExternalPackage_xml2.mk
@@ -35,9 +35,9 @@ $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,bin/libxml2.dll,wi
 $(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint.exe,win32/bin.msvc/xmllint.exe))
 endif
 else # OS!=WNT
-$(eval $(call gb_ExternalPackage_add_file,xml2,lib/libxml2.so.2.7.6,.libs/libxml2.so.2.7.6))
 $(eval $(call gb_ExternalPackage_add_library_for_install,xml2,lib/libxml2.so.2,.libs/libxml2.so.2.7.6,xml2))
 $(eval $(call gb_ExternalPackage_add_file,xml2,lib/libxml2.so,.libs/libxml2.so.2.7.6))
 $(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint,.libs/xmllint))
 endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libxslt/ExternalPackage_xslt.mk b/external/libxslt/ExternalPackage_xslt.mk
index c9586b8..909405e 100644
--- a/external/libxslt/ExternalPackage_xslt.mk
+++ b/external/libxslt/ExternalPackage_xslt.mk
@@ -42,12 +42,11 @@ $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libexslt.dll,w
 $(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc.exe,win32/bin.msvc/xsltproc.exe))
 endif
 else # OS!=WNT
-$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.so.1.1.26,libxslt/.libs/libxslt.so.1.1.26))
 $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.26))
 $(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.so,libxslt/.libs/libxslt.so.1.1.26))
-$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.so.0.8.15,libexslt/.libs/libexslt.so.0.8.15))
 $(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.15))
 $(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.so,libexslt/.libs/libexslt.so.0.8.15))
 $(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/.libs/xsltproc))
 endif
+
 # vim: set noet sw=4 ts=4: