Bug 290526 Drop recursive private_exports r=rrelyea
authorJan-Marek Glogowski <glogow@fbihome.de>
Tue, 05 May 2020 12:29:21 +0000
changeset 15594 989ecbd870f3c2f81f0e2c559e277b11aa0c577b
parent 15593 5d0bfa092e0fc37be1791132fa00f7f2e74f5a9b
child 15595 a82a55886c1d84ac17c9fd6c31ce03f682e93cfe
push id3740
push userjjones@mozilla.com
push dateMon, 11 May 2020 21:08:39 +0000
reviewersrrelyea
bugs290526
Bug 290526 Drop recursive private_exports r=rrelyea Copying private headers is now simply included in the exports target, as these headers use an extra directory anyway. Differential Revision: https://phabricator.services.mozilla.com/D69021
cmd/bltest/manifest.mn
cmd/chktest/manifest.mn
cmd/crmf-cgi/manifest.mn
cmd/crmftest/manifest.mn
cmd/fipstest/manifest.mn
cmd/lib/Makefile
cmd/libpkix/testutil/Makefile
cmd/lowhashtest/manifest.mn
cmd/modutil/manifest.mn
cmd/pk11gcmtest/manifest.mn
cmd/pk11mode/manifest.mn
cmd/rsapoptst/manifest.mn
cmd/signtool/manifest.mn
cmd/ssltap/manifest.mn
coreconf/README
coreconf/rules.mk
cpputil/manifest.mn
gtests/google_test/manifest.mn
gtests/pkcs11testmodule/Makefile
lib/base/Makefile
lib/certdb/Makefile
lib/certhigh/Makefile
lib/ckfw/Makefile
lib/crmf/Makefile
lib/cryptohi/Makefile
lib/dbm/include/Makefile
lib/dev/Makefile
lib/dev/manifest.mn
lib/freebl/Makefile
lib/libpkix/Makefile
lib/libpkix/include/Makefile
lib/libpkix/include/manifest.mn
lib/libpkix/pkix/Makefile
lib/libpkix/pkix/certsel/Makefile
lib/libpkix/pkix/certsel/manifest.mn
lib/libpkix/pkix/checker/Makefile
lib/libpkix/pkix/checker/manifest.mn
lib/libpkix/pkix/crlsel/Makefile
lib/libpkix/pkix/crlsel/manifest.mn
lib/libpkix/pkix/params/Makefile
lib/libpkix/pkix/params/manifest.mn
lib/libpkix/pkix/results/Makefile
lib/libpkix/pkix/results/manifest.mn
lib/libpkix/pkix/store/Makefile
lib/libpkix/pkix/store/manifest.mn
lib/libpkix/pkix/top/Makefile
lib/libpkix/pkix/top/manifest.mn
lib/libpkix/pkix/util/Makefile
lib/libpkix/pkix/util/manifest.mn
lib/libpkix/pkix_pl_nss/Makefile
lib/libpkix/pkix_pl_nss/module/Makefile
lib/libpkix/pkix_pl_nss/module/manifest.mn
lib/libpkix/pkix_pl_nss/pki/Makefile
lib/libpkix/pkix_pl_nss/pki/manifest.mn
lib/libpkix/pkix_pl_nss/system/Makefile
lib/libpkix/pkix_pl_nss/system/manifest.mn
lib/nss/Makefile
lib/pk11wrap/Makefile
lib/pki/Makefile
lib/pki/manifest.mn
lib/softoken/Makefile
lib/softoken/legacydb/Makefile
lib/sqlite/Makefile
lib/sqlite/manifest.mn
lib/ssl/Makefile
lib/util/Makefile
lib/zlib/Makefile
--- a/cmd/bltest/manifest.mn
+++ b/cmd/bltest/manifest.mn
@@ -7,20 +7,14 @@ CORE_DEPTH = ../..
 MODULE = nss
 
 REQUIRES = seccmd dbm softoken
 
 INCLUDES += -I$(CORE_DEPTH)/nss/lib/softoken
 
 PROGRAM = bltest
 
