diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-10 17:15:03 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-10 17:15:03 +0000 |
| commit | fb150419f67d5d5708c51425847060f7ca2dd053 (patch) | |
| tree | ca5347f80d0d001bc2716d94086dd0771f7ee60b /xmlsecurity/tools | |
| parent | c07cdb6f4cfc51879bd66d2cd39492a9a9341d0b (diff) | |
INTEGRATION: CWS xmlsec08 (1.5.10); FILE MERGED
2005/02/04 09:21:09 mmi 1.5.10.3: minor bug fix
Issue number:
Submitted by:
Reviewed by:
2005/01/28 02:17:53 mmi 1.5.10.2: test
Issue number:
Submitted by:
Reviewed by:
2005/01/20 09:15:45 mmi 1.5.10.1:
Issue number: 38417
Submitted by:
Reviewed by:
Diffstat (limited to 'xmlsecurity/tools')
| -rw-r--r-- | xmlsecurity/tools/demo/makefile.mk | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/xmlsecurity/tools/demo/makefile.mk b/xmlsecurity/tools/demo/makefile.mk index 106135157df5..b2b79a7c1f77 100644 --- a/xmlsecurity/tools/demo/makefile.mk +++ b/xmlsecurity/tools/demo/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: rt $ $Date: 2004-11-26 15:00:03 $ +# last change: $Author: vg $ $Date: 2005-03-10 18:15:03 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -93,12 +93,12 @@ SHARE_LIBS = \ .IF "$(GUI)"=="WNT" .IF "$(CRYPTO_ENGINE)" == "mscrypto" -SHARE_LIBS+= "libxml2.lib" "nss3.lib" "nspr4.lib" "xmlsec.lib" "xmlsec-mscrypto.lib" "helper.lib" "xsec_xmlsec.lib" +SHARE_LIBS+= "libxml2.lib" "nss3.lib" "nspr4.lib" "libxmlsec.lib" "libxmlsec-mscrypto.lib" "helper.lib" "xsec_xmlsec.lib" .ELSE -SHARE_LIBS+= "libxml2.lib" "nss3.lib" "nspr4.lib" "xmlsec.lib" "xmlsec-nss.lib" "helper.lib" "xsec_xmlsec.lib" +SHARE_LIBS+= "libxml2.lib" "nss3.lib" "nspr4.lib" "libxmlsec.lib" "libxmlsec-nss.lib" "helper.lib" "xsec_xmlsec.lib" .ENDIF .ELSE -SHARE_LIBS+= "-lxml2" "-lnss3" "-lnspr4" "-lxmlsec" "-lxmlsec-nss" "helper.lib" "-lxsec_xmlsec" +SHARE_LIBS+= "-lxml2" "-lnss3" "-lnspr4" "-lxmlsec1" "-lxmlsec1-nss" "helper.lib" "-lxsec_xmlsec" .ENDIF SHARE_OBJS = \ @@ -150,6 +150,20 @@ APP3STDLIBS+= -lstdc++ APP3STDLIBS+= \ $(SHARE_LIBS) +# +# The 4rd application +# +#APP4TARGET= moz_profile +APP4OBJS= \ + $(SLO)$/moz_profile.obj + +.IF "$(OS)" == "LINUX" +APP4STDLIBS+= -lstdc++ +.ENDIF + +APP4STDLIBS+= \ + $(SHARE_LIBS) + # --- Targets ------------------------------------------------------ .INCLUDE : target.mk |