summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-08-18 12:17:00 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-08-18 12:17:00 +0000
commit8e970444e6944b11d30e68d40e607cc5d093a652 (patch)
tree8337f0330d36fa7f4fb14ba02d19de05757a8588
parentccc9fdb0d4edd596a0553c3bd39e190ee12f58c5 (diff)
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
-rw-r--r--xmlsecurity/util/makefile.mk9
1 files changed, 1 insertions, 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)