- USE_STATIC_LIBS = 1
-
-EXPORTS = \
-	$(NULL)
-
-PRIVATE_EXPORTS = \
-	$(NULL)
+USE_STATIC_LIBS = 1
 
 CSRCS = \
 	blapitest.c \
 	$(NULL)
 
--- a/cmd/chktest/manifest.mn
+++ b/cmd/chktest/manifest.mn
@@ -8,20 +8,14 @@ MODULE = nss
 
 #REQUIRES = seccmd dbm softoken
 REQUIRES = seccmd dbm
 
 #INCLUDES += -I$(CORE_DEPTH)/nss/lib/softoken
 
 PROGRAM = chktest
 
- USE_STATIC_LIBS = 1
-
-EXPORTS = \
-	$(NULL)
-
-PRIVATE_EXPORTS = \
-	$(NULL)
+USE_STATIC_LIBS = 1
 
 CSRCS = \
 	chktest.c \
 	$(NULL)
 
--- a/cmd/crmf-cgi/manifest.mn
+++ b/cmd/crmf-cgi/manifest.mn
@@ -1,24 +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/.
 
 CORE_DEPTH = ../..
 MODULE	= sectools
 
-EXPORTS = \
-	$(NULL)
-
 CSRCS = \
 	crmfcgi.c \
 	$(NULL)
 
-
 REQUIRES = nss dbm seccmd
 
 ifdef ATTACH_CGI
 DEFINES += -DATTACH_CGI
 endif
 
 ifdef WRITE_OUT_RESPONSE
 DEFINES += -DWRITE_OUT_RESPONSE
--- a/cmd/crmftest/manifest.mn
+++ b/cmd/crmftest/manifest.mn
@@ -4,22 +4,18 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 CORE_DEPTH = ../..
 DEPTH      = .
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE	= nss
 
-EXPORTS = \
-	$(NULL)
-
 CSRCS = \
 	testcrmf.c \
 	$(NULL)
 
-
 # The MODULE is always implicitly required.
 # Listing it here in REQUIRES makes it appear twice in the cc command line.
 # REQUIRES = dbm
 
 PROGRAM  = crmftest
 
--- a/cmd/fipstest/manifest.mn
+++ b/cmd/fipstest/manifest.mn
@@ -6,18 +6,12 @@
 CORE_DEPTH = ../..
 
 MODULE = nss
 
 PROGRAM = fipstest
 
 USE_STATIC_LIBS = 1
 
-EXPORTS = \
-	$(NULL)
-
-PRIVATE_EXPORTS = \
-	$(NULL)
-
 CSRCS = \
 	fipstest.c \
 	$(NULL)
 
--- a/cmd/lib/Makefile
+++ b/cmd/lib/Makefile
@@ -40,11 +40,10 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
 
--- a/cmd/libpkix/testutil/Makefile
+++ b/cmd/libpkix/testutil/Makefile
@@ -42,10 +42,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
 
 include $(PLAT_DEPTH)/platrules.mk
 
-export:: private_export
 
--- a/cmd/lowhashtest/manifest.mn
+++ b/cmd/lowhashtest/manifest.mn
@@ -7,19 +7,13 @@ CORE_DEPTH = ../..
 MODULE = nss
 
 REQUIRES = seccmd dbm softoken
 
 INCLUDES += -I$(CORE_DEPTH)/nss/lib/freebl
 
 PROGRAM = lowhashtest
 
-EXPORTS = \
-	$(NULL)
-
-PRIVATE_EXPORTS = \
-	$(NULL)
-
 CSRCS = \
 	lowhashtest.c \
 	$(NULL)
 
 USE_STATIC_LIBS = 1
--- a/cmd/modutil/manifest.mn
+++ b/cmd/modutil/manifest.mn
@@ -2,18 +2,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 = ../..
 
 MODULE = sectools
 
-EXPORTS = 
-
 CSRCS = modutil.c		\
 		pk11.c			\
 		instsec.c		\
 		install.c		\
 		installparse.c		\
 		install-ds.c		\
 		lex.Pk11Install_yy.c	\
 		$(NULL)
--- a/cmd/pk11gcmtest/manifest.mn
+++ b/cmd/pk11gcmtest/manifest.mn
@@ -4,17 +4,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 CORE_DEPTH = ../..
 
 MODULE = nss
 
 PROGRAM = pk11gcmtest
 
