Bugzilla bug #66889: do not export the Windows import libraries for the

loadable PKCS#11 modules fort32.dll, swft32.dll, and nssckbi.dll.
Reviewed by Bob Relyea.
Modified files:
	nss/lib/ckfw/builtins/Makefile nss/lib/ckfw/builtins/config.mk
	nss/lib/fortcrypt/config.mk
	nss/lib/fortcrypt/swfort/pkcs11/config.mk

security/nss/lib/ckfw/builtins/Makefile

@@ -30,7 +30,7 @@
 # may use your version of this file under either the MPL or the
 # GPL.
 #
-MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.6 $ $Date: 2001-01-22 17:16:45 $ $Name:  $"
+MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.7 $ $Date: 2001-01-30 19:43:20 $ $Name:  $"
 
 include manifest.mn
 include $(CORE_DEPTH)/coreconf/config.mk
@@ -67,11 +67,6 @@ EXTRA_LIBS += \
 endif
 
 
-ifeq ($(OS_ARCH), WINNT)
-	SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll
-	IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).lib
-endif
-
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 

security/nss/lib/ckfw/builtins/config.mk

@@ -30,7 +30,21 @@
 # may use your version of this file under either the MPL or the
 # GPL.
 #
-CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.1 $ $Date: 2000-03-31 19:43:48 $ $Name:  $"
+CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.2 $ $Date: 2001-01-30 19:43:21 $ $Name:  $"
+
+#
+#  Override TARGETS variable so that only shared libraries
+#  are specifed as dependencies within rules.mk.
+#
+
+TARGETS        = $(SHARED_LIBRARY)
+LIBRARY        =
+IMPORT_LIBRARY =
+PROGRAM        =
+
+ifeq ($(OS_ARCH), WINNT)
+	SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll
+endif
 
 ifdef BUILD_IDG
 DEFINES += -DNSSDEBUG

security/nss/lib/fortcrypt/config.mk

@@ -32,21 +32,12 @@
 #
 
 #
-#  Override TARGETS variable so that only static libraries
+#  Override TARGETS variable so that only shared libraries
 #  are specifed as dependencies within rules.mk.
 #
 
-ifeq ($(OS_TARGET), WIN16)
-TARGETS        = all
-else
 TARGETS        = $(SHARED_LIBRARY)
-endif
 LIBRARY        =
-PURE_LIBRARY   =
+IMPORT_LIBRARY =
 PROGRAM        =
 
-
-ifeq ($(OS_TARGET), WIN16)
-dummy:
-	@echo $(TARGETS)
-endif

security/nss/lib/fortcrypt/swfort/pkcs11/config.mk

@@ -32,21 +32,12 @@
 #
 
 #
-#  Override TARGETS variable so that only static libraries
+#  Override TARGETS variable so that only shared libraries
 #  are specifed as dependencies within rules.mk.
 #
 
-ifeq ($(OS_TARGET), WIN16)
-TARGETS        = all
-else
 TARGETS        = $(SHARED_LIBRARY) $(SHARED_SW_LIBRARY) $(LIBCI_JAR) $(LIBCI_SW_JAR)
-endif
 LIBRARY        =
-PURE_LIBRARY   =
+IMPORT_LIBRARY =
 PROGRAM        =
 
-
-ifeq ($(OS_TARGET), WIN16)
-dummy:
-	@echo $(TARGETS)
-endif