From 341b865887bf51e7d12aa5a76bea894b7862d3ac Mon Sep 17 00:00:00 2001
From: David Keeler <dkeeler@mozilla.com>
Date: Wed, 12 Mar 2014 13:08:18 -0700
Subject: [PATCH] bug 982403 - separate the compilation of certverifier and
 insanity::pkix r=cviecco r=briansmith

--HG--
rename : security/certverifier/moz.build => security/insanity/moz.build
---
 security/certverifier/moz.build               |  7 +----
 security/insanity/moz.build                   | 27 +++++++++++++++++++
 .../ssl/tests/unit/tlsserver/cmd/Makefile.in  |  3 +--
 3 files changed, 29 insertions(+), 8 deletions(-)
 create mode 100644 security/insanity/moz.build

diff --git a/security/certverifier/moz.build b/security/certverifier/moz.build
index 872ad364b9d..4855731fbf8 100644
--- a/security/certverifier/moz.build
+++ b/security/certverifier/moz.build
@@ -5,11 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 UNIFIED_SOURCES += [
-    '../insanity/lib/pkixbuild.cpp',
-    '../insanity/lib/pkixcheck.cpp',
-    '../insanity/lib/pkixder.cpp',
-    '../insanity/lib/pkixkey.cpp',
-    '../insanity/lib/pkixocsp.cpp',
     'CertVerifier.cpp',
     'NSSCertDBTrustDomain.cpp',
 ]
@@ -24,7 +19,7 @@ LOCAL_INCLUDES += [
 ]
 
 DIRS += [
-    '../insanity/test/lib',
+    '../insanity',
 ]
 
 FAIL_ON_WARNINGS = True
diff --git a/security/insanity/moz.build b/security/insanity/moz.build
new file mode 100644
index 00000000000..e24b6eb409d
--- /dev/null
+++ b/security/insanity/moz.build
@@ -0,0 +1,27 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+UNIFIED_SOURCES += [
+    'lib/pkixbuild.cpp',
+    'lib/pkixcheck.cpp',
+    'lib/pkixder.cpp',
+    'lib/pkixkey.cpp',
+    'lib/pkixocsp.cpp',
+]
+
+LOCAL_INCLUDES += [
+    'include',
+]
+
+DIRS += [
+    'test/lib',
+]
+
+FAIL_ON_WARNINGS = True
+
+LIBRARY_NAME = 'insanitypkix'
+
+FINAL_LIBRARY = 'xul'
diff --git a/security/manager/ssl/tests/unit/tlsserver/cmd/Makefile.in b/security/manager/ssl/tests/unit/tlsserver/cmd/Makefile.in
index 785fdc0204e..0cda7123d29 100644
--- a/security/manager/ssl/tests/unit/tlsserver/cmd/Makefile.in
+++ b/security/manager/ssl/tests/unit/tlsserver/cmd/Makefile.in
@@ -10,10 +10,9 @@ LIBS = \
   $(NSPR_LIBS) \
   $(NSS_LIBS) \
   $(MOZALLOC_LIB) \
-  ../../../../../../certverifier/$(LIB_PREFIX)certverifier.$(LIB_SUFFIX) \
+  ../../../../../../insanity/$(LIB_PREFIX)insanitypkix.$(LIB_SUFFIX) \
   ../../../../../../insanity/test/lib/$(LIB_PREFIX)pkixtestutil.$(LIB_SUFFIX) \
   ../lib/$(LIB_PREFIX)tlsserver.$(LIB_SUFFIX) \
   $(NULL)
 
 DEFINES += $(TK_CFLAGS)
-