Bug 1629553 Merge simple config.mk files r=rrelyea
authorJan-Marek Glogowski <glogow@fbihome.de>
Tue, 05 May 2020 12:31:30 +0000
changeset 15602 dc1ef0faf4a6ca181486b6fe45bf63cd01e166bf
parent 15601 877d721d93cdb151eb0ded41a1dc6de9e94ecad6
child 15603 7d285fe69c8c06a0cab4b97f40d16e4321594a72
push id3740
push userjjones@mozilla.com
push dateMon, 11 May 2020 21:08:39 +0000
reviewersrrelyea
bugs1629553
Bug 1629553 Merge simple config.mk files r=rrelyea There is really no good reason to explicitly change the TARGET variable. And the empty SHARED_LIBRARY variable should also be in the manifest.mn to begin with. All the other empty variables start empty or undefined, so there is also no need to explicitly set them empty. Differential Revision: https://phabricator.services.mozilla.com/D70691
cmd/crmf-cgi/Makefile
cmd/crmf-cgi/config.mk
cmd/crmftest/Makefile
cmd/crmftest/config.mk
cmd/lib/Makefile
cmd/lib/config.mk
cmd/lib/manifest.mn
cmd/libpkix/config.mk
cmd/libpkix/perf/Makefile
cmd/libpkix/perf/manifest.mn
cmd/libpkix/pkix/Makefile
cmd/libpkix/pkix/certsel/Makefile
cmd/libpkix/pkix/certsel/manifest.mn
cmd/libpkix/pkix/checker/Makefile
cmd/libpkix/pkix/checker/manifest.mn
cmd/libpkix/pkix/crlsel/Makefile
cmd/libpkix/pkix/crlsel/manifest.mn
cmd/libpkix/pkix/params/Makefile
cmd/libpkix/pkix/params/manifest.mn
cmd/libpkix/pkix/results/Makefile
cmd/libpkix/pkix/results/manifest.mn
cmd/libpkix/pkix/store/Makefile
cmd/libpkix/pkix/store/manifest.mn
cmd/libpkix/pkix/top/Makefile
cmd/libpkix/pkix/top/manifest.mn
cmd/libpkix/pkix/util/Makefile
cmd/libpkix/pkix/util/manifest.mn
cmd/libpkix/pkix_pl/Makefile
cmd/libpkix/pkix_pl/module/Makefile
cmd/libpkix/pkix_pl/module/manifest.mn
cmd/libpkix/pkix_pl/pki/Makefile
cmd/libpkix/pkix_pl/pki/manifest.mn
cmd/libpkix/pkix_pl/system/Makefile
cmd/libpkix/pkix_pl/system/manifest.mn
cmd/libpkix/testutil/manifest.mn
cpputil/Makefile
cpputil/config.mk
cpputil/manifest.mn
lib/base/Makefile
lib/base/config.mk
lib/base/manifest.mn
lib/certdb/Makefile
lib/certdb/config.mk
lib/certdb/manifest.mn
lib/certhigh/Makefile
lib/certhigh/config.mk
lib/certhigh/manifest.mn
lib/ckfw/Makefile
lib/ckfw/builtins/Makefile
lib/ckfw/builtins/config.mk
lib/ckfw/builtins/manifest.mn
lib/ckfw/builtins/testlib/Makefile
lib/ckfw/builtins/testlib/config.mk
lib/ckfw/builtins/testlib/manifest.mn
lib/ckfw/capi/Makefile
lib/ckfw/capi/config.mk
lib/ckfw/capi/manifest.mn
lib/ckfw/config.mk
lib/ckfw/dbm/Makefile
lib/ckfw/dbm/config.mk
lib/ckfw/dbm/manifest.mn
lib/ckfw/manifest.mn
lib/crmf/Makefile
lib/crmf/config.mk
lib/crmf/manifest.mn
lib/cryptohi/Makefile
lib/cryptohi/config.mk
lib/cryptohi/manifest.mn
lib/dbm/src/config.mk
lib/dbm/src/manifest.mn
lib/dev/Makefile
lib/dev/config.mk
lib/dev/manifest.mn
lib/jar/Makefile
lib/jar/config.mk
lib/jar/manifest.mn
lib/libpkix/Makefile
lib/libpkix/config.mk
lib/libpkix/include/Makefile
lib/libpkix/include/config.mk
lib/libpkix/pkix/Makefile
lib/libpkix/pkix/certsel/Makefile
lib/libpkix/pkix/certsel/config.mk
lib/libpkix/pkix/certsel/manifest.mn
lib/libpkix/pkix/checker/Makefile
lib/libpkix/pkix/checker/config.mk
lib/libpkix/pkix/checker/manifest.mn
lib/libpkix/pkix/config.mk
lib/libpkix/pkix/crlsel/Makefile
lib/libpkix/pkix/crlsel/config.mk
lib/libpkix/pkix/crlsel/manifest.mn
lib/libpkix/pkix/params/Makefile
lib/libpkix/pkix/params/config.mk
lib/libpkix/pkix/params/manifest.mn
lib/libpkix/pkix/results/Makefile
lib/libpkix/pkix/results/config.mk
lib/libpkix/pkix/results/manifest.mn
lib/libpkix/pkix/store/Makefile
lib/libpkix/pkix/store/config.mk
lib/libpkix/pkix/store/manifest.mn
lib/libpkix/pkix/top/Makefile
lib/libpkix/pkix/top/config.mk
lib/libpkix/pkix/top/manifest.mn
lib/libpkix/pkix/util/Makefile
lib/libpkix/pkix/util/config.mk
lib/libpkix/pkix/util/manifest.mn
lib/libpkix/pkix_pl_nss/Makefile
lib/libpkix/pkix_pl_nss/config.mk
lib/libpkix/pkix_pl_nss/module/Makefile
lib/libpkix/pkix_pl_nss/module/config.mk
lib/libpkix/pkix_pl_nss/module/manifest.mn
lib/libpkix/pkix_pl_nss/pki/Makefile
lib/libpkix/pkix_pl_nss/pki/config.mk
lib/libpkix/pkix_pl_nss/pki/manifest.mn
lib/libpkix/pkix_pl_nss/system/Makefile
lib/libpkix/pkix_pl_nss/system/config.mk
lib/libpkix/pkix_pl_nss/system/manifest.mn
lib/pk11wrap/Makefile
lib/pk11wrap/config.mk
lib/pk11wrap/manifest.mn
lib/pkcs12/Makefile
lib/pkcs12/config.mk
lib/pkcs12/manifest.mn
lib/pkcs7/Makefile
lib/pkcs7/config.mk
lib/pkcs7/manifest.mn
lib/pki/Makefile
lib/pki/config.mk
lib/pki/manifest.mn
lib/sqlite/Makefile
lib/sysinit/Makefile
lib/util/Makefile
lib/zlib/Makefile
lib/zlib/config.mk
lib/zlib/manifest.mn
--- a/cmd/crmf-cgi/Makefile
+++ b/cmd/crmf-cgi/Makefile
@@ -2,34 +2,34 @@
 # 
 # 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/.
 
 #######################################################################
 # (1) Include initial platform-independent assignments (MANDATORY).   #
 #######################################################################
