Fix for bug 86958, checking in for waterson.

r=leaf, sr=blizzard, a=asa

  modifications to link crypto into a meta-component for static-build.

security/manager/pki/src/Makefile.in

@@ -44,6 +44,9 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= pippki
 LIBRARY_NAME	= pippki
 IS_COMPONENT	= 1
+MODULE_NAME	= PKI
+EXPORT_LIBRARY	= 1
+META_COMPONENT	= crypto
 
 EXPORTS =  \
 	$(NULL)

security/manager/pki/src/makefile.win

@@ -38,11 +38,11 @@ MODULE = pippki
 DEPTH=..\..\..\..
 IGNORE_MANIFEST=1
 
-DLLNAME       = pippki
-PDBFILE       = $(DLLNAME).pdb
-MAPFILE       = $(DLLNAME).map
-DLL           = .\$(OBJDIR)\$(DLLNAME).dll
-MAKE_OBJ_TYPE = DLL
+LIBRARY_NAME   = pippki
+PDBFILE        = $(LIBRARY_NAME).pdb
+MAPFILE        = $(LIBRARY_NAME).map
+MODULE_NAME = PKI
+META_COMPONENT = crypto
 
 include <$(DEPTH)/config/config.mak>
 
@@ -67,6 +67,3 @@ OBJS = \
     $(NULL)
 
 include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-    $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components

security/manager/ssl/src/Makefile.in

@@ -44,6 +44,9 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= pipnss
 LIBRARY_NAME	= pipnss
 IS_COMPONENT	= 1
+MODULE_NAME	= NSS
+EXPORT_LIBRARY	= 1
+META_COMPONENT	= crypto
 
 EXPORTS = 			\
 	$(NULL)

security/manager/ssl/src/makefile.win

@@ -39,11 +39,11 @@ MODULE = pipnss
 DEPTH=..\..\..\..
 IGNORE_MANIFEST=1
 
-DLLNAME       = pipnss
-PDBFILE       = $(DLLNAME).pdb
-MAPFILE       = $(DLLNAME).map
-DLL           = .\$(OBJDIR)\$(DLLNAME).dll
-MAKE_OBJ_TYPE = DLL
+LIBRARY_NAME   = pipnss
+PDBFILE        = $(LIBRARY_NAME).pdb
+MAPFILE        = $(LIBRARY_NAME).map
+MODULE_NAME = NSS
+META_COMPONENT = crypto
 
 include <$(DEPTH)/config/config.mak>
 
@@ -55,11 +55,11 @@ LINCS = $(LINCS)     \
     -I$(XPDIST)/private/security \
     $(NULL)
 
-LLIBS   = \
+
+SUB_LIBRARIES   = \
     $(DIST)/lib/crmf.lib \
     $(DIST)/lib/ssl.lib \
     $(DIST)/lib/nss.lib \
-    $(DIST)/lib/ssl.lib \
     $(DIST)/lib/certhi.lib \
     $(DIST)/lib/cryptohi.lib \
     $(DIST)/lib/pk11wrap.lib \
@@ -70,6 +70,9 @@ LLIBS   = \
     $(DIST)/lib/freebl.lib \
     $(DIST)/lib/secutil.lib \
     $(DIST)/lib/dbm.lib \
+    $(NULL)
+
+LLIBS   = \
     $(LIBNSPR) \
     $(DIST)\lib\xpcom.lib \
     $(DIST)\lib\js3250.lib \
@@ -100,6 +103,5 @@ OBJS = \
 include <$(DEPTH)\config\rules.mak>
 
 install:: $(DLL)
-    $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
     $(MAKE_INSTALL) $(DIST)\lib\nssckbi.dll $(DIST)\bin