Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add condition for BSAFE build.

Browse Source
This commit is contained in:
mcgreer%netscape.com 2000-05-12 23:37:36 +00:00
parent 0d6b5ee3a6
commit 50cdc7829c
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
security/nss/cmd/platlibs.mk
View File

@ -49,7 +49,6 @@ EXTRA_LIBS += \
$(DIST)/lib/certdb.lib \
$(DIST)/lib/softoken.lib \
$(DIST)/lib/freebl.lib \
$(DIST)/lib/crypto.lib \
$(DIST)/lib/swfci.lib \
$(DIST)/lib/secutil.lib \
$(DIST)/lib/dbm.lib \
@ -58,6 +57,16 @@ EXTRA_LIBS += \
$(DIST)/lib/$(NSPR31_LIB_PREFIX)nspr4.lib \
$(NULL)
ifdef MOZILLA_SECURITY_BUILD
EXTRA_LIBS += $(DIST)/lib/crypto.lib
endif
ifdef MOZILLA_BSAFE_BUILD
EXTRA_LIBS += \
$(DIST)/lib/bsafe41.lib \
$(DIST)/lib/freebl.lib \
$(NULL)
endif
# $(PROGRAM) has NO explicit dependencies on $(OS_LIBS)
OS_LIBS += \
wsock32.lib \
@ -82,13 +91,21 @@ EXTRA_LIBS += \
$(DIST)/lib/libsoftoken.a \
$(DIST)/lib/libcertdb.a \
$(DIST)/lib/libswfci.a \
$(DIST)/lib/libcrypto.a \
$(DIST)/lib/libfreebl.a \
$(DIST)/lib/libsecutil.a \
$(DIST)/lib/libcrypto.a \
$(DIST)/lib/libdbm.a \
$(NULL)
ifdef MOZILLA_SECURITY_BUILD
EXTRA_LIBS += $(DIST)/lib/libcrypto.a
endif
ifdef MOZILLA_BSAFE_BUILD
EXTRA_LIBS += \
$(DIST)/lib/libbsafe.a \
$(DIST)/lib/libfreebl.a \
$(NULL)
endif
# $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
EXTRA_SHARED_LIBS += \

18
security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
View File

@ -46,13 +46,20 @@ EXTRA_LIBS = \
$(DIST)/lib/swfci.lib \
$(DIST)/lib/softoken.lib \
$(DIST)/lib/freebl.lib \
$(DIST)/lib/crypto.lib \
$(DIST)/lib/secutil.lib \
$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \
$(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \
wsock32.lib \
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
@ -65,11 +72,18 @@ EXTRA_LIBS += \
$(DIST)/lib/libswfci.a \
$(DIST)/lib/libsoftoken.a \
$(DIST)/lib/libfreebl.a \
$(DIST)/lib/libcrypto.a \
$(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