-EXPORTS = \
-	$(NULL)
-
-PRIVATE_EXPORTS = \
-	$(NULL)
-
 CSRCS = \
 	pk11gcmtest.c \
 	$(NULL)
--- a/cmd/pk11mode/manifest.mn
+++ b/cmd/pk11mode/manifest.mn
@@ -2,15 +2,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/.
 
 CORE_DEPTH = ../..
 
 MODULE = nss
 
-EXPORTS =
-
 CSRCS = pk11mode.c
 
 PROGRAM = pk11mode
 
 REQUIRES = seccmd
--- a/cmd/rsapoptst/manifest.mn
+++ b/cmd/rsapoptst/manifest.mn
@@ -5,18 +5,12 @@
 CORE_DEPTH = ../..
 
 MODULE = nss
 
 REQUIRES = seccmd dbm softoken
 
 PROGRAM = rsapoptst
 
-EXPORTS = \
-	$(NULL)
-
-PRIVATE_EXPORTS = \
-	$(NULL)
-
 CSRCS = \
 	rsapoptst.c \
 	$(NULL)
 
--- a/cmd/signtool/manifest.mn
+++ b/cmd/signtool/manifest.mn
@@ -5,18 +5,16 @@
 CORE_DEPTH = ../..
 
 MODULE = nss
 
 ifdef ZLIB_INCLUDE_DIR
 INCLUDES += -I$(ZLIB_INCLUDE_DIR)
 endif
 
-EXPORTS = 
-
 CSRCS = signtool.c		\
 		certgen.c	\
 		javascript.c	\
 		list.c		\
 		sign.c		\
 		util.c		\
 		verify.c	\
 		zip.c		\
--- a/cmd/ssltap/manifest.mn
+++ b/cmd/ssltap/manifest.mn
@@ -3,18 +3,16 @@
 # 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 = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
 
-EXPORTS = 
-
 CSRCS = ssltap.c	\
 	$(NULL)
 
 PROGRAM =  ssltap
 
 REQUIRES = seccmd dbm
 
 PACKAGE_FILES = ssltap-manual.html licence.doc ssltap.exe
--- a/coreconf/README
+++ b/coreconf/README
@@ -331,20 +331,16 @@ OVERVIEW of "rules.mk":
         clobber::               synonym for "clean::" rule
 
         realclean::             remove all files specified by
                                 $(wildcard *.OBJ), dist, and in
                                 the $(ALL_TRASH) variable
 
         clobber_all::           synonym for "realclean::" rule
 
-        private_export::        recursively copy specified
-                                cross-platform header files to the
-                                $(SOURCE_XPPRIVATE_DIR) directory
-
 
         IMPORT
         ------
         import::                uses perl script to retrieve specified
                                 VERSION of the binary release from
                                 $(RELEASE_TREE)
 
         RELEASE
--- a/coreconf/rules.mk
+++ b/coreconf/rules.mk
@@ -42,19 +42,19 @@ all::
 	# all dependencies done -> finish libraries
 	$(MAKE) -C lib libs
 	# cmd library sectool
 	$(MAKE) -C cmd/lib libs
 	# everything still missing
 	$(MAKE) libs
 
 ifeq ($(AUTOCLEAN),1)
-autobuild:: clean export private_export libs program install
+autobuild:: clean export libs program install
 else
-autobuild:: export private_export libs program install
+autobuild:: export libs program install
 endif
 
 platform::
 	@echo $(OBJDIR_NAME)
 
 ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
 USE_NT_C_SYNTAX=1
 endif
@@ -94,19 +94,17 @@ import::
 		"$(XPHEADER_JAR)=$(IMPORT_XP_DIR)|$(SOURCE_XP_DIR)/public/|v" \
 		"$(MDHEADER_JAR)=$(IMPORT_MD_DIR)|$(SOURCE_MD_DIR)/include|"        \
 		"$(MDBINARY_JAR)=$(IMPORT_MD_DIR)|$(SOURCE_MD_DIR)|"
 # On Mac OS X ranlib needs to be rerun after static libs are moved.
 ifeq ($(OS_TARGET),Darwin)
 	find $(SOURCE_MD_DIR)/lib -name "*.a" -exec $(RANLIB) {} \;
 endif
 
