mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 20:35:50 +00:00
Make NSS 3.4 build as part of mozilla on OS/2. Bug 114748.
Patch supplied by Javier Pedemonte.
This commit is contained in:
nelsonb%netscape.com
parent
e85c057950
commit
42fdae57e1
@ -48,7 +48,7 @@ endif
|
||||
#
|
||||
|
||||
ifndef LIB_PREFIX
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
|
||||
LIB_PREFIX =
|
||||
else
|
||||
LIB_PREFIX = lib
|
||||
@ -57,7 +57,7 @@ endif
|
||||
|
||||
|
||||
ifndef DLL_PREFIX
|
||||
ifeq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
|
||||
ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
|
||||
DLL_PREFIX =
|
||||
else
|
||||
DLL_PREFIX = lib
|
||||
|
||||
@ -146,23 +146,17 @@ endif
|
||||
#
|
||||
|
||||
ifdef LIBRARY_NAME
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
LIBRARY = $(OBJDIR)/$(LIBRARY_NAME).lib
|
||||
LIBRARY = $(OBJDIR)/$(LIB_PREFIX)$(LIBRARY_NAME).$(LIB_SUFFIX)
|
||||
SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).$(DLL_SUFFIX)
|
||||
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
|
||||
SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)32$(JDK_DEBUG_SUFFIX).dll
|
||||
IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)32$(JDK_DEBUG_SUFFIX).lib
|
||||
else
|
||||
ifeq ($(OS_ARCH), OS2)
|
||||
LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME).lib
|
||||
SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).dll
|
||||
IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).lib
|
||||
else
|
||||
LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME).$(LIB_SUFFIX)
|
||||
ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
|
||||
SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_shr$(JDK_DEBUG_SUFFIX).a
|
||||
else
|
||||
SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).$(DLL_SUFFIX)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
ifeq ($(OS_TARGET)$(OS_RELEASE), AIX4.1)
|
||||
SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_shr$(JDK_DEBUG_SUFFIX).a
|
||||
endif
|
||||
ifeq ($(OS_TARGET), OS2)
|
||||
IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)$(JDK_DEBUG_SUFFIX).lib
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
@ -82,39 +82,39 @@ OS_LIBS += \
|
||||
else
|
||||
|
||||
# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
|
||||
CRYPTOLIB=$(DIST)/lib/libfreebl.$(LIB_SUFFIX)
|
||||
CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
|
||||
ifdef MOZILLA_SECURITY_BUILD
|
||||
CRYPTOLIB=$(DIST)/lib/libcrypto.$(LIB_SUFFIX)
|
||||
CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
|
||||
endif
|
||||
ifdef MOZILLA_BSAFE_BUILD
|
||||
CRYPTOLIB+=$(DIST)/lib/libbsafe.$(LIB_SUFFIX)
|
||||
CRYPTOLIB+=$(DIST)/lib/libfreebl.$(LIB_SUFFIX)
|
||||
CRYPTOLIB+=$(DIST)/lib/$(LIB_PREFIX)bsafe.$(LIB_SUFFIX)
|
||||
CRYPTOLIB+=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
|
||||
endif
|
||||
EXTRA_LIBS += \
|
||||
$(DIST)/lib/libsmime.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libssl.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libjar.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libzlib.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnss.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libssl.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libsectool.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libpkcs12.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libpkcs7.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libcerthi.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libpk11wrap.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libcryptohi.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libcerthi.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnsspki.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libpk11wrap.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libsoftokn.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libcertdb.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnsspki.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnssdev.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnssb.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libswfci.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)zlib.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)pkcs12.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)pkcs7.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)cryptohi.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)swfci.$(LIB_SUFFIX) \
|
||||
$(CRYPTOLIB) \
|
||||
$(DIST)/lib/libsecutil.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libdbm.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(OS_ARCH), AIX)
|
||||
@ -163,7 +163,7 @@ else
|
||||
|
||||
# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
|
||||
EXTRA_LIBS += \
|
||||
$(DIST)/lib/libsectool.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(OS_ARCH), AIX)
|
||||
|
||||
@ -30,17 +30,21 @@
|
||||
# may use your version of this file under either the MPL or the
|
||||
# GPL.
|
||||
#
|
||||
MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.8 $ $Date: 2001/05/23 05:55:13 $ $Name: $"
|
||||
MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.9 $ $Date: 2002/02/11 05:48:27 $ $Name: $"
|
||||
|
||||
include manifest.mn
|
||||
include $(CORE_DEPTH)/coreconf/config.mk
|
||||
include config.mk
|
||||
|
||||
EXTRA_LIBS = \
|
||||
$(DIST)/lib/$(LIB_PREFIX)nssckfw.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
# can't do this in manifest.mn because OS_ARCH isn't defined there.
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
|
||||
EXTRA_LIBS = \
|
||||
$(DIST)/lib/nssckfw.lib \
|
||||
$(DIST)/lib/nssb.lib \
|
||||
EXTRA_LIBS += \
|
||||
$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \
|
||||
$(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \
|
||||
wsock32.lib \
|
||||
@ -49,19 +53,9 @@ EXTRA_LIBS = \
|
||||
|
||||
else
|
||||
|
||||
ifeq ($(OS_ARCH), OS2)
|
||||
PLC_STATIC_LIB = $(DIST)/lib/plc4.$(LIB_SUFFIX)
|
||||
PLDS_STATIC_LIB = $(DIST)/lib/plds4.$(LIB_SUFFIX)
|
||||
else
|
||||
PLC_STATIC_LIB = $(DIST)/lib/libplc4.$(LIB_SUFFIX)
|
||||
PLDS_STATIC_LIB = $(DIST)/lib/libplds4.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(DIST)/lib/libnssckfw.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnssb.$(LIB_SUFFIX) \
|
||||
$(PLC_STATIC_LIB) \
|
||||
$(PLDS_STATIC_LIB) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
endif
|
||||
|
||||
@ -37,12 +37,11 @@ include $(CORE_DEPTH)/coreconf/config.mk
|
||||
include config.mk
|
||||
|
||||
|
||||
#SWCILIB = ../$(OBJDIR)/$(LIB_PREFIX)swfci.$(LIB_SUFFIX)
|
||||
CRYPTO_LIB = $(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
|
||||
|
||||
# can't do this in manifest.mn because OS_ARCH isn't defined there.
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
|
||||
CRYPTO_LIB = $(DIST)/lib/freebl.lib
|
||||
|
||||
ifdef MOZILLA_SECURITY_BUILD
|
||||
CRYPTO_LIB = $(DIST)/lib/crypto.lib
|
||||
endif
|
||||
@ -51,8 +50,6 @@ CRYPTO_LIB += $(DIST)/lib/bsafe$(BSAFEVER).lib
|
||||
CRYPTO_LIB += $(DIST)/lib/freebl.lib
|
||||
endif
|
||||
|
||||
# $(DIST)/lib/dbm.lib
|
||||
# $(DIST)/lib/$(NSPR31_LIB_PREFIX)nspr4.lib
|
||||
EXTRA_LIBS = \
|
||||
$(DIST)/lib/swfci.lib \
|
||||
$(DIST)/lib/softokn.lib \
|
||||
@ -66,44 +63,25 @@ EXTRA_LIBS = \
|
||||
|
||||
else
|
||||
|
||||
# $(DIST)/lib/libdbm.a
|
||||
# $(DIST)/lib/libnspr3.a
|
||||
#
|
||||
CRYPTO_LIB = $(DIST)/lib/libfreebl.$(LIB_SUFFIX)
|
||||
|
||||
ifdef MOZILLA_SECURITY_BUILD
|
||||
CRYPTO_LIB = $(DIST)/lib/libcrypto.$(LIB_SUFFIX)
|
||||
CRYPTO_LIB = $(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
|
||||
endif
|
||||
ifdef MOZILLA_BSAFE_BUILD
|
||||
CRYPTO_LIB += $(DIST)/lib/libbsafe.$(LIB_SUFFIX)
|
||||
CRYPTO_LIB += $(DIST)/lib/libfreebl.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH), OS2)
|
||||
PLC_STATIC_LIB = $(DIST)/lib/plc4.$(LIB_SUFFIX)
|
||||
PLDS_STATIC_LIB = $(DIST)/lib/plds4.$(LIB_SUFFIX)
|
||||
else
|
||||
PLC_STATIC_LIB = $(DIST)/lib/libplc4.$(LIB_SUFFIX)
|
||||
PLDS_STATIC_LIB = $(DIST)/lib/libplds4.$(LIB_SUFFIX)
|
||||
CRYPTO_LIB += $(DIST)/lib/$(LIB_PREFIX)bsafe.$(LIB_SUFFIX)
|
||||
CRYPTO_LIB += $(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(DIST)/lib/libswfci.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libsoftokn.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)swfci.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
|
||||
$(CRYPTO_LIB) \
|
||||
$(DIST)/lib/libsecutil.$(LIB_SUFFIX) \
|
||||
$(PLC_STATIC_LIB) \
|
||||
$(PLDS_STATIC_LIB) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
endif
|
||||
|
||||
#ifeq ($(OS_TARGET), WIN16)
|
||||
#W16LIBS += $(SWCILIB)
|
||||
#else
|
||||
#OBJS += $(SWCILIB)
|
||||
#endif
|
||||
|
||||
INST_JS = inst.js
|
||||
LIBCI_JAR = $(OBJDIR)/lib$(LIBRARY_NAME).jar
|
||||
LIBCI_JAR_SRC = $(INST_JS) pk11inst $(SHARED_LIBRARY)
|
||||
|
||||
@ -36,11 +36,6 @@
|
||||
# are specifed as dependencies within rules.mk.
|
||||
#
|
||||
|
||||
#TARGETS = $(LIBRARY)
|
||||
#SHARED_LIBRARY =
|
||||
#IMPORT_LIBRARY =
|
||||
#PROGRAM =
|
||||
|
||||
# can't do this in manifest.mn because OS_ARCH isn't defined there.
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
|
||||
@ -51,60 +46,15 @@ IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).lib
|
||||
RES = $(OBJDIR)/$(LIBRARY_NAME).res
|
||||
RESNAME = $(LIBRARY_NAME).rc
|
||||
|
||||
# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
|
||||
SHARED_LIBRARY_LIBS = \
|
||||
$(DIST)/lib/certhi.lib \
|
||||
$(DIST)/lib/cryptohi.lib \
|
||||
$(DIST)/lib/pk11wrap.lib \
|
||||
$(DIST)/lib/certdb.lib \
|
||||
$(DIST)/lib/secutil.lib \
|
||||
$(DIST)/lib/nsspki.lib \
|
||||
$(DIST)/lib/nssdev.lib \
|
||||
$(DIST)/lib/nssb.lib \
|
||||
$(NULL)
|
||||
|
||||
SHARED_LIBRARY_DIRS = \
|
||||
../certhigh \
|
||||
../cryptohi \
|
||||
../pk11wrap \
|
||||
../certdb \
|
||||
../util \
|
||||
../pki \
|
||||
../dev \
|
||||
../base \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_SHARED_LIBS += \
|
||||
$(DIST)/lib/softokn3.lib \
|
||||
$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4.lib \
|
||||
$(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4.lib \
|
||||
$(DIST)/lib/$(NSPR31_LIB_PREFIX)nspr4.lib \
|
||||
$(NULL)
|
||||
|
||||
else
|
||||
|
||||
# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
|
||||
SHARED_LIBRARY_LIBS = \
|
||||
$(DIST)/lib/libcerthi.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libpk11wrap.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libcryptohi.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libcertdb.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libsecutil.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnsspki.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnssdev.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libnssb.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
SHARED_LIBRARY_DIRS = \
|
||||
../certhigh \
|
||||
../pk11wrap \
|
||||
../cryptohi \
|
||||
../certdb \
|
||||
../util \
|
||||
../pki \
|
||||
../dev \
|
||||
../base \
|
||||
$(NULL)
|
||||
|
||||
# $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
|
||||
# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
|
||||
EXTRA_SHARED_LIBS += \
|
||||
@ -114,5 +64,30 @@ EXTRA_SHARED_LIBS += \
|
||||
-lplds4 \
|
||||
-lnspr4 \
|
||||
$(NULL)
|
||||
|
||||
endif
|
||||
|
||||
|
||||
# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
|
||||
SHARED_LIBRARY_LIBS = \
|
||||
$(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)cryptohi.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)nsspki.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)nssdev.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
SHARED_LIBRARY_DIRS = \
|
||||
../certhigh \
|
||||
../cryptohi \
|
||||
../pk11wrap \
|
||||
../certdb \
|
||||
../util \
|
||||
../pki \
|
||||
../dev \
|
||||
../base \
|
||||
$(NULL)
|
||||
|
||||
|
||||
@ -52,37 +52,15 @@ IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).lib
|
||||
RES = $(OBJDIR)/smime.res
|
||||
RESNAME = smime.rc
|
||||
|
||||
SHARED_LIBRARY_LIBS = \
|
||||
$(DIST)/lib/pkcs12.lib \
|
||||
$(DIST)/lib/pkcs7.lib \
|
||||
$(NULL)
|
||||
|
||||
SHARED_LIBRARY_DIRS = \
|
||||
../pkcs12 \
|
||||
../pkcs7 \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_SHARED_LIBS += \
|
||||
$(DIST)/lib/nss3.lib \
|
||||
$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4.lib \
|
||||
$(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4.lib \
|
||||
$(DIST)/lib/$(NSPR31_LIB_PREFIX)nspr4.lib \
|
||||
$(NULL)
|
||||
|
||||
else
|
||||
|
||||
|
||||
# $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
|
||||
# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
|
||||
SHARED_LIBRARY_LIBS = \
|
||||
$(DIST)/lib/libpkcs12.${LIB_SUFFIX} \
|
||||
$(DIST)/lib/libpkcs7.${LIB_SUFFIX} \
|
||||
$(NULL)
|
||||
|
||||
SHARED_LIBRARY_DIRS = \
|
||||
../pkcs12 \
|
||||
../pkcs7 \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_SHARED_LIBS += \
|
||||
-L$(DIST)/lib/ \
|
||||
-lnss3 \
|
||||
@ -90,4 +68,18 @@ EXTRA_SHARED_LIBS += \
|
||||
-lplds4 \
|
||||
-lnspr4 \
|
||||
$(NULL)
|
||||
|
||||
endif
|
||||
|
||||
|
||||
SHARED_LIBRARY_LIBS = \
|
||||
$(DIST)/lib/$(LIB_PREFIX)pkcs12.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)pkcs7.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
SHARED_LIBRARY_DIRS = \
|
||||
../pkcs12 \
|
||||
../pkcs7 \
|
||||
$(NULL)
|
||||
|
||||
|
||||
|
||||
@ -46,6 +46,20 @@ ifdef MOZILLA_CLIENT
|
||||
DEFINES += -DMOZ_CLIENT
|
||||
endif
|
||||
|
||||
# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
|
||||
CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
|
||||
CRYPTODIR=../freebl
|
||||
ifdef MOZILLA_SECURITY_BUILD
|
||||
CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)crypto.$(LIB_SUFFIX)
|
||||
CRYPTODIR=../crypto
|
||||
endif
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(CRYPTOLIB) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
# can't do this in manifest.mn because OS_ARCH isn't defined there.
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
|
||||
@ -56,20 +70,6 @@ IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).lib
|
||||
RES = $(OBJDIR)/$(LIBRARY_NAME).res
|
||||
RESNAME = $(LIBRARY_NAME).rc
|
||||
|
||||
# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
|
||||
CRYPTOLIB=$(DIST)/lib/freebl.lib
|
||||
CRYPTODIR=../freebl
|
||||
ifdef MOZILLA_SECURITY_BUILD
|
||||
CRYPTOLIB=$(DIST)/lib/crypto.lib
|
||||
CRYPTODIR=../crypto
|
||||
endif
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(CRYPTOLIB) \
|
||||
$(DIST)/lib/secutil.lib \
|
||||
$(DIST)/lib/dbm.lib \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZILLA_BSAFE_BUILD
|
||||
EXTRA_LIBS+=$(DIST)/lib/bsafe$(BSAFEVER).lib
|
||||
endif
|
||||
@ -79,22 +79,11 @@ EXTRA_SHARED_LIBS += \
|
||||
$(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4.lib \
|
||||
$(DIST)/lib/$(NSPR31_LIB_PREFIX)nspr4.lib \
|
||||
$(NULL)
|
||||
|
||||
else
|
||||
|
||||
# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
|
||||
CRYPTOLIB=$(DIST)/lib/libfreebl.$(LIB_SUFFIX)
|
||||
CRYPTODIR=../freebl
|
||||
ifdef MOZILLA_SECURITY_BUILD
|
||||
CRYPTOLIB=$(DIST)/lib/libcrypto.$(LIB_SUFFIX)
|
||||
CRYPTODIR=../crypto
|
||||
endif
|
||||
EXTRA_LIBS += \
|
||||
$(CRYPTOLIB) \
|
||||
$(DIST)/lib/libsecutil.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/libdbm.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
ifdef MOZILLA_BSAFE_BUILD
|
||||
EXTRA_LIBS+=$(DIST)/lib/libbsafe.$(LIB_SUFFIX)
|
||||
EXTRA_LIBS+=$(DIST)/lib/$(LIB_PREFIX)bsafe.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
# $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user