-ifeq (,$(filter-out WIN%,$(OS_TARGET)))
-EXTRA_LIBS += $(DIST)/lib/crmf.lib
-else
-EXTRA_LIBS += $(DIST)/lib/libcrmf.$(LIB_SUFFIX) 
-endif
+
 include manifest.mn
 
 #######################################################################
 # (2) Include "global" configuration information. (OPTIONAL)          #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
+EXTRA_LIBS += $(DIST)/lib/crmf.lib
+else
+EXTRA_LIBS += $(DIST)/lib/libcrmf.$(LIB_SUFFIX)
+endif
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
 include ../platlibs.mk
 
 
deleted file mode 100644
--- a/cmd/crmf-cgi/config.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# 
-# 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/.
-
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(PROGRAM)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-LIBRARY        =
-
--- a/cmd/crmftest/Makefile
+++ b/cmd/crmftest/Makefile
@@ -15,33 +15,30 @@ include manifest.mn
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-
-
-#######################################################################
-# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
-#######################################################################
-include config.mk
-
 ifeq ($(OS_TARGET)$(OS_RELEASE), AIX4.2)
 OS_LIBS += -lsvld 
 endif 
 
 ifeq ($(OS_TARGET)$(OS_RELEASE), SunOS5.6)
 OS_LIBS += -ldl -lxnet -lposix4 -lsocket -lnsl
 endif
 
 EXTRA_LIBS += $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX)
 
+#######################################################################
+# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
+#######################################################################
+
 include ../platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
deleted file mode 100644
--- a/cmd/crmftest/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(PROGRAM)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-LIBRARY        =
-
--- a/cmd/lib/Makefile
+++ b/cmd/lib/Makefile
@@ -21,17 +21,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 include ../platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
deleted file mode 100644
--- a/cmd/lib/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/cmd/lib/manifest.mn
+++ b/cmd/lib/manifest.mn
@@ -1,15 +1,16 @@
 #
 # 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/.
 CORE_DEPTH	= ../..
 
 LIBRARY_NAME	= sectool
+SHARED_LIBRARY = $(NULL)
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE		= nss
 
 DEFINES		= -DNSPR20
 
 ifdef NSS_BUILD_SOFTOKEN_ONLY
 PRIVATE_EXPORTS = basicutil.h \
deleted file mode 100644
--- a/cmd/libpkix/config.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 
-# 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/.
-
-TARGETS = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
--- a/cmd/libpkix/perf/Makefile
+++ b/cmd/libpkix/perf/Makefile
@@ -15,18 +15,16 @@ include manifest.mn
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
 include $(PLAT_DEPTH)/platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