-export:: $(DIRS)
-
-private_export:: $(DIRS)
+export:: $(DIRS) private_export
 
 release_export:: $(DIRS)
 
 release_classes:: $(DIRS)
 
 libs program install:: $(DIRS) $(TARGETS)
 ifneq ($(LIBRARY),)
 	$(INSTALL) -m 664 $(LIBRARY) $(SOURCE_LIB_DIR)
--- a/cpputil/manifest.mn
+++ b/cpputil/manifest.mn
@@ -14,11 +14,8 @@ CPPSRCS = \
 else
 CPPSRCS = \
       databuffer.cc \
       dummy_io.cc \
       dummy_io_fwd.cc \
       tls_parser.cc \
       $(NULL)
 endif
-
-EXPORTS = \
-      $(NULL)
--- a/gtests/google_test/manifest.mn
+++ b/gtests/google_test/manifest.mn
@@ -9,15 +9,8 @@ MODULE = gtest
 LIBRARY_NAME = gtest
 LIBRARY_VERSION = 1
 
 INCLUDES += -Igtest/include/ -Igtest
 
 CPPSRCS = \
 	gtest/src/gtest-all.cc \
 	$(NULL)
-
-
-EXPORTS = \
-	$(NULL)
-
-
-
--- a/gtests/pkcs11testmodule/Makefile
+++ b/gtests/pkcs11testmodule/Makefile
@@ -37,9 +37,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (6) Execute "component" rules. (OPTIONAL)                           #
 #######################################################################
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
--- a/lib/base/Makefile
+++ b/lib/base/Makefile
@@ -3,9 +3,8 @@
 # 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
 include $(CORE_DEPTH)/coreconf/rules.mk
 
-export:: private_export
--- a/lib/certdb/Makefile
+++ b/lib/certdb/Makefile
@@ -39,10 +39,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
--- a/lib/certhigh/Makefile
+++ b/lib/certhigh/Makefile
@@ -39,10 +39,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
--- a/lib/ckfw/Makefile
+++ b/lib/ckfw/Makefile
@@ -19,17 +19,16 @@ endif
 # Turning off to fix builds.
 #
 # nssckepv.h: ck.api ckapi.perl
 # nssckft.h: ck.api ckapi.perl
 # nssckg.h: ck.api ckapi.perl
 # nssck.api: ck.api ckapi.perl
 # 	$(PERL) ckapi.perl ck.api
 
-export:: private_export
 
 # can't do this in manifest.mn because OS_TARGET isn't defined there.
 ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))
 ifdef NSS_BUILD_CAPI
 DIRS += capi
 endif
 endif
 
--- a/lib/crmf/Makefile
+++ b/lib/crmf/Makefile
@@ -41,9 +41,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
 
-export:: private_export
--- a/lib/cryptohi/Makefile
+++ b/lib/cryptohi/Makefile
@@ -40,10 +40,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
 
-export:: private_export
 
--- a/lib/dbm/include/Makefile
+++ b/lib/dbm/include/Makefile
@@ -39,9 +39,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
--- a/lib/dev/Makefile
+++ b/lib/dev/Makefile
@@ -16,9 +16,8 @@ ifeq ($(USE_64),1)
 ifndef BUILD_OPT
 $(OBJDIR)/ckhelper.o: ckhelper.c
 	@$(MAKE_OBJDIR)
 	$(CC) -o $@ -c -O2 $(CFLAGS) $<
 endif
 endif
 endif
 
-export:: private_export
--- a/lib/dev/manifest.mn
+++ b/lib/dev/manifest.mn
@@ -10,19 +10,16 @@ PRIVATE_EXPORTS = \
 	devm.h     \
 	devtm.h    \
 	devt.h     \
 	dev.h      \
 	nssdevt.h  \
 	nssdev.h   \
 	$(NULL)
 
-EXPORTS =	   \
-	$(NULL)
-
 MODULE = nss
 
 CSRCS =		        \
 	devslot.c       \
 	devtoken.c      \
 	devutil.c       \
 	ckhelper.c      \
 	$(NULL)
