395850 - build of libpkix tests creates links to nonexistant shared libraries and breaks windows build. r=nelson

32 files changed, 74 insertions, 29 deletions

diff --git a/security/nss/cmd/libpkix/config.mk b/security/nss/cmd/libpkix/config.mk
new file mode 100644
index 000000000..5ad9e1b90
--- /dev/null
+++ b/security/nss/cmd/libpkix/config.mk
@@ -0,0 +1,42 @@
+# 
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# htt/www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the PKIX-C library.
+#
+# The Initial Developer of the Original Code is
+# Sun Microsystems, Inc.
+# Portions created by the Initial Developer are
+# Copyright 2004-2007 Sun Microsystems, Inc.  All Rights Reserved.
+#
+# Contributor(s):
+#   Sun Microsystems, Inc.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+TARGETS = $(LIBRARY)
+SHARED_LIBRARY =
+IMPORT_LIBRARY =
+PROGRAM        =
diff --git a/security/nss/cmd/libpkix/perf/Makefile b/security/nss/cmd/libpkix/perf/Makefile
index 6d85419fd..c13b32931 100755
--- a/security/nss/cmd/libpkix/perf/Makefile
+++ b/security/nss/cmd/libpkix/perf/Makefile
@@ -53,6 +53,8 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
+include $(PKIX_DEPTH)/config.mk
+
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/security/nss/cmd/libpkix/perf/manifest.mn b/security/nss/cmd/libpkix/perf/manifest.mn
index c00f7754c..511118d14 100755
--- a/security/nss/cmd/libpkix/perf/manifest.mn
+++ b/security/nss/cmd/libpkix/perf/manifest.mn
@@ -49,8 +49,6 @@ CSRCS = libpkix_buildthreads.c \
 
 LIBRARY_NAME = pkixtoolperf
 
