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 | # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS) |
michael@0 | 7 | CRYPTOLIB=$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX) |
michael@0 | 8 | |
michael@0 | 9 | EXTRA_LIBS += \ |
michael@0 | 10 | $(CRYPTOLIB) \ |
michael@0 | 11 | $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \ |
michael@0 | 12 | $(NULL) |
michael@0 | 13 | |
michael@0 | 14 | # can't do this in manifest.mn because OS_TARGET isn't defined there. |
michael@0 | 15 | ifeq (,$(filter-out WIN%,$(OS_TARGET))) |
michael@0 | 16 | |
michael@0 | 17 | # don't want the 32 in the shared library name |
michael@0 | 18 | SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) |
michael@0 | 19 | IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) |
michael@0 | 20 | |
michael@0 | 21 | RES = $(OBJDIR)/$(LIBRARY_NAME).res |
michael@0 | 22 | RESNAME = $(LIBRARY_NAME).rc |
michael@0 | 23 | |
michael@0 | 24 | ifdef NS_USE_GCC |
michael@0 | 25 | EXTRA_SHARED_LIBS += \ |
michael@0 | 26 | -L$(DIST)/lib \ |
michael@0 | 27 | -L$(NSSUTIL_LIB_DIR) \ |
michael@0 | 28 | -lnssutil3 \ |
michael@0 | 29 | -L$(NSPR_LIB_DIR) \ |
michael@0 | 30 | -lplc4 \ |
michael@0 | 31 | -lplds4 \ |
michael@0 | 32 | -lnspr4 \ |
michael@0 | 33 | $(NULL) |
michael@0 | 34 | else # ! NS_USE_GCC |
michael@0 | 35 | |
michael@0 | 36 | EXTRA_SHARED_LIBS += \ |
michael@0 | 37 | $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.lib \ |
michael@0 | 38 | $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.lib \ |
michael@0 | 39 | $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.lib \ |
michael@0 | 40 | $(DIST)/lib/nssutil3.lib \ |
michael@0 | 41 | $(NULL) |
michael@0 | 42 | endif # NS_USE_GCC |
michael@0 | 43 | |
michael@0 | 44 | else |
michael@0 | 45 | |
michael@0 | 46 | # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) |
michael@0 | 47 | # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. |
michael@0 | 48 | EXTRA_SHARED_LIBS += \ |
michael@0 | 49 | -L$(DIST)/lib \ |
michael@0 | 50 | -L$(NSSUTIL_LIB_DIR) \ |
michael@0 | 51 | -lnssutil3 \ |
michael@0 | 52 | -L$(NSPR_LIB_DIR) \ |
michael@0 | 53 | -lplc4 \ |
michael@0 | 54 | -lplds4 \ |
michael@0 | 55 | -lnspr4 \ |
michael@0 | 56 | $(NULL) |
michael@0 | 57 | endif |