--- a/lib/freebl/Makefile
+++ b/lib/freebl/Makefile
@@ -581,17 +581,16 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
 rijndael_tables:
 	$(CC) -o $(OBJDIR)/make_rijndael_tab rijndael_tables.c \
 	         $(DEFINES) $(INCLUDES) $(OBJDIR)/libfreebl.a
 	$(OBJDIR)/make_rijndael_tab
 
 vpath %.h mpi ecl verified
 vpath %.c mpi ecl verified
--- a/lib/libpkix/Makefile
+++ b/lib/libpkix/Makefile
@@ -39,10 +39,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
--- a/lib/libpkix/include/Makefile
+++ b/lib/libpkix/include/Makefile
@@ -39,10 +39,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
--- a/lib/libpkix/include/manifest.mn
+++ b/lib/libpkix/include/manifest.mn
@@ -1,17 +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/.
 CORE_DEPTH = ../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix.h \
 	pkix_crlsel.h \
 	pkix_errorstrings.h \
 	pkix_results.h \
 	pkixt.h \
 	pkix_certsel.h \
 	pkix_params.h \
--- a/lib/libpkix/pkix/Makefile
+++ b/lib/libpkix/pkix/Makefile
@@ -39,10 +39,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
--- a/lib/libpkix/pkix/certsel/Makefile
+++ b/lib/libpkix/pkix/certsel/Makefile
@@ -39,10 +39,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
--- a/lib/libpkix/pkix/certsel/manifest.mn
+++ b/lib/libpkix/pkix/certsel/manifest.mn
@@ -1,17 +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/.
 CORE_DEPTH = ../../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix_certselector.h \
 	pkix_comcertselparams.h \
 	$(NULL)
 
 MODULE = nss
 
 CSRCS = \
--- a/lib/libpkix/pkix/checker/Makefile
+++ b/lib/libpkix/pkix/checker/Makefile
@@ -39,10 +39,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
--- a/lib/libpkix/pkix/checker/manifest.mn
+++ b/lib/libpkix/pkix/checker/manifest.mn
@@ -1,17 +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/.
 CORE_DEPTH = ../../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix_basicconstraintschecker.h \
 	pkix_certchainchecker.h \
 	pkix_crlchecker.h \
         pkix_ekuchecker.h \
 	pkix_expirationchecker.h \
 	pkix_namechainingchecker.h \
 	pkix_nameconstraintschecker.h \
--- a/lib/libpkix/pkix/crlsel/Makefile
+++ b/lib/libpkix/pkix/crlsel/Makefile
@@ -39,10 +39,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
--- a/lib/libpkix/pkix/crlsel/manifest.mn
+++ b/lib/libpkix/pkix/crlsel/manifest.mn
@@ -1,17 +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/.
 CORE_DEPTH = ../../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix_comcrlselparams.h \
 	pkix_crlselector.h \
 	$(NULL)
 
 MODULE = nss
 
 CSRCS = \
--- a/lib/libpkix/pkix/params/Makefile
+++ b/lib/libpkix/pkix/params/Makefile
@@ -39,10 +39,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
--- a/lib/libpkix/pkix/params/manifest.mn
+++ b/lib/libpkix/pkix/params/manifest.mn
@@ -1,17 +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/.
 CORE_DEPTH = ../../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix_procparams.h \
 	pkix_trustanchor.h \
 	pkix_valparams.h \
 	pkix_resourcelimits.h \
 	$(NULL)
 
 MODULE = nss
--- a/lib/libpkix/pkix/results/Makefile
+++ b/lib/libpkix/pkix/results/Makefile
@@ -39,10 +39,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
--- a/lib/libpkix/pkix/results/manifest.mn
+++ b/lib/libpkix/pkix/results/manifest.mn
@@ -1,17 +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/.
 CORE_DEPTH = ../../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix_buildresult.h \
 	pkix_policynode.h \
 	pkix_valresult.h \
 	pkix_verifynode.h \
 	$(NULL)
 
 MODULE = nss
