Rename libpkixtestutil to libpkixutil and move dependency locally to libpkix directory.

git-svn-id: svn://10.0.0.236/branches/NSS_LIBPKIX_BRANCH@177099 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/security/nss/cmd/libpkix/pkixrules.mk

@@ -44,3 +44,6 @@ PLAT_DEPTH = $(PKIX_DEPTH)/..
 # Listing it here in REQUIRES makes it appear twice in the cc command line.
 REQUIRES += pkixtestutil 
 
+EXTRA_LIBS += \
+	$(DIST)/lib/$(LIB_PREFIX)pkixutil.$(LIB_SUFFIX) \
+	$(NULL)

mozilla/security/nss/cmd/libpkix/testutil/manifest.mn

@@ -37,7 +37,7 @@
 
 PKIX_DEPTH = ./..
 
-LIBRARY_NAME = pkixtestutil
+LIBRARY_NAME = pkixutil
 
 EXPORTS = \
 	testutil_nss.h \

mozilla/security/nss/cmd/platlibs.mk

@@ -120,7 +120,6 @@ EXTRA_LIBS += \
 	$(CRYPTOLIB) \
 	$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)pkixtestutil.$(LIB_SUFFIX) \
 	$(NULL)
 
 ifeq ($(OS_ARCH), AIX) 
@@ -226,7 +225,6 @@ EXTRA_SHARED_LIBS += \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
-	-lpkixtestutil \
 	$(NULL)
 
 JAR_LIBS = $(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX) \