--- a/cmd/libpkix/perf/manifest.mn
+++ b/cmd/libpkix/perf/manifest.mn
@@ -10,12 +10,13 @@ CORE_DEPTH = $(PKIX_DEPTH)/../../..
 # MODULE public and private header directories are implicitly REQUIRED.
 MODULE = nss
 
 CSRCS = libpkix_buildthreads.c \
 	nss_threads.c \
 	$(NULL)
 
 LIBRARY_NAME = pkixtoolperf
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR = $(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
--- a/cmd/libpkix/pkix/Makefile
+++ b/cmd/libpkix/pkix/Makefile
@@ -15,18 +15,16 @@ include manifest.mn
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
 include $(PLAT_DEPTH)/platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
--- a/cmd/libpkix/pkix/certsel/Makefile
+++ b/cmd/libpkix/pkix/certsel/Makefile
@@ -15,18 +15,16 @@ include manifest.mn
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
 include $(PLAT_DEPTH)/platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
--- a/cmd/libpkix/pkix/certsel/manifest.mn
+++ b/cmd/libpkix/pkix/certsel/manifest.mn
@@ -9,13 +9,14 @@ CORE_DEPTH = $(PKIX_DEPTH)/../../..
 
 # MODULE public and private header directories are implicitly REQUIRED.
 MODULE = nss
 
 CSRCS = test_certselector.c \
 	test_comcertselparams.c \
 	$(NULL)
 
-LIBRARY_NAME=pkixtoolcertsel
+LIBRARY_NAME = pkixtoolcertsel
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
--- a/cmd/libpkix/pkix/checker/Makefile
+++ b/cmd/libpkix/pkix/checker/Makefile
@@ -15,18 +15,16 @@ include manifest.mn
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
 include $(PLAT_DEPTH)/platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
--- a/cmd/libpkix/pkix/checker/manifest.mn
+++ b/cmd/libpkix/pkix/checker/manifest.mn
@@ -7,13 +7,14 @@ PKIX_DEPTH = ../..
 PLAT_DEPTH = $(PKIX_DEPTH)/..
 CORE_DEPTH = $(PKIX_DEPTH)/../../..
 
 # MODULE public and private header directories are implicitly REQUIRED.
 MODULE = nss
 
 CSRCS = test_certchainchecker.c
 
-LIBRARY_NAME=pkixtoolchecker
+LIBRARY_NAME = pkixtoolchecker
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
--- a/cmd/libpkix/pkix/crlsel/Makefile
+++ b/cmd/libpkix/pkix/crlsel/Makefile
@@ -15,18 +15,16 @@ include manifest.mn
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
 include $(PLAT_DEPTH)/platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
--- a/cmd/libpkix/pkix/crlsel/manifest.mn
+++ b/cmd/libpkix/pkix/crlsel/manifest.mn
@@ -9,13 +9,14 @@ CORE_DEPTH = $(PKIX_DEPTH)/../../..
 
 # MODULE public and private header directories are implicitly REQUIRED.
 MODULE = nss
 
 CSRCS = test_crlselector.c \
 	test_comcrlselparams.c \
 	$(NULL)
 
-LIBRARY_NAME=pkixtoolcrlsel
+LIBRARY_NAME = pkixtoolcrlsel
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
--- a/cmd/libpkix/pkix/params/Makefile
+++ b/cmd/libpkix/pkix/params/Makefile
@@ -15,18 +15,16 @@ include manifest.mn
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
 include $(PLAT_DEPTH)/platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
--- a/cmd/libpkix/pkix/params/manifest.mn
+++ b/cmd/libpkix/pkix/params/manifest.mn
@@ -11,13 +11,14 @@ CORE_DEPTH = $(PKIX_DEPTH)/../../..
 MODULE = nss
 
 CSRCS = test_procparams.c \
 	test_trustanchor.c \
 	test_valparams.c \
 	test_resourcelimits.c \
 	$(NULL)
 
-LIBRARY_NAME=pkixtoolparams
+LIBRARY_NAME = pkixtoolparams
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
--- a/cmd/libpkix/pkix/results/Makefile
+++ b/cmd/libpkix/pkix/results/Makefile
@@ -15,18 +15,16 @@ include manifest.mn
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
 include $(PLAT_DEPTH)/platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
--- a/cmd/libpkix/pkix/results/manifest.mn
+++ b/cmd/libpkix/pkix/results/manifest.mn
@@ -11,13 +11,14 @@ CORE_DEPTH = $(PKIX_DEPTH)/../../..
 MODULE = nss
 
 CSRCS = test_buildresult.c \
 	test_policynode.c \
 	test_verifynode.c \
 	test_valresult.c \
 	$(NULL)
 
-LIBRARY_NAME=pkixtoolresults
+LIBRARY_NAME = pkixtoolresults
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
--- a/cmd/libpkix/pkix/store/Makefile
+++ b/cmd/libpkix/pkix/store/Makefile
@@ -15,18 +15,16 @@ include manifest.mn
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
 include $(PLAT_DEPTH)/platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
--- a/cmd/libpkix/pkix/store/manifest.mn
+++ b/cmd/libpkix/pkix/store/manifest.mn
@@ -7,13 +7,14 @@ PKIX_DEPTH = ../..
 PLAT_DEPTH = $(PKIX_DEPTH)/..
 CORE_DEPTH = $(PKIX_DEPTH)/../../..
 
 # MODULE public and private header directories are implicitly REQUIRED.
 MODULE = nss
 
 CSRCS = test_store.c
 
-LIBRARY_NAME=pkixtoolstore
+LIBRARY_NAME = pkixtoolstore
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
--- a/cmd/libpkix/pkix/top/Makefile
+++ b/cmd/libpkix/pkix/top/Makefile
@@ -15,18 +15,16 @@ include manifest.mn
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
 include $(PLAT_DEPTH)/platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
--- a/cmd/libpkix/pkix/top/manifest.mn
+++ b/cmd/libpkix/pkix/top/manifest.mn
@@ -21,13 +21,14 @@ CSRCS = test_basicchecker.c \
 	test_ocsp.c \
 	test_policychecker.c \
 	test_subjaltnamechecker.c \
 	test_validatechain.c \
 	test_validatechain_bc.c \
 	test_validatechain_NB.c \
 	$(NULL)
 
-LIBRARY_NAME=pkixtooltop
+LIBRARY_NAME = pkixtooltop
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
--- a/cmd/libpkix/pkix/util/Makefile
+++ b/cmd/libpkix/pkix/util/Makefile
@@ -15,18 +15,16 @@ include manifest.mn
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
 include $(PLAT_DEPTH)/platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
--- a/cmd/libpkix/pkix/util/manifest.mn
+++ b/cmd/libpkix/pkix/util/manifest.mn
@@ -11,13 +11,14 @@ CORE_DEPTH = $(PKIX_DEPTH)/../../..
 MODULE = nss
 
 CSRCS = test_error.c \
 	test_list.c \
 	test_list2.c \
 	test_logger.c \
 	$(NULL)
 
-LIBRARY_NAME=pkixtoolutil
+LIBRARY_NAME = pkixtoolutil
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
--- a/cmd/libpkix/pkix_pl/Makefile
+++ b/cmd/libpkix/pkix_pl/Makefile
@@ -15,18 +15,16 @@ include manifest.mn
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
 include $(PLAT_DEPTH)/platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
--- a/cmd/libpkix/pkix_pl/module/Makefile
+++ b/cmd/libpkix/pkix_pl/module/Makefile
@@ -15,18 +15,16 @@ include manifest.mn
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
 include $(PLAT_DEPTH)/platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
--- a/cmd/libpkix/pkix_pl/module/manifest.mn
+++ b/cmd/libpkix/pkix_pl/module/manifest.mn
@@ -12,13 +12,14 @@ MODULE = nss
 
 CSRCS = test_colcertstore.c \
 	test_ekuchecker.c \
 	test_pk11certstore.c \
 	test_socket.c \
 	test_httpcertstore.c \
 	$(NULL)
 
-LIBRARY_NAME=pkixtoolmodule
+LIBRARY_NAME = pkixtoolmodule
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
--- a/cmd/libpkix/pkix_pl/pki/Makefile
+++ b/cmd/libpkix/pkix_pl/pki/Makefile
@@ -15,18 +15,16 @@ include manifest.mn
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
 include $(PLAT_DEPTH)/platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
--- a/cmd/libpkix/pkix_pl/pki/manifest.mn
+++ b/cmd/libpkix/pkix_pl/pki/manifest.mn
@@ -16,13 +16,14 @@ CSRCS = test_cert.c \
 	test_date.c \
 	test_generalname.c \
 	test_nameconstraints.c \
 	test_x500name.c \
 	test_authorityinfoaccess.c \
 	test_subjectinfoaccess.c \
 	$(NULL)
 
-LIBRARY_NAME=pkixtoolpki
+LIBRARY_NAME = pkixtoolpki
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
--- a/cmd/libpkix/pkix_pl/system/Makefile
+++ b/cmd/libpkix/pkix_pl/system/Makefile
@@ -15,18 +15,16 @@ include manifest.mn
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
 include $(PLAT_DEPTH)/platlibs.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
--- a/cmd/libpkix/pkix_pl/system/manifest.mn
+++ b/cmd/libpkix/pkix_pl/system/manifest.mn
@@ -25,14 +25,14 @@ CSRCS = test_bigint.c \
 	test_monitorlock.c \
 	test_object.c \
 	test_oid.c \
 	stress_test.c \
 	test_string.c \
 	test_string2.c \
 	$(NULL)
 
-
-LIBRARY_NAME=pkixtoolsys
+LIBRARY_NAME = pkixtoolsys
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
  
 NO_MD_RELEASE = 1
--- a/cmd/libpkix/testutil/manifest.mn
+++ b/cmd/libpkix/testutil/manifest.mn
@@ -15,12 +15,13 @@ PRIVATE_EXPORTS = \
 	$(NULL)
 
 CSRCS = \
 	testutil_nss.c \
 	testutil.c \
 	$(NULL)
 
 LIBRARY_NAME = pkixtooltestutil
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR = $(PKIX_DEPTH)/$(OBJDIR)
 
 NO_MD_RELEASE = 1
--- a/cpputil/Makefile
+++ b/cpputil/Makefile
@@ -25,18 +25,16 @@ OS_CFLAGS += -EHsc
 else
 CXXFLAGS += -std=c++0x
 endif
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
-
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
 # (6) Execute "component" rules. (OPTIONAL)                           #
deleted file mode 100644
--- a/cpputil/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/cpputil/manifest.mn
+++ b/cpputil/manifest.mn
@@ -1,17 +1,19 @@
 #
 # 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/.
 CORE_DEPTH = ..
 DEPTH      = ..
 
 MODULE = nss
+
 LIBRARY_NAME = cpputil
+SHARED_LIBRARY = $(NULL)
 
 ifeq ($(NSS_BUILD_UTIL_ONLY),1)
 CPPSRCS = \
       $(NULL)
 else
 CPPSRCS = \
       databuffer.cc \
       dummy_io.cc \
--- a/lib/base/Makefile
+++ b/lib/base/Makefile
@@ -1,10 +1,14 @@
 # 
 # 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/.
 
 include manifest.mn
+
 include $(CORE_DEPTH)/coreconf/config.mk
-include config.mk
+
+ifdef BUILD_IDG
+DEFINES += -DNSSDEBUG
+endif
+
 include $(CORE_DEPTH)/coreconf/rules.mk
-
deleted file mode 100644
--- a/lib/base/config.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# 
-# 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/.
-
-ifdef BUILD_IDG
-DEFINES += -DNSSDEBUG
-endif
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/base/manifest.mn
+++ b/lib/base/manifest.mn
@@ -28,11 +28,12 @@ CSRCS =		   \
 	utf8.c	   \
 	list.c     \
 	hash.c     \
 	$(NULL)
 
 REQUIRES = nspr
 
 LIBRARY_NAME = nssb
+SHARED_LIBRARY = $(NULL)
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
--- a/lib/certdb/Makefile
+++ b/lib/certdb/Makefile
@@ -21,18 +21,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
-
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
 # (6) Execute "component" rules. (OPTIONAL)                           #
deleted file mode 100644
--- a/lib/certdb/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/certdb/manifest.mn
+++ b/lib/certdb/manifest.mn
@@ -30,11 +30,12 @@ CSRCS = \
 	polcyxtn.c \
 	secname.c \
 	xauthkid.c \
 	xbsconst.c \
 	xconst.c \
 	$(NULL)
 
 LIBRARY_NAME = certdb
+SHARED_LIBRARY = $(NULL)
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
--- a/lib/certhigh/Makefile
+++ b/lib/certhigh/Makefile
@@ -21,18 +21,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
--include config.mk
-
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
 # (6) Execute "component" rules. (OPTIONAL)                           #
deleted file mode 100644
--- a/lib/certhigh/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/certhigh/manifest.mn
+++ b/lib/certhigh/manifest.mn
@@ -24,11 +24,12 @@ CSRCS = \
 	ocspsig.c \
 	certhigh.c \
  	certvfy.c \
  	certvfypkix.c \
  	xcrldist.c \
 	$(NULL)
 
 LIBRARY_NAME = certhi
+SHARED_LIBRARY = $(NULL)
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
--- a/lib/ckfw/Makefile
+++ b/lib/ckfw/Makefile
@@ -1,16 +1,20 @@
 # 
 # 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/.
 
 include manifest.mn
+
 include $(CORE_DEPTH)/coreconf/config.mk
-include config.mk
+
+ifdef BUILD_IDG
+DEFINES += -DNSSDEBUG
+endif
 
 ifdef NOTDEF # was ifdef MOZILLA_CLIENT
 NSS_BUILD_CAPI = 1
 endif
 
 # This'll need some help from a build person.
 
 # The generated files are checked in, and differ from what ckapi.perl
--- a/lib/ckfw/builtins/Makefile
+++ b/lib/ckfw/builtins/Makefile
@@ -1,16 +1,33 @@
 # 
 # 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/.
 
 include manifest.mn
 include $(CORE_DEPTH)/coreconf/config.mk
-include config.mk
+
+ifdef BUILD_IDG
+DEFINES += -DNSSDEBUG
+endif
+
+# Needed for compilation of $(OBJDIR)/certdata.c
+INCLUDES += -I.
+
+#
+# To create a loadable module on Darwin, we must use -bundle.
+#
+ifeq ($(OS_TARGET),Darwin)
+DSO_LDOPTS = -bundle
+endif
+
+ifdef USE_GCOV
+DSO_LDOPTS += --coverage
+endif
 
 EXTRA_LIBS = \
 	$(DIST)/lib/$(LIB_PREFIX)nssckfw.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
 	$(NULL)
 
 # can't do this in manifest.mn because OS_TARGET isn't defined there.
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
deleted file mode 100644
--- a/lib/ckfw/builtins/config.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# 
-# 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/.
-
-#
-#  Override TARGETS variable so that only shared libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(SHARED_LIBRARY)
-LIBRARY        =
-IMPORT_LIBRARY =
-PROGRAM        =
-
-ifdef BUILD_IDG
-    DEFINES += -DNSSDEBUG
-endif
-
-# Needed for compilation of $(OBJDIR)/certdata.c
-INCLUDES += -I.
-
-#
-# To create a loadable module on Darwin, we must use -bundle.
-#
-ifeq ($(OS_TARGET),Darwin)
-DSO_LDOPTS = -bundle
-endif
-
-ifdef USE_GCOV
-DSO_LDOPTS += --coverage
-endif
--- a/lib/ckfw/builtins/manifest.mn
+++ b/lib/ckfw/builtins/manifest.mn
@@ -25,8 +25,10 @@ CSRCS =			\
 	certdata.c	\
 	ckbiver.c	\
 	$(NULL)
 
 REQUIRES = nspr
 
 LIBRARY_NAME = nssckbi
 MAPFILE = $(OBJDIR)/$(LIBRARY_NAME).def
+LIBRARY = $(NULL)
+IMPORT_LIBRARY = $(NULL)
--- a/lib/ckfw/builtins/testlib/Makefile
+++ b/lib/ckfw/builtins/testlib/Makefile
@@ -1,16 +1,34 @@
 #
 # 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/.
 
 include manifest.mn
+
 include $(CORE_DEPTH)/coreconf/config.mk
-include config.mk
+
+ifdef BUILD_IDG
+DEFINES += -DNSSDEBUG
+endif
+
+# Needed for compilation of $(OBJDIR)/certdata.c
+INCLUDES += -I.
+
+#
+# To create a loadable module on Darwin, we must use -bundle.
+#
+ifeq ($(OS_TARGET),Darwin)
+DSO_LDOPTS = -bundle
+endif
+
+ifdef USE_GCOV
+DSO_LDOPTS += --coverage
+endif
 
 EXTRA_LIBS =                                       \
 	$(DIST)/lib/$(LIB_PREFIX)nssckfw.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX)    \
 	$(NULL)
 
 # If the OS_TARGET is WIN%, the path of shared libs could be different.
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
deleted file mode 100644
--- a/lib/ckfw/builtins/testlib/config.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only shared libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(SHARED_LIBRARY)
-LIBRARY        =
-IMPORT_LIBRARY =
-PROGRAM        =
-
-ifdef BUILD_IDG
-	DEFINES += -DNSSDEBUG
-endif
-
-# Needed for compilation of $(OBJDIR)/certdata.c
-INCLUDES += -I.
-
-#
-# To create a loadable module on Darwin, we must use -bundle.
-#
-ifeq ($(OS_TARGET),Darwin)
-DSO_LDOPTS = -bundle
-endif
-
-ifdef USE_GCOV
-DSO_LDOPTS += --coverage
-endif
--- a/lib/ckfw/builtins/testlib/manifest.mn
+++ b/lib/ckfw/builtins/testlib/manifest.mn
@@ -18,8 +18,9 @@ CSRCS =			\
 	../ckbiver.c		\
 	../constants.c		\
 	certdata-testlib.c	\
 	$(NULL)
 
 REQUIRES = nspr
 
 LIBRARY_NAME = nssckbi-testlib
