Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-02 22:37:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

reordered libraries for builds

Browse Source
This commit is contained in:
mcgreer%netscape.com 2000-05-15 22:59:12 +00:00
parent f9f6684fb2
commit 36eabb038c
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,13 @@
ifeq ($(OS_ARCH), WINNT)
# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
ifdef MOZILLA_SECURITY_BUILD
CRYPTOLIB=$(DIST)/lib/crypto.lib
endif
ifdef MOZILLA_BSAFE_BUILD
CRYPTOLIB=$(DIST)/lib/bsafe41.lib
endif
EXTRA_LIBS += \
$(DIST)/lib/ssl.lib \
$(DIST)/lib/jar.lib \
@ -49,6 +56,7 @@ EXTRA_LIBS += \
$(DIST)/lib/certdb.lib \
$(DIST)/lib/softoken.lib \
$(DIST)/lib/freebl.lib \
$(CRYPTOLIB) \
$(DIST)/lib/swfci.lib \
$(DIST)/lib/secutil.lib \
$(DIST)/lib/dbm.lib \
@ -57,16 +65,6 @@ 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 \
@ -75,6 +73,12 @@ OS_LIBS += \
else
# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
ifdef MOZILLA_SECURITY_BUILD
CRYPTOLIB=$(DIST)/lib/libcrypto.a
endif
ifdef MOZILLA_BSAFE_BUILD
CRYPTOLIB=$(DIST)/lib/libbsafe.a
endif
EXTRA_LIBS += \
$(DIST)/lib/libssl.a \
$(DIST)/lib/libjar.a \
@ -92,20 +96,11 @@ EXTRA_LIBS += \
$(DIST)/lib/libcertdb.a \
$(DIST)/lib/libswfci.a \
$(DIST)/lib/libfreebl.a \
$(CRYPTOLIB) \
$(DIST)/lib/libsecutil.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 += \