From 8e970444e6944b11d30e68d40e607cc5d093a652 Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Mon, 18 Aug 2008 12:17:00 +0000 Subject: INTEGRATION: CWS cmcfixes48 (1.22.22); FILE MERGED 2008/08/01 13:54:33 cmc 1.22.22.1: #i92247# remove duplication of object code, link only the single library to libxmlsec1, and update some stuff to new api --- xmlsecurity/util/makefile.mk | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/xmlsecurity/util/makefile.mk b/xmlsecurity/util/makefile.mk index a81046ddaa73..15b669012a99 100644 --- a/xmlsecurity/util/makefile.mk +++ b/xmlsecurity/util/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.22 $ +# $Revision: 1.23 $ # # This file is part of OpenOffice.org. # @@ -137,10 +137,6 @@ SHL4LIBS=\ $(SLB)$/dialogs.lib \ $(SLB)$/component.lib -SHL4OBJS=\ - $(SLO)$/baseencoding.obj \ - $(SLO)$/biginteger.obj - SHL4STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ @@ -158,9 +154,6 @@ SHL4STDLIBS=\ $(XMLOFFLIB) \ $(SVXLIB) -#MT: Remove libxml2 and xs_comm (above) by cerating service for base encodings -SHL4STDLIBS+= $(LIBXML2LIB) $(XMLSECLIB) - SHL4VERSIONMAP = xmlsecurity.map SHL4DEPN= SHL4IMPLIB=i$(TARGET) -- cgit v1.2.3