--- a/lib/libpkix/pkix/store/Makefile
+++ b/lib/libpkix/pkix/store/Makefile
@@ -39,10 +39,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
--- a/lib/libpkix/pkix/store/manifest.mn
+++ b/lib/libpkix/pkix/store/manifest.mn
@@ -1,17 +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/.
 CORE_DEPTH = ../../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix_store.h \
 	$(NULL)
 
 MODULE = nss
 
 CSRCS = \
 	pkix_store.c \
--- a/lib/libpkix/pkix/top/Makefile
+++ b/lib/libpkix/pkix/top/Makefile
@@ -39,10 +39,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
--- a/lib/libpkix/pkix/top/manifest.mn
+++ b/lib/libpkix/pkix/top/manifest.mn
@@ -1,17 +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/.
 CORE_DEPTH = ../../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix_build.h \
 	pkix_lifecycle.h \
 	pkix_validate.h \
 	$(NULL)
 
 MODULE = nss
 
--- a/lib/libpkix/pkix/util/Makefile
+++ b/lib/libpkix/pkix/util/Makefile
@@ -38,11 +38,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (6) Execute "component" rules. (OPTIONAL)                           #
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
-
-export:: private_export
-
--- a/lib/libpkix/pkix/util/manifest.mn
+++ b/lib/libpkix/pkix/util/manifest.mn
@@ -1,17 +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/.
 CORE_DEPTH = ../../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix_tools.h \
 	pkix_error.h \
 	pkix_logger.h \
 	pkix_list.h \
 	$(NULL)
 
 MODULE = nss
--- a/lib/libpkix/pkix_pl_nss/Makefile
+++ b/lib/libpkix/pkix_pl_nss/Makefile
@@ -38,11 +38,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (6) Execute "component" rules. (OPTIONAL)                           #
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
-
-export:: private_export
-
--- a/lib/libpkix/pkix_pl_nss/module/Makefile
+++ b/lib/libpkix/pkix_pl_nss/module/Makefile
@@ -39,10 +39,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
--- a/lib/libpkix/pkix_pl_nss/module/manifest.mn
+++ b/lib/libpkix/pkix_pl_nss/module/manifest.mn
@@ -1,33 +1,29 @@
 # 
 # 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 = ../../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix_pl_aiamgr.h \
 	pkix_pl_colcertstore.h \
 	pkix_pl_httpcertstore.h \
 	pkix_pl_httpdefaultclient.h \
 	$(LDAP_HEADERS) \
 	pkix_pl_nsscontext.h \
 	pkix_pl_pk11certstore.h \
 	pkix_pl_socket.h \
 	$(NULL)
 
 MODULE = nss
 
 DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
 
-
 CSRCS = \
 	pkix_pl_aiamgr.c \
 	pkix_pl_colcertstore.c \
 	pkix_pl_httpcertstore.c \
 	pkix_pl_httpdefaultclient.c \
 	$(LDAP_CSRCS) \
 	pkix_pl_nsscontext.c \
 	pkix_pl_pk11certstore.c \
--- a/lib/libpkix/pkix_pl_nss/pki/Makefile
+++ b/lib/libpkix/pkix_pl_nss/pki/Makefile
@@ -39,11 +39,10 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
 
--- a/lib/libpkix/pkix_pl_nss/pki/manifest.mn
+++ b/lib/libpkix/pkix_pl_nss/pki/manifest.mn
@@ -1,17 +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/.
 CORE_DEPTH = ../../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix_pl_basicconstraints.h \
 	pkix_pl_cert.h \
 	pkix_pl_certpolicyinfo.h \
 	pkix_pl_certpolicymap.h \
 	pkix_pl_certpolicyqualifier.h \
 	pkix_pl_crl.h \
         pkix_pl_crldp.h \
--- a/lib/libpkix/pkix_pl_nss/system/Makefile
+++ b/lib/libpkix/pkix_pl_nss/system/Makefile
@@ -39,11 +39,10 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
 
--- a/lib/libpkix/pkix_pl_nss/system/manifest.mn
+++ b/lib/libpkix/pkix_pl_nss/system/manifest.mn
@@ -1,17 +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/.
 CORE_DEPTH = ../../../..
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	pkix_pl_common.h \
 	pkix_pl_mem.h \
 	pkix_pl_object.h \
 	pkix_pl_string.h \
 	pkix_pl_primhash.h \
 	pkix_pl_bigint.h \
 	pkix_pl_mutex.h \
