summaryrefslogtreecommitdiff
path: root/xmlsecurity/util/makefile.mk
diff options
context:
space:
mode:
authorMalte Timmermann <mt@openoffice.org>2004-07-14 10:06:31 +0000
committerMalte Timmermann <mt@openoffice.org>2004-07-14 10:06:31 +0000
commit9a4ece8af2609336269fddd7710d01a59a99b3e3 (patch)
tree4ffb2e1f622968696d81033aa988db766974beb4 /xmlsecurity/util/makefile.mk
parentf8ceb18df9a64a49fea567aab8347988b18a0575 (diff)
component...
Diffstat (limited to 'xmlsecurity/util/makefile.mk')
-rw-r--r--xmlsecurity/util/makefile.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/xmlsecurity/util/makefile.mk b/xmlsecurity/util/makefile.mk
index d2dd3b6fd210..8af5a1ffb6a1 100644
--- a/xmlsecurity/util/makefile.mk
+++ b/xmlsecurity/util/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.3 $
+# $Revision: 1.4 $
#
-# last change: $Author: mmi $ $Date: 2004-07-14 10:44:22 $
+# last change: $Author: mt $ $Date: 2004-07-14 11:05:46 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -177,7 +177,11 @@ SHL4STDLIBS=\
.IF "$(GUI)"=="WNT"
SHL4STDLIBS+= "xmlsec.lib" "xsec_xmlsec.lib"
.ELSE
+<<<<<<< makefile.mk
+SHL4STDLIBS+= "-lxmlsec" "-lxsec_xmlsec"
+=======
SHL4STDLIBS+= "-lxmlsec" "-lxsec_xmlsec"
+>>>>>>> 1.2
.ENDIF