New version without duplicates as requested by ekr in its feedback.
BUG1168917_BRANCH
New version without duplicates as requested by ekr in its feedback.
--- a/cmd/manifest.mn
+++ b/cmd/manifest.mn
@@ -1,48 +1,44 @@
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DEPTH = ..
# MODULE = seccmd
-ifdef NSS_BUILD_UTIL_ONLY
REQUIRES = nspr
DIRS = \
$(NULL)
-else
+ifndef NSS_BUILD_UTIL_ONLY
REQUIRES = nss nspr libdbm
-ifdef NSS_BUILD_SOFTOKEN_ONLY
-DIRS = lib \
+DIRS += \
+ lib \
$(BLTEST_SRCDIR) \
$(FIPSTEST_SRCDIR) \
$(LOWHASHTEST_SRCDIR) \
$(SHLIBSIGN_SRCDIR) \
$(NULL)
-else
-DIRS = lib \
+ifndef NSS_BUILD_SOFTOKEN_ONLY
+DIRS += \
addbuiltin \
atob \
- $(BLTEST_SRCDIR) \
btoa \
certcgi \
certutil \
chktest \
crlutil \
crmftest \
dbtest \
derdump \
digest \
httpserv \
- $(FIPSTEST_SRCDIR) \
- $(LOWHASHTEST_SRCDIR) \
listsuites \
makepqg \
multinit \
ocspclnt \
ocspresp \
oidcalc \
p7content \
p7env \
@@ -55,17 +51,16 @@ DIRS = lib \
pkix-errcodes \
pp \
pwdecrypt \
rsaperf \
sdrtest \
selfserv \
signtool \
signver \
- $(SHLIBSIGN_SRCDIR) \
smimetools \
ssltap \
strsclnt \
symkeyutil \
tests \
tstclnt \
vfychain \
vfyserv \
--- a/cmd/platlibs.mk
+++ b/cmd/platlibs.mk
@@ -46,17 +46,17 @@ else
CRYPTOLIB=$(FREEBL_LIB_DIR)/$(LIB_PREFIX)freebl.$(LIB_SUFFIX)
SOFTOKENLIB=
EXTRA_SHARED_LIBS += \
-L$(SOFTOKEN_LIB_DIR) \
-lsoftokn3 \
$(NULL)
endif
-ifndef NSS_BUILD_SOFTOKEN_ONLY)
+ifndef NSS_BUILD_SOFTOKEN_ONLY
PKIXLIB = \
$(DIST)/lib/$(LIB_PREFIX)pkixtop.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)pkixutil.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)pkixsystem.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)pkixcrlsel.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)pkixmodule.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)pkixstore.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)pkixparams.$(LIB_SUFFIX) \
@@ -97,50 +97,50 @@ EXTRA_LIBS += \
$(NULL)
# $(PROGRAM) has NO explicit dependencies on $(OS_LIBS)
#OS_LIBS += \
wsock32.lib \
winmm.lib \
$(NULL)
else
-ifdef NSS_BUILD_SOFTOKEN_ONLY
+EXTRA_LIBS += \
+ $(NULL)
+ifndef NSS_BUILD_UTIL_ONLY
EXTRA_LIBS += \
$(DIST)/lib/$(LIB_PREFIX)sectool.$(LIB_SUFFIX) \
$(SOFTOKENLIB) \
$(CRYPTOLIB) \
$(NULL)
-else
+ifndef NSS_BUILD_SOFTOKEN_ONLY
EXTRA_LIBS += \
$(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)ssl.$(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) \
- $(SOFTOKENLIB) \
$(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) \
- $(CRYPTOLIB) \
$(DBMLIB) \
$(PKIXLIB) \
$(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
$(NULL)
endif
+endif
ifeq ($(OS_ARCH), AIX)
EXTRA_SHARED_LIBS += -brtl
endif
# $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
EXTRA_SHARED_LIBS += \
@@ -184,38 +184,30 @@ EXTRA_LIBS += \
$(NULL)
ifeq ($(OS_ARCH), AIX)
EXTRA_SHARED_LIBS += -brtl
endif
# $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
-ifdef NSS_BUILD_SOFTOKEN_ONLY
EXTRA_SHARED_LIBS += \
-L$(DIST)/lib \
-L$(NSSUTIL_LIB_DIR) \
-lnssutil3 \
-L$(NSPR_LIB_DIR) \
-lplc4 \
-lplds4 \
-lnspr4 \
$(NULL)
-else
+ifndef NSS_BUILD_SOFTOKEN_ONLY
EXTRA_SHARED_LIBS += \
- -L$(DIST)/lib \
-lssl3 \
-lsmime3 \
-lnss3 \
- -L$(NSSUTIL_LIB_DIR) \
- -lnssutil3 \
- -L$(NSPR_LIB_DIR) \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
$(NULL)
endif
endif
ifdef SOFTOKEN_LIB_DIR
ifdef NSS_USE_SYSTEM_FREEBL
EXTRA_SHARED_LIBS += -L$(SOFTOKEN_LIB_DIR) -lsoftokn3
endif
--- a/lib/manifest.mn
+++ b/lib/manifest.mn
@@ -11,42 +11,36 @@ DEPTH = ..
# softoken and prereqs.
# stan (not a separate dll yet)
# libpkix (not a separate dll)
# nss base (traditional)
# ssl
# smime
# ckfw (builtins module)
# crmf jar (not dll's)
-ifdef NSS_BUILD_UTIL_ONLY
- DIRS = \
+DIRS = \
$(UTIL_SRCDIR) \
$(NULL)
-else
- ifdef NSS_BUILD_SOFTOKEN_ONLY
- # Building softoken (and freebl) only requires that the paths
- # to the locations where the util headers and libraries were
- # previously installed by a prior util-only build, likely in
- # in a system location that varies with the distribution. This
- # cannot be addressed here and requires that downstream package
- # mantainers add suitable modifications.
- DIRS = \
- $(UTIL_SRCDIR) \
+ifndef NSS_BUILD_UTIL_ONLY
+ # Building softoken (and freebl) only requires that the paths
+ # to the locations where the util headers and libraries were
+ # previously installed by a prior util-only build, likely in
+ # in a system location that varies with the distribution. This
+ # cannot be addressed here and requires that downstream package
+ # mantainers add suitable modifications. Building fill nss will
+ # not have that problem everything is available.
+ DIRS += \
$(FREEBL_SRCDIR) \
$(SQLITE_SRCDIR) \
$(DBM_SRCDIR) \
$(SOFTOKEN_SRCDIR) \
$(NULL)
- else
- DIRS = \
- $(UTIL_SRCDIR) \
- $(FREEBL_SRCDIR) \
- $(SQLITE_SRCDIR) \
- $(DBM_SRCDIR) \
- $(SOFTOKEN_SRCDIR) \
+ ifndef NSS_BUILD_SOFTOKEN_ONLY
+ # default, add the rest of nss
+ DIRS += \
base dev pki \
libpkix \
certdb certhigh pk11wrap cryptohi nss \
$(ZLIB_SRCDIR) ssl \
pkcs7 pkcs12 smime \
crmf jar \
ckfw $(SYSINIT_SRCDIR) \
$(NULL)