Built nss3.dll, smime3.dll, and ssl3.dll on Windows. Note that we do

not want the "32" in the DLL names that coreconf adds by default.  We
use module-definition (.DEF) files to control the exported symbols.
Made pkcs7 part of nss3.dll to temporarily work around circular dependency
between nss3.dll and smime3.dll (certread.c depends on some PKCS7 symbols).
Modified files: lib/nss/config.mk, lib/smime/config.mk, lib/ssl/config.mk

security/nss/lib/nss/config.mk

@@ -45,6 +45,12 @@
 # can't do this in manifest.mn because OS_ARCH isn't defined there.
 ifeq ($(OS_ARCH), WINNT)
 
+# don't want the 32 in the shared library name
+SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll
+IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).lib
+
+DLLFLAGS += -DEF:nss.def
+
 # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
 CRYPTOLIB=$(DIST)/lib/freebl.lib
 ifdef MOZILLA_SECURITY_BUILD
@@ -56,6 +62,7 @@ ifdef MOZILLA_BSAFE_BUILD
 endif
 
 EXTRA_LIBS += \
+	$(DIST)/lib/pkcs7.lib \
 	$(DIST)/lib/certhi.lib \
 	$(DIST)/lib/cryptohi.lib \
 	$(DIST)/lib/pk11wrap.lib \

security/nss/lib/smime/config.mk

@@ -46,6 +46,12 @@ RELEASE_LIBS = $(TARGETS)
 
 ifeq ($(OS_ARCH), WINNT)
 
+# don't want the 32 in the shared library name
+SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll
+IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).lib
+
+DLLFLAGS += -DEF:smime.def
+
 EXTRA_LIBS += \
 	$(DIST)/lib/pkcs12.lib \
 	$(DIST)/lib/nss3.lib \

security/nss/lib/ssl/config.mk

@@ -44,6 +44,12 @@
 
 ifeq ($(OS_ARCH), WINNT)
 
+# don't want the 32 in the shared library name
+SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll
+IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).lib
+
+DLLFLAGS += -DEF:ssl.def
+
 EXTRA_LIBS += \
 	$(DIST)/lib/nss3.lib \
 	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4.lib \