-TARGETS = $(LIBRARY)
-
 SOURCE_LIB_DIR = $(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
diff --git a/security/nss/cmd/libpkix/pkix/Makefile b/security/nss/cmd/libpkix/pkix/Makefile
index 032bd29c9..2b004b29e 100755
--- a/security/nss/cmd/libpkix/pkix/Makefile
+++ b/security/nss/cmd/libpkix/pkix/Makefile
@@ -53,6 +53,8 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
+include $(PKIX_DEPTH)/config.mk
+
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/security/nss/cmd/libpkix/pkix/certsel/Makefile b/security/nss/cmd/libpkix/pkix/certsel/Makefile
index f957b6b63..3f1484b02 100755
--- a/security/nss/cmd/libpkix/pkix/certsel/Makefile
+++ b/security/nss/cmd/libpkix/pkix/certsel/Makefile
@@ -53,6 +53,8 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
+include $(PKIX_DEPTH)/config.mk
+
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/security/nss/cmd/libpkix/pkix/certsel/manifest.mn b/security/nss/cmd/libpkix/pkix/certsel/manifest.mn
index b814c5b9b..7dbfd56a1 100755
--- a/security/nss/cmd/libpkix/pkix/certsel/manifest.mn
+++ b/security/nss/cmd/libpkix/pkix/certsel/manifest.mn
@@ -49,8 +49,6 @@ CSRCS = test_certselector.c \
 
 LIBRARY_NAME=pkixtoolcertsel
 
-TARGETS = $(LIBRARY)
-
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
diff --git a/security/nss/cmd/libpkix/pkix/checker/Makefile b/security/nss/cmd/libpkix/pkix/checker/Makefile
index f957b6b63..3f1484b02 100755
--- a/security/nss/cmd/libpkix/pkix/checker/Makefile
+++ b/security/nss/cmd/libpkix/pkix/checker/Makefile
@@ -53,6 +53,8 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
+include $(PKIX_DEPTH)/config.mk
+
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/security/nss/cmd/libpkix/pkix/checker/manifest.mn b/security/nss/cmd/libpkix/pkix/checker/manifest.mn
index 1fb11f471..317015232 100755
--- a/security/nss/cmd/libpkix/pkix/checker/manifest.mn
+++ b/security/nss/cmd/libpkix/pkix/checker/manifest.mn
@@ -47,8 +47,6 @@ CSRCS = test_certchainchecker.c
 
 LIBRARY_NAME=pkixtoolchecker
 
-TARGETS = $(LIBRARY)
-
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
diff --git a/security/nss/cmd/libpkix/pkix/crlsel/Makefile b/security/nss/cmd/libpkix/pkix/crlsel/Makefile
index f957b6b63..3f1484b02 100755
--- a/security/nss/cmd/libpkix/pkix/crlsel/Makefile
+++ b/security/nss/cmd/libpkix/pkix/crlsel/Makefile
@@ -53,6 +53,8 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
+include $(PKIX_DEPTH)/config.mk
+
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/security/nss/cmd/libpkix/pkix/crlsel/manifest.mn b/security/nss/cmd/libpkix/pkix/crlsel/manifest.mn
index ac072198b..0357ba854 100755
--- a/security/nss/cmd/libpkix/pkix/crlsel/manifest.mn
+++ b/security/nss/cmd/libpkix/pkix/crlsel/manifest.mn
@@ -49,8 +49,6 @@ CSRCS = test_crlselector.c \
 
 LIBRARY_NAME=pkixtoolcrlsel
 
-TARGETS = $(LIBRARY)
-
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
diff --git a/security/nss/cmd/libpkix/pkix/params/Makefile b/security/nss/cmd/libpkix/pkix/params/Makefile
index f957b6b63..3f1484b02 100755
--- a/security/nss/cmd/libpkix/pkix/params/Makefile
+++ b/security/nss/cmd/libpkix/pkix/params/Makefile
@@ -53,6 +53,8 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
+include $(PKIX_DEPTH)/config.mk
+
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/security/nss/cmd/libpkix/pkix/params/manifest.mn b/security/nss/cmd/libpkix/pkix/params/manifest.mn
index 6940060b7..2c0cde745 100755
--- a/security/nss/cmd/libpkix/pkix/params/manifest.mn
+++ b/security/nss/cmd/libpkix/pkix/params/manifest.mn
@@ -51,8 +51,6 @@ CSRCS = test_procparams.c \
 
 LIBRARY_NAME=pkixtoolparams
 
-TARGETS = $(LIBRARY)
-
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
diff --git a/security/nss/cmd/libpkix/pkix/results/Makefile b/security/nss/cmd/libpkix/pkix/results/Makefile
index f957b6b63..3f1484b02 100755
--- a/security/nss/cmd/libpkix/pkix/results/Makefile
+++ b/security/nss/cmd/libpkix/pkix/results/Makefile
@@ -53,6 +53,8 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
+include $(PKIX_DEPTH)/config.mk
+
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/security/nss/cmd/libpkix/pkix/results/manifest.mn b/security/nss/cmd/libpkix/pkix/results/manifest.mn
index 191d599a5..a043f672e 100755
--- a/security/nss/cmd/libpkix/pkix/results/manifest.mn
+++ b/security/nss/cmd/libpkix/pkix/results/manifest.mn
@@ -51,8 +51,6 @@ CSRCS = test_buildresult.c \
 
 LIBRARY_NAME=pkixtoolresults
 
-TARGETS = $(LIBRARY)
-
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
diff --git a/security/nss/cmd/libpkix/pkix/store/Makefile b/security/nss/cmd/libpkix/pkix/store/Makefile
index f957b6b63..3f1484b02 100755
--- a/security/nss/cmd/libpkix/pkix/store/Makefile
+++ b/security/nss/cmd/libpkix/pkix/store/Makefile
@@ -53,6 +53,8 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
+include $(PKIX_DEPTH)/config.mk
+
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/security/nss/cmd/libpkix/pkix/store/manifest.mn b/security/nss/cmd/libpkix/pkix/store/manifest.mn
index 2fc8e21c9..813a7902a 100755
--- a/security/nss/cmd/libpkix/pkix/store/manifest.mn
+++ b/security/nss/cmd/libpkix/pkix/store/manifest.mn
@@ -47,8 +47,6 @@ CSRCS = test_store.c
 
 LIBRARY_NAME=pkixtoolstore
 
-TARGETS = $(LIBRARY)
-
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
diff --git a/security/nss/cmd/libpkix/pkix/top/Makefile b/security/nss/cmd/libpkix/pkix/top/Makefile
index f957b6b63..3f1484b02 100755
--- a/security/nss/cmd/libpkix/pkix/top/Makefile
+++ b/security/nss/cmd/libpkix/pkix/top/Makefile
@@ -53,6 +53,8 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
+include $(PKIX_DEPTH)/config.mk
+
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/security/nss/cmd/libpkix/pkix/top/manifest.mn b/security/nss/cmd/libpkix/pkix/top/manifest.mn
index bbbd30d1c..ba30cedb3 100755
--- a/security/nss/cmd/libpkix/pkix/top/manifest.mn
+++ b/security/nss/cmd/libpkix/pkix/top/manifest.mn
@@ -61,8 +61,6 @@ CSRCS = test_basicchecker.c \
 
 LIBRARY_NAME=pkixtooltop
 
-TARGETS = $(LIBRARY)
-
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
diff --git a/security/nss/cmd/libpkix/pkix/util/Makefile b/security/nss/cmd/libpkix/pkix/util/Makefile
index f957b6b63..3f1484b02 100755
--- a/security/nss/cmd/libpkix/pkix/util/Makefile
+++ b/security/nss/cmd/libpkix/pkix/util/Makefile
@@ -53,6 +53,8 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
+include $(PKIX_DEPTH)/config.mk
+
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/security/nss/cmd/libpkix/pkix/util/manifest.mn b/security/nss/cmd/libpkix/pkix/util/manifest.mn
index 8968ba8db..f63ead6f4 100755
--- a/security/nss/cmd/libpkix/pkix/util/manifest.mn
+++ b/security/nss/cmd/libpkix/pkix/util/manifest.mn
@@ -51,8 +51,6 @@ CSRCS = test_error.c \
 
 LIBRARY_NAME=pkixtoolutil
 
-TARGETS = $(LIBRARY)
-
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
diff --git a/security/nss/cmd/libpkix/pkix_pl/Makefile b/security/nss/cmd/libpkix/pkix_pl/Makefile
index 032bd29c9..2b004b29e 100755
--- a/security/nss/cmd/libpkix/pkix_pl/Makefile
+++ b/security/nss/cmd/libpkix/pkix_pl/Makefile
@@ -53,6 +53,8 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
+include $(PKIX_DEPTH)/config.mk
+
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/security/nss/cmd/libpkix/pkix_pl/module/Makefile b/security/nss/cmd/libpkix/pkix_pl/module/Makefile
index f957b6b63..3f1484b02 100755
--- a/security/nss/cmd/libpkix/pkix_pl/module/Makefile
+++ b/security/nss/cmd/libpkix/pkix_pl/module/Makefile
@@ -53,6 +53,8 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
+include $(PKIX_DEPTH)/config.mk
+
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/security/nss/cmd/libpkix/pkix_pl/module/manifest.mn b/security/nss/cmd/libpkix/pkix_pl/module/manifest.mn
index 099361388..42edb9d62 100755
--- a/security/nss/cmd/libpkix/pkix_pl/module/manifest.mn
+++ b/security/nss/cmd/libpkix/pkix_pl/module/manifest.mn
@@ -52,8 +52,6 @@ CSRCS = test_colcertstore.c \
 
 LIBRARY_NAME=pkixtoolmodule
 
-TARGETS = $(LIBRARY)
-
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
diff --git a/security/nss/cmd/libpkix/pkix_pl/pki/Makefile b/security/nss/cmd/libpkix/pkix_pl/pki/Makefile
index f957b6b63..3f1484b02 100755
--- a/security/nss/cmd/libpkix/pkix_pl/pki/Makefile
+++ b/security/nss/cmd/libpkix/pkix_pl/pki/Makefile
@@ -53,6 +53,8 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
+include $(PKIX_DEPTH)/config.mk
+
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/security/nss/cmd/libpkix/pkix_pl/pki/manifest.mn b/security/nss/cmd/libpkix/pkix_pl/pki/manifest.mn
index d538006c2..69d2289ff 100755
--- a/security/nss/cmd/libpkix/pkix_pl/pki/manifest.mn
+++ b/security/nss/cmd/libpkix/pkix_pl/pki/manifest.mn
@@ -56,8 +56,6 @@ CSRCS = test_cert.c \
 
 LIBRARY_NAME=pkixtoolpki
 
-TARGETS = $(LIBRARY)
-
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
diff --git a/security/nss/cmd/libpkix/pkix_pl/system/Makefile b/security/nss/cmd/libpkix/pkix_pl/system/Makefile
index f957b6b63..3f1484b02 100755
--- a/security/nss/cmd/libpkix/pkix_pl/system/Makefile
+++ b/security/nss/cmd/libpkix/pkix_pl/system/Makefile
@@ -53,6 +53,8 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
+include $(PKIX_DEPTH)/config.mk
+
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/security/nss/cmd/libpkix/pkix_pl/system/manifest.mn b/security/nss/cmd/libpkix/pkix_pl/system/manifest.mn
index 57bb186d3..8d9ed0152 100755
--- a/security/nss/cmd/libpkix/pkix_pl/system/manifest.mn
+++ b/security/nss/cmd/libpkix/pkix_pl/system/manifest.mn
@@ -66,8 +66,6 @@ CSRCS = test_bigint.c \
 
 LIBRARY_NAME=pkixtoolsys
 
-TARGETS = $(LIBRARY)
-
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
  
 NO_MD_RELEASE = 1
diff --git a/security/nss/cmd/libpkix/pkixutil/Makefile b/security/nss/cmd/libpkix/pkixutil/Makefile
index 869b85713..c00eeffe9 100644
--- a/security/nss/cmd/libpkix/pkixutil/Makefile
+++ b/security/nss/cmd/libpkix/pkixutil/Makefile
@@ -40,7 +40,6 @@
 # (1) Include initial platform-independent assignments (MANDATORY).   #
 #######################################################################
 
-
 include manifest.mn
 
 #######################################################################
diff --git a/security/nss/cmd/libpkix/sample_apps/Makefile b/security/nss/cmd/libpkix/sample_apps/Makefile
index 0bd39f3b7..ef8ff219f 100755
--- a/security/nss/cmd/libpkix/sample_apps/Makefile
+++ b/security/nss/cmd/libpkix/sample_apps/Makefile
@@ -54,6 +54,8 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
+include $(PKIX_DEPTH)/config.mk
+
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/security/nss/cmd/libpkix/sample_apps/manifest.mn b/security/nss/cmd/libpkix/sample_apps/manifest.mn
index 878860722..2e9cda0e1 100755
--- a/security/nss/cmd/libpkix/sample_apps/manifest.mn
+++ b/security/nss/cmd/libpkix/sample_apps/manifest.mn
@@ -51,8 +51,6 @@ CSRCS = dumpcert.c \
 
 LIBRARY_NAME=pkixtoolsmplapps
 
-TARGETS = $(LIBRARY)
-
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
diff --git a/security/nss/cmd/libpkix/testutil/Makefile b/security/nss/cmd/libpkix/testutil/Makefile
index 9b78863b0..ea5fd90a6 100755
--- a/security/nss/cmd/libpkix/testutil/Makefile
+++ b/security/nss/cmd/libpkix/testutil/Makefile
@@ -53,6 +53,8 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
+include $(PKIX_DEPTH)/config.mk
+
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/security/nss/cmd/libpkix/testutil/manifest.mn b/security/nss/cmd/libpkix/testutil/manifest.mn
index 5979f10a2..c40c467df 100755
--- a/security/nss/cmd/libpkix/testutil/manifest.mn
+++ b/security/nss/cmd/libpkix/testutil/manifest.mn
@@ -54,8 +54,6 @@ CSRCS = \
 
 LIBRARY_NAME = pkixtooltestutil
 
-TARGETS = $(LIBRARY)
-
 SOURCE_LIB_DIR = $(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1