+LIBRARY = $(NULL)
--- a/lib/ckfw/capi/Makefile
+++ b/lib/ckfw/capi/Makefile
@@ -1,16 +1,26 @@
 # 
 # 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/.
 
 include manifest.mn
 include $(CORE_DEPTH)/coreconf/config.mk
-include config.mk
+
+ifdef BUILD_IDG
+DEFINES += -DNSSDEBUG
+endif
+
+#
+# To create a loadable module on Darwin, we must use -bundle.
+#
+ifeq ($(OS_TARGET),Darwin)
+DSO_LDOPTS = -bundle
+endif
 
 EXTRA_LIBS = \
 	$(DIST)/lib/$(LIB_PREFIX)nssckfw.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
 	$(NULL)
 
 # can't do this in manifest.mn because OS_TARGET isn't defined there.
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
@@ -66,10 +76,8 @@ MKSHLIB                 = xlC $(DSO_LDOP
 	$(MKSHLIB) -o $@ $(OBJS) $(EXTRA_LIBS) $(EXTRA_DSO_LDOPTS)
 	chmod +x $@
 
 endif
 
 ifeq ($(OS_TARGET)$(OS_RELEASE), AIX4.2)
 LD      += -G
 endif 
-
-
deleted file mode 100644
--- a/lib/ckfw/capi/config.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# 
-# 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/.
-
-#
-#  Override TARGETS variable so that only shared libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(SHARED_LIBRARY)
-LIBRARY        =
-IMPORT_LIBRARY =
-PROGRAM        =
-
-ifdef BUILD_IDG
-    DEFINES += -DNSSDEBUG
-endif
-
-#
-# To create a loadable module on Darwin, we must use -bundle.
-#
-ifeq ($(OS_TARGET),Darwin)
-DSO_LDOPTS = -bundle
-endif
--- a/lib/ckfw/capi/manifest.mn
+++ b/lib/ckfw/capi/manifest.mn
@@ -24,10 +24,12 @@ CSRCS =			\
 	ckcapiver.c	\
 	staticobj.c	\
 	$(NULL)
 
 REQUIRES = nspr
 
 LIBRARY_NAME = nsscapi
 MAPFILE = $(OBJDIR)/$(LIBRARY_NAME).def
+LIBRARY = $(NULL)
+IMPORT_LIBRARY = $(NULL)
 
 #EXTRA_SHARED_LIBS = -L$(DIST)/lib -lnssckfw -lnssb -lplc4 -lplds4
deleted file mode 100644
--- a/lib/ckfw/config.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# 
-# 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/.
-
-ifdef BUILD_IDG
-DEFINES += -DNSSDEBUG
-endif
-
-#
-# Hack to see if everything still builds
-#
-
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
-
--- a/lib/ckfw/dbm/Makefile
+++ b/lib/ckfw/dbm/Makefile
@@ -1,9 +1,13 @@
 # 
 # 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/.
 
 include manifest.mn
-include config.mk
 include $(CORE_DEPTH)/coreconf/config.mk
+
+ifdef BUILD_IDG
+DEFINES += -DNSSDEBUG
+endif
+
 include $(CORE_DEPTH)/coreconf/rules.mk
deleted file mode 100644
--- a/lib/ckfw/dbm/config.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# 
-# 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/.
-
-ifdef BUILD_IDG
-DEFINES += -DNSSDEBUG
-endif
--- a/lib/ckfw/dbm/manifest.mn
+++ b/lib/ckfw/dbm/manifest.mn
@@ -16,10 +16,11 @@ CSRCS =		   \
 	object.c   \
 	find.c	   \
 	db.c	   \
 	$(NULL)
 
 REQUIRES = dbm nspr
 
 LIBRARY_NAME = nssckdbm
+LIBRARY = $(NULL)
 
 EXTRA_SHARED_LIBS = -L$(DIST)/lib -lnssckfw -lnssb -ldbm -lnspr4 -lplc4 -lplds4
--- a/lib/ckfw/manifest.mn
+++ b/lib/ckfw/manifest.mn
@@ -43,11 +43,12 @@ CSRCS =		   \
 	token.c	   \
 	wrap.c	   \
 	mechanism.c \
 	$(NULL)
 
 REQUIRES = nspr
 
 LIBRARY_NAME = nssckfw
+SHARED_LIBRARY = $(NULL)
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
--- a/lib/crmf/Makefile
+++ b/lib/crmf/Makefile
@@ -22,18 +22,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
-
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
 # (6) Execute "component" rules. (OPTIONAL)                           #
deleted file mode 100644
--- a/lib/crmf/config.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# 
-# 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/.
-
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/crmf/manifest.mn
+++ b/lib/crmf/manifest.mn
@@ -36,11 +36,12 @@ CSRCS = crmfenc.c	\
 	encutil.c	\
 	respcli.c	\
 	respcmn.c	\
 	challcli.c	\
 	asn1cmn.c	\
 	$(NULL)
 
 LIBRARY_NAME = crmf
+SHARED_LIBRARY = $(NULL)
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
--- a/lib/cryptohi/Makefile
+++ b/lib/cryptohi/Makefile
@@ -21,18 +21,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
--include config.mk
-
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
 # (6) Execute "component" rules. (OPTIONAL)                           #
deleted file mode 100644
--- a/lib/cryptohi/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/cryptohi/manifest.mn
+++ b/lib/cryptohi/manifest.mn
@@ -4,16 +4,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 CORE_DEPTH = ../..
 
 MODULE = nss
 
 REQUIRES = nssutil
 
 LIBRARY_NAME = cryptohi
+SHARED_LIBRARY = $(NULL)
 
 EXPORTS = \
 	cryptohi.h \
 	cryptoht.h \
 	key.h     \
 	keyhi.h   \
 	keyt.h    \
 	keythi.h  \
--- a/lib/dbm/src/config.mk
+++ b/lib/dbm/src/config.mk
@@ -6,22 +6,16 @@
 
 DEFINES += -DMEMMOVE -D__DBINTERFACE_PRIVATE
 
 #
 #  Currently, override TARGETS variable so that only static libraries
 #  are specifed as dependencies within rules.mk.
 #
 
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PURE_LIBRARY   =
-PROGRAM        =
-
 ifdef SHARED_LIBRARY
 	ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 		DLLBASE=/BASE:0x30000000
 		RES=$(OBJDIR)/dbm.res
 		RESNAME=../include/dbm.rc
 	endif
 	ifeq ($(DLL_SUFFIX),dll)
 		DEFINES += -D_DLL
--- a/lib/dbm/src/manifest.mn
+++ b/lib/dbm/src/manifest.mn
@@ -21,8 +21,9 @@ CSRCS = db.c	   \
 	h_page.c   \
 	hash.c	   \
 	hash_buf.c \
 	mktemp.c   \
 	dirent.c   \
 	$(NULL)
 
 LIBRARY_NAME = dbm
+SHARED_LIBRARY = $(NULL)
--- a/lib/dev/Makefile
+++ b/lib/dev/Makefile
@@ -1,16 +1,21 @@
 # 
 # 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/.
 
 include manifest.mn
+
 include $(CORE_DEPTH)/coreconf/config.mk
-include config.mk
+
+ifdef BUILD_IDG
+DEFINES += -DNSSDEBUG
+endif
+
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 # On AIX 4.3, IBM xlC_r compiler (version 3.6.6) cannot compile
 # ckhelper.c in 64-bit mode for unknown reasons.  A workaround is
 # to compile it with optimizations turned on.  (Bugzilla bug #63815)
 ifeq ($(OS_TARGET)$(OS_RELEASE),AIX4.3)
 ifeq ($(USE_64),1)
 ifndef BUILD_OPT
deleted file mode 100644
--- a/lib/dev/config.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# 
-# 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/.
-
-ifdef BUILD_IDG
-DEFINES += -DNSSDEBUG
-endif
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/dev/manifest.mn
+++ b/lib/dev/manifest.mn
@@ -22,11 +22,12 @@ CSRCS =		        \
 	devtoken.c      \
 	devutil.c       \
 	ckhelper.c      \
 	$(NULL)
 
 REQUIRES = nspr
 
 LIBRARY_NAME = nssdev
+SHARED_LIBRARY = $(NULL)
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
--- a/lib/jar/Makefile
+++ b/lib/jar/Makefile
@@ -1,11 +1,23 @@
 #! gmake
 # 
 # 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/.
 
 include manifest.mn
+
 include $(CORE_DEPTH)/coreconf/config.mk
-include config.mk
+
+# NSS_X86 means the target is a 32-bits x86 CPU architecture
+# NSS_X64 means the target is a 64-bits x64 CPU architecture
+# NSS_X86_OR_X64 means the target is either x86 or x64
+ifeq (,$(filter-out i386 x386 x86 x86_64,$(CPU_ARCH)))
+        DEFINES += -DNSS_X86_OR_X64
+ifdef USE_64
+        DEFINES += -DNSS_X64
+else
+        DEFINES += -DNSS_X86
+endif
+endif
+
 include $(CORE_DEPTH)/coreconf/rules.mk
-
deleted file mode 100644
--- a/lib/jar/config.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
-# NSS_X86 means the target is a 32-bits x86 CPU architecture
-# NSS_X64 means the target is a 64-bits x64 CPU architecture
-# NSS_X86_OR_X64 means the target is either x86 or x64
-ifeq (,$(filter-out i386 x386 x86 x86_64,$(CPU_ARCH)))
-        DEFINES += -DNSS_X86_OR_X64
-ifdef USE_64
-        DEFINES += -DNSS_X64
-else
-        DEFINES += -DNSS_X86
-endif
-endif
--- a/lib/jar/manifest.mn
+++ b/lib/jar/manifest.mn
@@ -1,15 +1,16 @@
 # 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/.
 
 MODULE = nss
 
 LIBRARY_NAME = jar
+SHARED_LIBRARY = $(NULL)
 
 CORE_DEPTH = ../..
 
 CSRCS =	\
 	jarver.c \
 	jarsign.c \
 	jar.c \
 	jar-ds.c \
--- a/lib/libpkix/Makefile
+++ b/lib/libpkix/Makefile
@@ -21,18 +21,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
-
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
 # (6) Execute "component" rules. (OPTIONAL)                           #
deleted file mode 100755
--- a/lib/libpkix/config.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-#  DEFINES+=-DPKIX_LISTDEBUG Can be used to turn on debug compilation
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/libpkix/include/Makefile
+++ b/lib/libpkix/include/Makefile
@@ -21,17 +21,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
deleted file mode 100755
--- a/lib/libpkix/include/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/libpkix/pkix/Makefile
+++ b/lib/libpkix/pkix/Makefile
@@ -21,17 +21,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
--- a/lib/libpkix/pkix/certsel/Makefile
+++ b/lib/libpkix/pkix/certsel/Makefile
@@ -21,17 +21,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
deleted file mode 100755
--- a/lib/libpkix/pkix/certsel/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/libpkix/pkix/certsel/manifest.mn
+++ b/lib/libpkix/pkix/certsel/manifest.mn
@@ -12,9 +12,9 @@ PRIVATE_EXPORTS = \
 MODULE = nss
 
 CSRCS = \
 	pkix_certselector.c \
 	pkix_comcertselparams.c \
 	$(NULL)
 
 LIBRARY_NAME = pkixcertsel
-
+SHARED_LIBRARY = $(NULL)
--- a/lib/libpkix/pkix/checker/Makefile
+++ b/lib/libpkix/pkix/checker/Makefile
@@ -21,17 +21,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
deleted file mode 100755
--- a/lib/libpkix/pkix/checker/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/libpkix/pkix/checker/manifest.mn
+++ b/lib/libpkix/pkix/checker/manifest.mn
@@ -34,9 +34,9 @@ CSRCS = \
 	pkix_revocationmethod.c \
 	pkix_revocationchecker.c \
 	pkix_policychecker.c \
 	pkix_signaturechecker.c \
 	pkix_targetcertchecker.c \
 	$(NULL)
 
 LIBRARY_NAME = pkixchecker
-
+SHARED_LIBRARY = $(NULL)
deleted file mode 100755
--- a/lib/libpkix/pkix/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/libpkix/pkix/crlsel/Makefile
+++ b/lib/libpkix/pkix/crlsel/Makefile
@@ -21,17 +21,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
deleted file mode 100755
--- a/lib/libpkix/pkix/crlsel/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/libpkix/pkix/crlsel/manifest.mn
+++ b/lib/libpkix/pkix/crlsel/manifest.mn
@@ -12,9 +12,9 @@ PRIVATE_EXPORTS = \
 MODULE = nss
 
 CSRCS = \
 	pkix_crlselector.c \
 	pkix_comcrlselparams.c \
 	$(NULL)
 
 LIBRARY_NAME = pkixcrlsel
-
+SHARED_LIBRARY = $(NULL)
--- a/lib/libpkix/pkix/params/Makefile
+++ b/lib/libpkix/pkix/params/Makefile
@@ -21,17 +21,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
deleted file mode 100755
--- a/lib/libpkix/pkix/params/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/libpkix/pkix/params/manifest.mn
+++ b/lib/libpkix/pkix/params/manifest.mn
@@ -16,9 +16,9 @@ MODULE = nss
 CSRCS = \
 	pkix_trustanchor.c \
 	pkix_procparams.c \
 	pkix_valparams.c \
 	pkix_resourcelimits.c \
 	$(NULL)
 
 LIBRARY_NAME = pkixparams
-
+SHARED_LIBRARY = $(NULL)
--- a/lib/libpkix/pkix/results/Makefile
+++ b/lib/libpkix/pkix/results/Makefile
@@ -21,17 +21,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
deleted file mode 100755
--- a/lib/libpkix/pkix/results/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/libpkix/pkix/results/manifest.mn
+++ b/lib/libpkix/pkix/results/manifest.mn
@@ -16,9 +16,9 @@ MODULE = nss
 CSRCS = \
 	pkix_buildresult.c \
 	pkix_policynode.c \
 	pkix_valresult.c \
 	pkix_verifynode.c \
 	$(NULL)
 
 LIBRARY_NAME = pkixresults
-
+SHARED_LIBRARY = $(NULL)
--- a/lib/libpkix/pkix/store/Makefile
+++ b/lib/libpkix/pkix/store/Makefile
@@ -21,17 +21,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
deleted file mode 100755
--- a/lib/libpkix/pkix/store/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/libpkix/pkix/store/manifest.mn
+++ b/lib/libpkix/pkix/store/manifest.mn
@@ -10,9 +10,9 @@ PRIVATE_EXPORTS = \
 
 MODULE = nss
 
 CSRCS = \
 	pkix_store.c \
 	$(NULL)
 
 LIBRARY_NAME = pkixstore
-
+SHARED_LIBRARY = $(NULL)
--- a/lib/libpkix/pkix/top/Makefile
+++ b/lib/libpkix/pkix/top/Makefile
@@ -21,17 +21,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
deleted file mode 100755
--- a/lib/libpkix/pkix/top/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/libpkix/pkix/top/manifest.mn
+++ b/lib/libpkix/pkix/top/manifest.mn
@@ -14,9 +14,9 @@ MODULE = nss
 
 CSRCS = \
 	pkix_validate.c \
 	pkix_lifecycle.c \
 	pkix_build.c \
 	$(NULL)
 
 LIBRARY_NAME = pkixtop
-
+SHARED_LIBRARY = $(NULL)
--- a/lib/libpkix/pkix/util/Makefile
+++ b/lib/libpkix/pkix/util/Makefile
@@ -21,17 +21,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
deleted file mode 100755
--- a/lib/libpkix/pkix/util/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/libpkix/pkix/util/manifest.mn
+++ b/lib/libpkix/pkix/util/manifest.mn
@@ -17,9 +17,9 @@ CSRCS = \
 	pkix_tools.c \
 	pkix_error.c \
 	pkix_logger.c \
 	pkix_list.c \
 	pkix_errpaths.c \
 	$(NULL)
 
 LIBRARY_NAME = pkixutil
-
+SHARED_LIBRARY = $(NULL)
--- a/lib/libpkix/pkix_pl_nss/Makefile
+++ b/lib/libpkix/pkix_pl_nss/Makefile
@@ -21,17 +21,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
deleted file mode 100755
--- a/lib/libpkix/pkix_pl_nss/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/libpkix/pkix_pl_nss/module/Makefile
+++ b/lib/libpkix/pkix_pl_nss/module/Makefile
@@ -21,17 +21,36 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
+ifdef NSS_PKIX_NO_LDAP
+LDAP_HEADERS =
+LDAP_CSRCS =
+else
+LDAP_HEADERS = \
+	pkix_pl_ldapt.h \
+	pkix_pl_ldapcertstore.h \
+	pkix_pl_ldapresponse.h \
+	pkix_pl_ldaprequest.h \
+	pkix_pl_ldapdefaultclient.h \
+ 	$(NULL)
+ 
+LDAP_CSRCS = \
+	pkix_pl_ldaptemplates.c \
+	pkix_pl_ldapcertstore.c \
+	pkix_pl_ldapresponse.c \
+	pkix_pl_ldaprequest.c \
+	pkix_pl_ldapdefaultclient.c \
+ 	$(NULL)
+endif
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
deleted file mode 100755
--- a/lib/libpkix/pkix_pl_nss/module/config.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
-ifdef NSS_PKIX_NO_LDAP
-LDAP_HEADERS =
-LDAP_CSRCS =
-else
-LDAP_HEADERS = \
-	pkix_pl_ldapt.h \
-	pkix_pl_ldapcertstore.h \
-	pkix_pl_ldapresponse.h \
-	pkix_pl_ldaprequest.h \
-	pkix_pl_ldapdefaultclient.h \
- 	$(NULL)
- 
-LDAP_CSRCS = \
-	pkix_pl_ldaptemplates.c \
-	pkix_pl_ldapcertstore.c \
-	pkix_pl_ldapresponse.c \
-	pkix_pl_ldaprequest.c \
-	pkix_pl_ldapdefaultclient.c \
- 	$(NULL)
-endif
--- a/lib/libpkix/pkix_pl_nss/module/manifest.mn
+++ b/lib/libpkix/pkix_pl_nss/module/manifest.mn
@@ -26,9 +26,9 @@ CSRCS = \
 	pkix_pl_httpdefaultclient.c \
 	$(LDAP_CSRCS) \
 	pkix_pl_nsscontext.c \
 	pkix_pl_pk11certstore.c \
 	pkix_pl_socket.c \
 	$(NULL)
 
 LIBRARY_NAME = pkixmodule
-
+SHARED_LIBRARY = $(NULL)
--- a/lib/libpkix/pkix_pl_nss/pki/Makefile
+++ b/lib/libpkix/pkix_pl_nss/pki/Makefile
@@ -21,17 +21,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
deleted file mode 100755
--- a/lib/libpkix/pkix_pl_nss/pki/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/libpkix/pkix_pl_nss/pki/manifest.mn
+++ b/lib/libpkix/pkix_pl_nss/pki/manifest.mn
@@ -42,9 +42,9 @@ CSRCS = \
 	pkix_pl_ocsprequest.c \
 	pkix_pl_ocspresponse.c \
 	pkix_pl_publickey.c \
 	pkix_pl_x500name.c \
 	pkix_pl_ocspcertid.c \
 	$(NULL)
 
 LIBRARY_NAME = pkixpki
-
+SHARED_LIBRARY = $(NULL)
--- a/lib/libpkix/pkix_pl_nss/system/Makefile
+++ b/lib/libpkix/pkix_pl_nss/system/Makefile
@@ -21,17 +21,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
deleted file mode 100755
--- a/lib/libpkix/pkix_pl_nss/system/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/libpkix/pkix_pl_nss/system/manifest.mn
+++ b/lib/libpkix/pkix_pl_nss/system/manifest.mn
@@ -35,9 +35,9 @@ CSRCS = \
 	pkix_pl_object.c \
 	pkix_pl_oid.c \
 	pkix_pl_primhash.c \
 	pkix_pl_rwlock.c \
 	pkix_pl_string.c \
 	$(NULL)
 
 LIBRARY_NAME = pkixsystem
-
+SHARED_LIBRARY = $(NULL)
--- a/lib/pk11wrap/Makefile
+++ b/lib/pk11wrap/Makefile
@@ -21,18 +21,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
--include config.mk
-
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
 # (6) Execute "component" rules. (OPTIONAL)                           #
deleted file mode 100644
--- a/lib/pk11wrap/config.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/pk11wrap/manifest.mn
+++ b/lib/pk11wrap/manifest.mn
@@ -43,16 +43,17 @@ CSRCS = \
 	pk11pqg.c \
 	pk11sdr.c \
 	pk11skey.c \
 	pk11slot.c \
 	pk11util.c \
 	$(NULL)
 
 LIBRARY_NAME = pk11wrap
+SHARED_LIBRARY = $(NULL)
 
 NSS_LIBRARY_VERSION = 3
 SOFTOKEN_LIBRARY_VERSION = 3
 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" \
         -DNSS_SHLIB_VERSION=\"$(NSS_LIBRARY_VERSION)\" \
         -DSOFTOKEN_SHLIB_VERSION=\"$(SOFTOKEN_LIBRARY_VERSION)\"
 
 # only add module debugging in opt builds if DEBUG_PKCS11 is set
--- a/lib/pkcs12/Makefile
+++ b/lib/pkcs12/Makefile
@@ -22,18 +22,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
-
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
 # (6) Execute "component" rules. (OPTIONAL)                           #
deleted file mode 100644
--- a/lib/pkcs12/config.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# 
-# 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/.
-
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/pkcs12/manifest.mn
+++ b/lib/pkcs12/manifest.mn
@@ -21,11 +21,12 @@ CSRCS = \
 	p12dec.c \
 	p12plcy.c \
 	p12tmpl.c \
 	p12e.c \
 	p12d.c \
 	$(NULL)
 
 LIBRARY_NAME = pkcs12
+SHARED_LIBRARY = $(NULL)
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
--- a/lib/pkcs7/Makefile
+++ b/lib/pkcs7/Makefile
@@ -21,18 +21,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
-
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
 # (6) Execute "component" rules. (OPTIONAL)                           #
deleted file mode 100644
--- a/lib/pkcs7/config.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
--- a/lib/pkcs7/manifest.mn
+++ b/lib/pkcs7/manifest.mn
@@ -23,11 +23,12 @@ CSRCS = \
 	p7create.c \
 	p7decode.c \
 	p7encode.c \
 	p7local.c  \
 	secmime.c  \
 	$(NULL)
 
 LIBRARY_NAME = pkcs7
+SHARED_LIBRARY = $(NULL)
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
--- a/lib/pki/Makefile
+++ b/lib/pki/Makefile
@@ -1,10 +1,14 @@
 # 
 # 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/.
 
 include manifest.mn
+
 include $(CORE_DEPTH)/coreconf/config.mk
-include config.mk
+
+ifdef BUILD_IDG
+DEFINES += -DNSSDEBUG
+endif
+
 include $(CORE_DEPTH)/coreconf/rules.mk
-
deleted file mode 100644
--- a/lib/pki/config.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# 
-# 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/.
-
-ifdef BUILD_IDG
-DEFINES += -DNSSDEBUG
-endif
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
--- a/lib/pki/manifest.mn
+++ b/lib/pki/manifest.mn
@@ -31,12 +31,12 @@ CSRCS =		        \
 	pki3hack.c      \
 	$(NULL)
 
 #DEFINES = -DDEBUG_CACHE
 
 REQUIRES = nspr
 
 LIBRARY_NAME = nsspki
-LIBRARY_VERSION = 3
+SHARED_LIBRARY = $(NULL)
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
--- a/lib/sqlite/Makefile
+++ b/lib/sqlite/Makefile
@@ -22,17 +22,17 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
--include config.mk
+include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
--- a/lib/sysinit/Makefile
+++ b/lib/sysinit/Makefile
@@ -19,17 +19,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-#include ../platlibs.mk
 include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
@@ -38,11 +37,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-
-#include ../platrules.mk
-
--- a/lib/util/Makefile
+++ b/lib/util/Makefile
@@ -9,18 +9,16 @@
 #######################################################################
 
 include manifest.mn
 
 #######################################################################
 # (2) Include "global" configuration information. (OPTIONAL)          #
 #######################################################################
 
-# include $(CORE_DEPTH)/coreconf/arch.mk
-
 include $(CORE_DEPTH)/coreconf/config.mk
 
 #######################################################################
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
 
 
--- a/lib/zlib/Makefile
+++ b/lib/zlib/Makefile
@@ -20,17 +20,22 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
+EXTRA_LIBS = $(LIBRARY)
+
+ifneq ($(OS_ARCH),WINNT)
+DEFINES += -DHAVE_UNISTD_H
+endif
+DEFINES += -DHAVE_STDARG_H
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
deleted file mode 100644
--- a/lib/zlib/config.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
-EXTRA_LIBS     = $(LIBRARY)
-
-ifneq ($(OS_ARCH),WINNT)
-DEFINES += -DHAVE_UNISTD_H
-endif
-DEFINES += -DHAVE_STDARG_H
--- a/lib/zlib/manifest.mn
+++ b/lib/zlib/manifest.mn
@@ -22,16 +22,15 @@ CSRCS =	adler32.c 	\
 	inflate.c 	\
 	inftrees.c 	\
 	trees.c 	\
 	uncompr.c 	\
 	zutil.c 	\
 	$(NULL)
 
 LIBRARY_NAME = zlib
-
-# REQUIRES = nss
+SHARED_LIBRARY = $(NULL)
 
 # Define verbose as -1 to turn off all zlib trace messages in
 # debug builds.
 DEFINES = -Dverbose=-1
 
 NO_MD_RELEASE = 1