Kaydet (Commit) 6ad82868 authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov

INTEGRATION: CWS xmlsec08 (1.15.24); FILE MERGED

2005/02/03 10:36:12 pb 1.15.24.1: fix: #i37609# component.srs added
üst e70c9e4e
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.15 $ # $Revision: 1.16 $
# #
# last change: $Author: kz $ $Date: 2004-09-08 12:40:53 $ # last change: $Author: vg $ $Date: 2005-03-10 18:19:21 $
# #
# The Contents of this file are made available subject to the terms of # The Contents of this file are made available subject to the terms of
# either of the following licenses # either of the following licenses
...@@ -129,14 +129,14 @@ SHL2STDLIBS += \ ...@@ -129,14 +129,14 @@ SHL2STDLIBS += \
$(TOOLSLIB) \ $(TOOLSLIB) \
$(COMPHELPERLIB) \ $(COMPHELPERLIB) \
$(CPPUHELPERLIB) \ $(CPPUHELPERLIB) \
$(XMLOFFLIB) $(XMLOFFLIB)
.IF "$(CRYPTO_ENGINE)" == "mscrypto" .IF "$(CRYPTO_ENGINE)" == "mscrypto"
SHL2STDLIBS+= $(MSCRYPTOLIBS) SHL2STDLIBS+= $(MSCRYPTOLIBS)
.ELSE .ELSE
SHL2STDLIBS+= $(NSSCRYPTOLIBS) SHL2STDLIBS+= $(NSSCRYPTOLIBS)
.ENDIF .ENDIF
SHL2IMPLIB = $(SHL2TARGET) SHL2IMPLIB = $(SHL2TARGET)
SHL2DEF = $(MISC)$/$(SHL2TARGET).def SHL2DEF = $(MISC)$/$(SHL2TARGET).def
DEF2NAME = $(SHL2TARGET) DEF2NAME = $(SHL2TARGET)
...@@ -147,6 +147,7 @@ DEF2EXPORTFILE = exports_xsnss.dxp ...@@ -147,6 +147,7 @@ DEF2EXPORTFILE = exports_xsnss.dxp
.ENDIF .ENDIF
SRSFILELIST= \ SRSFILELIST= \
$(SRS)$/component.srs \
$(SRS)$/dialogs.srs $(SRS)$/dialogs.srs
RESLIB1NAME=xmlsec RESLIB1NAME=xmlsec
...@@ -157,7 +158,7 @@ SHL4TARGET=$(TARGET) ...@@ -157,7 +158,7 @@ SHL4TARGET=$(TARGET)
SHL4LIBS=\ SHL4LIBS=\
$(SLB)$/helper.lib \ $(SLB)$/helper.lib \
$(SLB)$/dialogs.lib \ $(SLB)$/dialogs.lib \
$(SLB)$/component.lib $(SLB)$/component.lib
SHL4OBJS=\ SHL4OBJS=\
$(SLO)$/baseencoding.obj \ $(SLO)$/baseencoding.obj \
...@@ -182,7 +183,7 @@ SHL4STDLIBS=\ ...@@ -182,7 +183,7 @@ SHL4STDLIBS=\
#MT: Remove libxml2 and xs_comm (above) by cerating service for base encodings #MT: Remove libxml2 and xs_comm (above) by cerating service for base encodings
SHL4STDLIBS+= $(LIBXML2LIB) $(XMLSECLIB) SHL4STDLIBS+= $(LIBXML2LIB) $(XMLSECLIB)
SHL4VERSIONMAP = xmlsecurity.map SHL4VERSIONMAP = xmlsecurity.map
SHL4DEPN= SHL4DEPN=
SHL4IMPLIB=i$(TARGET) SHL4IMPLIB=i$(TARGET)
......
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