diff options
| author | Michael Mi <mmi@openoffice.org> | 2004-07-15 07:25:37 +0000 |
|---|---|---|
| committer | Michael Mi <mmi@openoffice.org> | 2004-07-15 07:25:37 +0000 |
| commit | 20a4040bf713088490ea0595a32923fafd36d5ce (patch) | |
| tree | 7c6d47e8b4bdf89bf3062dd18af5241e3fa95bd1 /xmlsecurity/util | |
| parent | 34fe1cc9611a84d9b94e998378597ae3d50e7bfe (diff) | |
Issue number:
Submitted by:
Reviewed by:
Comments out "-z defs" during linking.
Diffstat (limited to 'xmlsecurity/util')
| -rw-r--r-- | xmlsecurity/util/makefile.mk | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/xmlsecurity/util/makefile.mk b/xmlsecurity/util/makefile.mk index 272b7bc8ae72..c202eb8db4a9 100644 --- a/xmlsecurity/util/makefile.mk +++ b/xmlsecurity/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: gt $ $Date: 2004-07-14 11:38:07 $ +# last change: $Author: mmi $ $Date: 2004-07-15 08:25:37 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -66,7 +66,7 @@ PRJNAME=xmlsecurity TARGET=xmlsecurity # Disable '-z defs' due to broken libxpcom. -LINKFLAGSDEFS=$(0) +#LINKFLAGSDEFS=$(0) # --- Settings ----------------------------------------------------- @@ -178,11 +178,7 @@ SHL4STDLIBS=\ .IF "$(GUI)"=="WNT" SHL4STDLIBS+= "xmlsec.lib" "xsec_xmlsec.lib" .ELSE -<<<<<<< makefile.mk SHL4STDLIBS+= "-lxmlsec" "-lxsec_xmlsec" -======= -SHL4STDLIBS+= "-lxmlsec" "-lxsec_xmlsec" ->>>>>>> 1.2 .ENDIF |