--- a/lib/nss/Makefile
+++ b/lib/nss/Makefile
@@ -38,9 +38,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
--- a/lib/pk11wrap/Makefile
+++ b/lib/pk11wrap/Makefile
@@ -39,17 +39,16 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
 $(OBJDIR)/pk11load$(OBJ_SUFFIX): debug_module.c
 
 # On AIX 4.3, IBM xlC_r compiler (version 3.6.6) cannot compile
 # pk11slot.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)
--- a/lib/pki/Makefile
+++ b/lib/pki/Makefile
@@ -3,9 +3,8 @@
 # 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
 include $(CORE_DEPTH)/coreconf/rules.mk
 
-export:: private_export
--- a/lib/pki/manifest.mn
+++ b/lib/pki/manifest.mn
@@ -11,19 +11,16 @@ PRIVATE_EXPORTS = \
 	nsspkit.h  \
 	nsspki.h   \
 	pkistore.h \
 	pki3hack.h \
 	pkitm.h    \
 	pkim.h     \
 	$(NULL)
 
-EXPORTS =	   \
-	$(NULL)
-
 MODULE = nss
 
 CSRCS =		        \
 	asymmkey.c      \
 	certificate.c   \
 	cryptocontext.c \
 	symmkey.c       \
 	trustdomain.c   \
--- a/lib/softoken/Makefile
+++ b/lib/softoken/Makefile
@@ -51,17 +51,16 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 ifdef NSS_DISABLE_DBM
 DIRS=
 endif
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
 # indicates dependency on freebl static lib
 $(SHARED_LIBRARY): $(CRYPTOLIB)
 
 # On AIX 4.3, IBM xlC_r compiler (version 3.6.6) cannot compile
 # pkcs11c.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)
--- a/lib/softoken/legacydb/Makefile
+++ b/lib/softoken/legacydb/Makefile
@@ -51,12 +51,10 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
-
 # indicates dependency on freebl static lib
 $(SHARED_LIBRARY): $(CRYPTOLIB)
--- a/lib/sqlite/Makefile
+++ b/lib/sqlite/Makefile
@@ -42,15 +42,13 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
 WARNING_CFLAGS = $(NULL)
 
-export:: private_export
-
 ifeq (WINNT,$(OS_ARCH))
 # sqlite calls the deprecated GetVersionExA method
 OS_CFLAGS += -w44996
 endif
 
--- a/lib/sqlite/manifest.mn
+++ b/lib/sqlite/manifest.mn
@@ -6,29 +6,23 @@ CORE_DEPTH = ../..
 
 MODULE = nss
 
 LIBRARY_NAME = sqlite
 LIBRARY_VERSION = 3
 MAPFILE = $(OBJDIR)/sqlite.def
 DEFINES += -DSQLITE_THREADSAFE=1
 
-EXPORTS = \
-	$(NULL)
-
 PRIVATE_EXPORTS = \
 	sqlite3.h \
 	$(NULL)
 
-
 CSRCS = \
 	sqlite3.c \
 	$(NULL)
 
-
-
 # only add module debugging in opt builds if DEBUG_PKCS11 is set
 ifdef DEBUG_PKCS11
   DEFINES += -DDEBUG_MODULE
 endif
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
--- a/lib/ssl/Makefile
+++ b/lib/ssl/Makefile
@@ -56,10 +56,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (6) Execute "component" rules. (OPTIONAL)                           #
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
-
-export:: private_export
--- a/lib/util/Makefile
+++ b/lib/util/Makefile
@@ -42,9 +42,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
 
-export:: private_export
--- a/lib/zlib/Makefile
+++ b/lib/zlib/Makefile
@@ -38,17 +38,16 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 #######################################################################
 
 
 
 #######################################################################
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-export:: private_export
 
 test: $(PROGRAMS)
 	@cd $(OBJDIR); \
 	if echo hello world | ./minigzip | ./minigzip -d && ./example; then \
 	  echo '		*** zlib test OK ***'; \
 	else \
 	  echo '		*** zlib test FAILED ***'; false; \
 	fi