summaryrefslogtreecommitdiff
path: root/cmd/Makefile
diff options
context:
space:
mode:
authorElio Maldonado <emaldona@redhat.com>2013-04-09 22:37:08 -0700
committerElio Maldonado <emaldona@redhat.com>2013-04-09 22:37:08 -0700
commitf5751eef41594717893f21834cb1ba1c225886f5 (patch)
tree5d4054f094dd6487440a4da612cbd8ace5e69a89 /cmd/Makefile
parent05eb18708b148d874d8aa6dd9a0eb5a5bf25b50f (diff)
downloadnss-hg-f5751eef41594717893f21834cb1ba1c225886f5.tar.gz
Bug 835919 - Allow optionally building nss without softoken in the tree, r=rrelya
Diffstat (limited to 'cmd/Makefile')
-rw-r--r--cmd/Makefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/cmd/Makefile b/cmd/Makefile
index b98205926..0ae45649c 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -14,6 +14,14 @@ ifdef BUILD_LIBPKIX_TESTS
DIRS += libpkix
endif
+ifeq ($(NSS_BUILD_WITHOUT_SOFTOKEN),1)
+BLTEST_SRCDIR=
+FIPSTEST_SRCDIR=
+else
+BLTEST_SRCDIR = bltest
+FIPSTEST_SRCDIR = fipstest
+endif
+
LOWHASHTEST_SRCDIR=
ifeq ($(FREEBL_LOWHASH),1)
LOWHASHTEST_SRCDIR = lowhashtest # Add the lowhashtest directory to DIRS.