From dc1565216a5d20ae0d75872151523252309a1292 Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Wed, 4 Jan 2017 14:24:24 +0000 Subject: nss-3.28.1 --- nss/lib/Makefile | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) (limited to 'nss/lib/Makefile') diff --git a/nss/lib/Makefile b/nss/lib/Makefile index a28bfd4..8eedad0 100644 --- a/nss/lib/Makefile +++ b/nss/lib/Makefile @@ -46,6 +46,14 @@ ifndef NSS_DISABLE_DBM DBM_SRCDIR = dbm # Add the dbm directory to DIRS. endif +ifeq ($(NSS_BUILD_UTIL_ONLY),1) +SYSINIT_SRCDIR= +endif + +ifndef NSS_DISABLE_LIBPKIX +LIBPKIX_SRCDIR = libpkix # Add the libpkix directory to DIRS. +endif + ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### @@ -62,14 +70,28 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### -ifeq ($(NSS_BUILD_WITHOUT_SOFTOKEN),1) -# Not included when building nss without softoken -UTIL_SRCDIR = -FREEBL_SRCDIR = -SOFTOKEN_SRCDIR = +ifeq ($(NSS_BUILD_UTIL_ONLY),1) + UTIL_SRCDIR = util + FREEBL_SRCDIR = + SOFTOKEN_SRCDIR = else -# default is to include all -UTIL_SRCDIR = util -FREEBL_SRCDIR = freebl -SOFTOKEN_SRCDIR = softoken + ifeq ($(NSS_BUILD_SOFTOKEN_ONLY),1) + UTIL_SRCDIR = + FREEBL_SRCDIR = freebl + SOFTOKEN_SRCDIR = softoken + else + ifeq ($(NSS_BUILD_WITHOUT_SOFTOKEN),1) + # Not included when building nss without softoken + # This build type uses the build results of the prior + # NSS_BUILD_UTIL_ONLY and NSS_BUILD_SOFTOKEN_ONLY builds + UTIL_SRCDIR = + FREEBL_SRCDIR = + SOFTOKEN_SRCDIR = + else + # default is to include all + UTIL_SRCDIR = util + FREEBL_SRCDIR = freebl + SOFTOKEN_SRCDIR = softoken + endif + endif endif -- cgit v1.2.1