Thu, 22 Jan 2015 13:21:57 +0100
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
michael@0 | 1 | # |
michael@0 | 2 | # This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 3 | # License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 4 | # file, You can obtain one at http://mozilla.org/MPL/2.0/. |
michael@0 | 5 | |
michael@0 | 6 | ifdef NISCC_TEST |
michael@0 | 7 | DEFINES += -DNISCC_TEST |
michael@0 | 8 | endif |
michael@0 | 9 | |
michael@0 | 10 | ifdef NSS_NO_PKCS11_BYPASS |
michael@0 | 11 | DEFINES += -DNO_PKCS11_BYPASS |
michael@0 | 12 | else |
michael@0 | 13 | CRYPTOLIB=$(SOFTOKEN_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX) |
michael@0 | 14 | |
michael@0 | 15 | EXTRA_LIBS += \ |
michael@0 | 16 | $(CRYPTOLIB) \ |
michael@0 | 17 | $(NULL) |
michael@0 | 18 | endif |
michael@0 | 19 | |
michael@0 | 20 | ifeq (,$(filter-out WIN%,$(OS_TARGET))) |
michael@0 | 21 | |
michael@0 | 22 | # don't want the 32 in the shared library name |
michael@0 | 23 | SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) |
michael@0 | 24 | IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) |
michael@0 | 25 | |
michael@0 | 26 | RES = $(OBJDIR)/ssl.res |
michael@0 | 27 | RESNAME = ssl.rc |
michael@0 | 28 | |
michael@0 | 29 | ifdef NS_USE_GCC |
michael@0 | 30 | EXTRA_SHARED_LIBS += \ |
michael@0 | 31 | -L$(DIST)/lib \ |
michael@0 | 32 | -lnss3 \ |
michael@0 | 33 | -L$(NSSUTIL_LIB_DIR) \ |
michael@0 | 34 | -lnssutil3 \ |
michael@0 | 35 | -L$(NSPR_LIB_DIR) \ |
michael@0 | 36 | -lplc4 \ |
michael@0 | 37 | -lplds4 \ |
michael@0 | 38 | -lnspr4 \ |
michael@0 | 39 | $(NULL) |
michael@0 | 40 | else # ! NS_USE_GCC |
michael@0 | 41 | EXTRA_SHARED_LIBS += \ |
michael@0 | 42 | $(DIST)/lib/nss3.lib \ |
michael@0 | 43 | $(DIST)/lib/nssutil3.lib \ |
michael@0 | 44 | $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.lib \ |
michael@0 | 45 | $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.lib \ |
michael@0 | 46 | $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.lib \ |
michael@0 | 47 | $(NULL) |
michael@0 | 48 | endif # NS_USE_GCC |
michael@0 | 49 | |
michael@0 | 50 | else |
michael@0 | 51 | |
michael@0 | 52 | # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. |
michael@0 | 53 | EXTRA_SHARED_LIBS += \ |
michael@0 | 54 | -L$(DIST)/lib \ |
michael@0 | 55 | -lnss3 \ |
michael@0 | 56 | -L$(NSSUTIL_LIB_DIR) \ |
michael@0 | 57 | -lnssutil3 \ |
michael@0 | 58 | -L$(NSPR_LIB_DIR) \ |
michael@0 | 59 | -lplc4 \ |
michael@0 | 60 | -lplds4 \ |
michael@0 | 61 | -lnspr4 \ |
michael@0 | 62 | $(NULL) |
michael@0 | 63 | |
michael@0 | 64 | ifeq ($(OS_ARCH), BeOS) |
michael@0 | 65 | EXTRA_SHARED_LIBS += -lbe |
michael@0 | 66 | endif |
michael@0 | 67 | |
michael@0 | 68 | endif |
michael@0 | 69 | |
michael@0 | 70 | # Mozilla's mozilla/modules/zlib/src/zconf.h adds the MOZ_Z_ prefix to zlib |
michael@0 | 71 | # exported symbols, which causes problem when NSS is built as part of Mozilla. |
michael@0 | 72 | # So we add a NSS_ENABLE_ZLIB variable to allow Mozilla to turn this off. |
michael@0 | 73 | NSS_ENABLE_ZLIB = 1 |
michael@0 | 74 | ifdef NSS_ENABLE_ZLIB |
michael@0 | 75 | |
michael@0 | 76 | DEFINES += -DNSS_ENABLE_ZLIB |
michael@0 | 77 | |
michael@0 | 78 | # If a platform has a system zlib, set USE_SYSTEM_ZLIB to 1 and |
michael@0 | 79 | # ZLIB_LIBS to the linker command-line arguments for the system zlib |
michael@0 | 80 | # (for example, -lz) in the platform's config file in coreconf. |
michael@0 | 81 | ifdef USE_SYSTEM_ZLIB |
michael@0 | 82 | OS_LIBS += $(ZLIB_LIBS) |
michael@0 | 83 | else |
michael@0 | 84 | ZLIB_LIBS = $(DIST)/lib/$(LIB_PREFIX)zlib.$(LIB_SUFFIX) |
michael@0 | 85 | EXTRA_LIBS += $(ZLIB_LIBS) |
michael@0 | 86 | endif |
michael@0 | 87 | |
michael@0 | 88 | endif |