diff options
| author | nelsonb%netscape.com <devnull@localhost> | 2000-05-27 01:30:29 +0000 |
|---|---|---|
| committer | nelsonb%netscape.com <devnull@localhost> | 2000-05-27 01:30:29 +0000 |
| commit | 4b62cbd094e15dd8f6546ef41f314aadac9de8df (patch) | |
| tree | 13d67404366233f11bce5d37c94d8fa41e899b61 | |
| parent | 57617ed526a3258e00c42f96820010d825df9f99 (diff) | |
| download | nss-hg-4b62cbd094e15dd8f6546ef41f314aadac9de8df.tar.gz | |
Fix build on NT. Correct link order in PKCS11 directory.
| -rw-r--r-- | security/nss/lib/fortcrypt/Makefile | 2 | ||||
| -rw-r--r-- | security/nss/lib/fortcrypt/swfort/pkcs11/Makefile | 37 |
2 files changed, 22 insertions, 17 deletions
diff --git a/security/nss/lib/fortcrypt/Makefile b/security/nss/lib/fortcrypt/Makefile index bd779f5a7..09b98c761 100644 --- a/security/nss/lib/fortcrypt/Makefile +++ b/security/nss/lib/fortcrypt/Makefile @@ -94,7 +94,7 @@ $(CILIB): fi @$(RANLIB) $@ -$(STUBLIB): $(OBJDIR)/maci.o +$(STUBLIB): $(OBJDIR)/maci$(OBJ_SUFFIX) @$(MAKE_OBJDIR) ifeq ($(OS_ARCH), WINNT) $(MAKE) $(STUBDLL) diff --git a/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile b/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile index 5cd9b75e9..9595d91fe 100644 --- a/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile +++ b/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile @@ -40,12 +40,21 @@ include $(CORE_DEPTH)/coreconf/config.mk # can't do this in manifest.mn because OS_ARCH isn't defined there. ifeq ($(OS_ARCH), WINNT) +CRYPTO_LIBS = $(DIST)/lib/freebl.lib + +ifdef MOZILLA_SECURITY_BUILD +CRYPTO_LIBS += $(DIST)/lib/crypto.lib +endif +ifdef MOZILLA_BSAFE_BUILD +CRYPTO_LIBS += $(DIST)/lib/bsafe41.lib +endif + # $(DIST)/lib/dbm.lib # $(DIST)/lib/$(NSPR31_LIB_PREFIX)nspr4.lib EXTRA_LIBS = \ $(DIST)/lib/swfci.lib \ $(DIST)/lib/softoken.lib \ - $(DIST)/lib/freebl.lib \ + $(CRYPTO_LIBS) \ $(DIST)/lib/secutil.lib \ $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \ $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \ @@ -53,13 +62,6 @@ EXTRA_LIBS = \ winmm.lib \ $(NULL) -ifdef MOZILLA_SECURITY_BUILD -EXTRA_LIBS += $(DIST)/lib/crypto.lib -endif -ifdef MOZILLA_BSAFE_BUILD -EXTRA_LIBS += $(DIST)/lib/bsafe41.lib -endif - else # $(DIST)/lib/libdbm.a @@ -68,22 +70,25 @@ else # not just the .o's that we need from that archive. # ifneq ($(OS_ARCH), OSF1) + +CRYPTO_LIBS = $(DIST)/lib/libfreebl.a + +ifdef MOZILLA_SECURITY_BUILD +CRYPTO_LIBS += $(DIST)/lib/libcrypto.a +endif +ifdef MOZILLA_BSAFE_BUILD +CRYPTO_LIBS += $(DIST)/lib/libbsafe.a +endif + EXTRA_LIBS += \ $(DIST)/lib/libswfci.a \ $(DIST)/lib/libsoftoken.a \ - $(DIST)/lib/libfreebl.a \ + $(CRYPTO_LIBS) \ $(DIST)/lib/libsecutil.a \ $(DIST)/lib/libplc4.a \ $(DIST)/lib/libplds4.a \ $(NULL) -ifdef MOZILLA_SECURITY_BUILD -EXTRA_LIBS += $(DIST)/lib/libcrypto.a -endif -ifdef MOZILLA_BSAFE_BUILD -EXTRA_LIBS += $(DIST)/lib/libbsafe.a -endif - endif endif |