Add dynamic Library support to commands. Mark those that commands tha…

…t still

need to be build with static libraries appropriately.

security/nss/cmd/bltest/manifest.mn

@@ -38,6 +38,8 @@ REQUIRES = seccmd dbm
 
 PROGRAM = bltest
 
+# USE_STATIC_LIBS = 1
+
 EXPORTS = \
 	$(NULL)
 

security/nss/cmd/certcgi/manifest.mn

@@ -46,3 +46,5 @@ CSRCS = certcgi.c
 
 PROGRAM	= certcgi
 
+USE_STATIC_LIBS = 1
+

security/nss/cmd/certutil/manifest.mn

@@ -48,3 +48,5 @@ CSRCS = \
 REQUIRES = dbm seccmd
 
 PROGRAM = certutil
+
+USE_STATIC_LIBS = 1

security/nss/cmd/crlutil/manifest.mn

@@ -49,3 +49,5 @@ CSRCS = crlutil.c
 # this has to be different for NT and UNIX.
 # PROGRAM	= ./$(OBJDIR)/crlutil.exe
 PROGRAM	= crlutil
+
+USE_STATIC_LIBS = 1

security/nss/cmd/makepqg/manifest.mn

@@ -43,3 +43,5 @@ CSRCS	=  makepqg.c
 
 PROGRAM	= makepqg
 
+USE_STATIC_LIBS = 1
+

security/nss/cmd/modutil/manifest.mn

@@ -55,3 +55,5 @@ REQUIRES = seccmd security dbm
 DEFINES = -DNSPR20
 
 INCLUDES =
+
+USE_STATIC_LIBS = 1

security/nss/cmd/ocspclnt/manifest.mn

@@ -50,3 +50,5 @@ REQUIRES = dbm seccmd
 # So, look in the local Makefile for the defines for the list of libs.
 
 PROGRAM = ocspclnt
+
+USE_STATIC_LIBS = 1

security/nss/cmd/p7content/manifest.mn

@@ -42,3 +42,5 @@ REQUIRES = seccmd dbm
 PROGRAM = p7content
 # PROGRAM = ./$(OBJDIR)/p7content.exe
 
+USE_STATIC_LIBS = 1
+

security/nss/cmd/p7env/manifest.mn

@@ -42,3 +42,5 @@ REQUIRES = seccmd dbm
 PROGRAM = p7env
 # PROGRAM = ./$(OBJDIR)/p7env.exe
 
+USE_STATIC_LIBS = 1
+

security/nss/cmd/p7sign/manifest.mn

@@ -42,3 +42,5 @@ REQUIRES = seccmd dbm
 PROGRAM = p7sign
 # PROGRAM = ./$(OBJDIR)/p7sign.exe
 
+USE_STATIC_LIBS = 1
+

security/nss/cmd/p7verify/manifest.mn

@@ -42,3 +42,5 @@ REQUIRES = seccmd dbm
 PROGRAM = p7verify
 # PROGRAM = ./$(OBJDIR)/p7verify.exe
 
+USE_STATIC_LIBS = 1
+

security/nss/cmd/pk12util/manifest.mn

@@ -47,3 +47,5 @@ CSRCS = \
 REQUIRES = dbm seccmd
 
 PROGRAM = pk12util
+
+USE_STATIC_LIBS = 1

security/nss/cmd/platlibs.mk

@@ -31,6 +31,8 @@
 # GPL.
 #
 
+
+ifdef USE_STATIC_LIBS
 # can't do this in manifest.mn because OS_ARCH isn't defined there.
 ifeq ($(OS_ARCH), WINNT)
 
@@ -117,3 +119,48 @@ EXTRA_SHARED_LIBS += \
 	$(NULL)
 endif
 
+else
+# can't do this in manifest.mn because OS_ARCH isn't defined there.
+ifeq ($(OS_ARCH), WINNT)
+
+# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
+EXTRA_LIBS += \
+	$(DIST)/lib/sectool.lib \
+	$(DIST)/lib/smime3.lib \
+	$(DIST)/lib/ssl3.lib \
+	$(DIST)/lib/nss3.lib \
+	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4.lib \
+	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4.lib \
+	$(DIST)/lib/$(NSPR31_LIB_PREFIX)nspr4.lib \
+	$(NULL)
+
+# $(PROGRAM) has NO explicit dependencies on $(OS_LIBS)
+OS_LIBS += \
+	wsock32.lib \
+	winmm.lib \
+	$(NULL)
+else
+
+# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
+EXTRA_LIBS += \
+	$(DIST)/lib/libsectool.$(LIB_SUFFIX) \
+	$(NULL)
+
+ifeq ($(OS_ARCH), AIX) 
+EXTRA_SHARED_LIBS += -brtl 
+endif
+
+# $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
+# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
+EXTRA_SHARED_LIBS += \
+	-L$(DIST)/lib/ \
+	-lnss3 \
+	-lssl3 \
+	-lsmime3 \
+	-lplc4 \
+	-lplds4 \
+	-lnspr4 \
+	$(NULL)
+endif
+
+endif

security/nss/cmd/sdrtest/manifest.mn

@@ -50,3 +50,5 @@ REQUIRES = dbm seccmd
 # So, look in the local Makefile for the defines for the list of libs.
 
 PROGRAM = sdrtest
+
+USE_STATIC_LIBS = 1

security/nss/cmd/signtool/manifest.mn

@@ -51,3 +51,5 @@ PROGRAM =  signtool
 REQUIRES = security dbm seccmd
 
 DEFINES += -DNSPR20
+
+USE_STATIC_LIBS = 1

security/nss/cmd/signver/manifest.mn

@@ -50,3 +50,5 @@ PACKAGE_FILES += signver
 endif
 
 ARCHIVE_NAME  = signver
+
+USE_STATIC_LIBS = 1

security/nss/cmd/swfort/instinit/manifest.mn

@@ -43,3 +43,4 @@ REQUIRES = security nspr dbm seccmd
 PROGRAM = instinit
 # PROGRAM = ./$(OBJDIR)/selfserv.exe
 
+USE_STATIC_LIBS = 1

security/nss/cmd/swfort/newuser/manifest.mn

@@ -42,3 +42,4 @@ REQUIRES = security nspr dbm seccmd
 
 PROGRAM = newuser
 
+USE_STATIC_LIBS = 1