From fb9dfd69f31394532cb7271c1eb9c90fa5383b10 Mon Sep 17 00:00:00 2001 From: "wtc%netscape.com" Date: Fri, 2 Feb 2001 01:49:57 +0000 Subject: [PATCH] Bugzilla bug #63768: removed references to the obsolete PURE_LIBRARY, HAVE_PURIFY etc. make variables in NSS files. Reviewed by nelson Bolyard. Modified Files: cmd/platrules.mk cmd/crmf-cgi/config.mk cmd/crmftest/config.mk cmd/lib/config.mk cmd/zlib/config.mk lib/base/config.mk lib/certdb/config.mk lib/certhigh/config.mk lib/ckfw/config.mk lib/crmf/config.mk lib/cryptohi/config.mk lib/fortcrypt/swfort/config.mk lib/freebl/config.mk lib/jar/config.mk lib/nss/config.mk lib/pk11wrap/config.mk lib/pkcs12/config.mk lib/pkcs7/config.mk lib/smime/config.mk lib/softoken/config.mk lib/ssl/config.mk lib/util/config.mk --- security/nss/cmd/crmf-cgi/config.mk | 1 - security/nss/cmd/crmftest/config.mk | 1 - security/nss/cmd/lib/config.mk | 1 - security/nss/cmd/platrules.mk | 1 - security/nss/cmd/zlib/config.mk | 1 - security/nss/lib/base/config.mk | 3 +-- security/nss/lib/certdb/config.mk | 1 - security/nss/lib/certhigh/config.mk | 1 - security/nss/lib/ckfw/config.mk | 3 +-- security/nss/lib/crmf/config.mk | 1 - security/nss/lib/cryptohi/config.mk | 1 - security/nss/lib/fortcrypt/swfort/config.mk | 1 - security/nss/lib/freebl/config.mk | 5 +---- security/nss/lib/jar/config.mk | 1 - security/nss/lib/nss/config.mk | 1 - security/nss/lib/pk11wrap/config.mk | 1 - security/nss/lib/pkcs12/config.mk | 1 - security/nss/lib/pkcs7/config.mk | 1 - security/nss/lib/smime/config.mk | 1 - security/nss/lib/softoken/config.mk | 1 - security/nss/lib/ssl/config.mk | 1 - security/nss/lib/util/config.mk | 1 - 22 files changed, 3 insertions(+), 27 deletions(-) diff --git a/security/nss/cmd/crmf-cgi/config.mk b/security/nss/cmd/crmf-cgi/config.mk index 2b159a0248c..bcbaa28041b 100644 --- a/security/nss/cmd/crmf-cgi/config.mk +++ b/security/nss/cmd/crmf-cgi/config.mk @@ -40,6 +40,5 @@ TARGETS = $(PROGRAM) SHARED_LIBRARY = IMPORT_LIBRARY = -PURE_LIBRARY = LIBRARY = diff --git a/security/nss/cmd/crmftest/config.mk b/security/nss/cmd/crmftest/config.mk index 7dc65faacbd..7343609f809 100644 --- a/security/nss/cmd/crmftest/config.mk +++ b/security/nss/cmd/crmftest/config.mk @@ -39,6 +39,5 @@ TARGETS = $(PROGRAM) SHARED_LIBRARY = IMPORT_LIBRARY = -PURE_LIBRARY = LIBRARY = diff --git a/security/nss/cmd/lib/config.mk b/security/nss/cmd/lib/config.mk index a73a1086eee..0a00dc61e66 100644 --- a/security/nss/cmd/lib/config.mk +++ b/security/nss/cmd/lib/config.mk @@ -39,6 +39,5 @@ TARGETS = $(LIBRARY) SHARED_LIBRARY = IMPORT_LIBRARY = -PURE_LIBRARY = PROGRAM = diff --git a/security/nss/cmd/platrules.mk b/security/nss/cmd/platrules.mk index 5570b659b57..3e5c19933dc 100644 --- a/security/nss/cmd/platrules.mk +++ b/security/nss/cmd/platrules.mk @@ -40,7 +40,6 @@ show: @echo "OS_ARCH = $(OS_ARCH)" @echo "PROGRAM = >$(PROGRAM)<" @echo "PROGRAMS = $(PROGRAMS)" - @echo "PURE_LIBRARY = $(PURE_LIBRARY)" @echo "SHARED_LIBRARY = $(SHARED_LIBRARY)" @echo "TARGETS = >$(TARGETS)<" diff --git a/security/nss/cmd/zlib/config.mk b/security/nss/cmd/zlib/config.mk index 6e32dc6c912..090b93d70d1 100644 --- a/security/nss/cmd/zlib/config.mk +++ b/security/nss/cmd/zlib/config.mk @@ -39,7 +39,6 @@ TARGETS = $(LIBRARY) SHARED_LIBRARY = IMPORT_LIBRARY = -PURE_LIBRARY = PROGRAM = ####################################################################### diff --git a/security/nss/lib/base/config.mk b/security/nss/lib/base/config.mk index ea439645e6b..241c1bf1711 100644 --- a/security/nss/lib/base/config.mk +++ b/security/nss/lib/base/config.mk @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.2 $ $Date: 2000-09-06 22:11:57 $ $Name: $" +CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.3 $ $Date: 2001-02-02 01:49:22 $ $Name: $" ifdef BUILD_IDG DEFINES += -DNSSDEBUG @@ -44,6 +44,5 @@ endif TARGETS = $(LIBRARY) SHARED_LIBRARY = IMPORT_LIBRARY = -PURE_LIBRARY = PROGRAM = diff --git a/security/nss/lib/certdb/config.mk b/security/nss/lib/certdb/config.mk index a73a1086eee..0a00dc61e66 100644 --- a/security/nss/lib/certdb/config.mk +++ b/security/nss/lib/certdb/config.mk @@ -39,6 +39,5 @@ TARGETS = $(LIBRARY) SHARED_LIBRARY = IMPORT_LIBRARY = -PURE_LIBRARY = PROGRAM = diff --git a/security/nss/lib/certhigh/config.mk b/security/nss/lib/certhigh/config.mk index a73a1086eee..0a00dc61e66 100644 --- a/security/nss/lib/certhigh/config.mk +++ b/security/nss/lib/certhigh/config.mk @@ -39,6 +39,5 @@ TARGETS = $(LIBRARY) SHARED_LIBRARY = IMPORT_LIBRARY = -PURE_LIBRARY = PROGRAM = diff --git a/security/nss/lib/ckfw/config.mk b/security/nss/lib/ckfw/config.mk index 1102ece9dee..f698ebf51d5 100644 --- a/security/nss/lib/ckfw/config.mk +++ b/security/nss/lib/ckfw/config.mk @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.2 $ $Date: 2000-09-06 22:23:55 $ $Name: $" +CONFIG_CVS_ID = "@(#) $RCSfile: config.mk,v $ $Revision: 1.3 $ $Date: 2001-02-02 01:49:29 $ $Name: $" ifdef BUILD_IDG DEFINES += -DNSSDEBUG @@ -49,7 +49,6 @@ endif TARGETS = $(LIBRARY) SHARED_LIBRARY = IMPORT_LIBRARY = -PURE_LIBRARY = PROGRAM = diff --git a/security/nss/lib/crmf/config.mk b/security/nss/lib/crmf/config.mk index 1684cf3fa27..3b647d9547b 100644 --- a/security/nss/lib/crmf/config.mk +++ b/security/nss/lib/crmf/config.mk @@ -40,6 +40,5 @@ TARGETS = $(LIBRARY) SHARED_LIBRARY = IMPORT_LIBRARY = -PURE_LIBRARY = PROGRAM = diff --git a/security/nss/lib/cryptohi/config.mk b/security/nss/lib/cryptohi/config.mk index a73a1086eee..0a00dc61e66 100644 --- a/security/nss/lib/cryptohi/config.mk +++ b/security/nss/lib/cryptohi/config.mk @@ -39,6 +39,5 @@ TARGETS = $(LIBRARY) SHARED_LIBRARY = IMPORT_LIBRARY = -PURE_LIBRARY = PROGRAM = diff --git a/security/nss/lib/fortcrypt/swfort/config.mk b/security/nss/lib/fortcrypt/swfort/config.mk index a73a1086eee..0a00dc61e66 100644 --- a/security/nss/lib/fortcrypt/swfort/config.mk +++ b/security/nss/lib/fortcrypt/swfort/config.mk @@ -39,6 +39,5 @@ TARGETS = $(LIBRARY) SHARED_LIBRARY = IMPORT_LIBRARY = -PURE_LIBRARY = PROGRAM = diff --git a/security/nss/lib/freebl/config.mk b/security/nss/lib/freebl/config.mk index f8f454758dc..2783a98218d 100644 --- a/security/nss/lib/freebl/config.mk +++ b/security/nss/lib/freebl/config.mk @@ -68,14 +68,12 @@ endif # - (1) LIBRARY: a static (archival) library # - (2) SHARED_LIBRARY: a shared (dynamic link) library # - (3) IMPORT_LIBRARY: an import library, used only on Windows -# - (4) PURE_LIBRARY: a library for Purify -# - (5) PROGRAM: an executable binary +# - (4) PROGRAM: an executable binary # # override these variables to prevent building a DSO/DLL. TARGETS = $(LIBRARY) SHARED_LIBRARY = IMPORT_LIBRARY = - PURE_LIBRARY = PROGRAM = else @@ -83,7 +81,6 @@ else TARGETS = $(SHARED_LIBRARY) LIBRARY = -PURE_LIBRARY = PROGRAM = #ifeq ($(OS_ARCH), HP-UX) diff --git a/security/nss/lib/jar/config.mk b/security/nss/lib/jar/config.mk index a73a1086eee..0a00dc61e66 100644 --- a/security/nss/lib/jar/config.mk +++ b/security/nss/lib/jar/config.mk @@ -39,6 +39,5 @@ TARGETS = $(LIBRARY) SHARED_LIBRARY = IMPORT_LIBRARY = -PURE_LIBRARY = PROGRAM = diff --git a/security/nss/lib/nss/config.mk b/security/nss/lib/nss/config.mk index 65a18869039..aa35a37752e 100644 --- a/security/nss/lib/nss/config.mk +++ b/security/nss/lib/nss/config.mk @@ -39,7 +39,6 @@ #TARGETS = $(LIBRARY) #SHARED_LIBRARY = #IMPORT_LIBRARY = -#PURE_LIBRARY = #PROGRAM = # can't do this in manifest.mn because OS_ARCH isn't defined there. diff --git a/security/nss/lib/pk11wrap/config.mk b/security/nss/lib/pk11wrap/config.mk index a73a1086eee..0a00dc61e66 100644 --- a/security/nss/lib/pk11wrap/config.mk +++ b/security/nss/lib/pk11wrap/config.mk @@ -39,6 +39,5 @@ TARGETS = $(LIBRARY) SHARED_LIBRARY = IMPORT_LIBRARY = -PURE_LIBRARY = PROGRAM = diff --git a/security/nss/lib/pkcs12/config.mk b/security/nss/lib/pkcs12/config.mk index 1684cf3fa27..3b647d9547b 100644 --- a/security/nss/lib/pkcs12/config.mk +++ b/security/nss/lib/pkcs12/config.mk @@ -40,6 +40,5 @@ TARGETS = $(LIBRARY) SHARED_LIBRARY = IMPORT_LIBRARY = -PURE_LIBRARY = PROGRAM = diff --git a/security/nss/lib/pkcs7/config.mk b/security/nss/lib/pkcs7/config.mk index a1e0dfae058..ec34728f99e 100644 --- a/security/nss/lib/pkcs7/config.mk +++ b/security/nss/lib/pkcs7/config.mk @@ -39,5 +39,4 @@ TARGETS = $(LIBRARY) SHARED_LIBRARY = IMPORT_LIBRARY = -PURE_LIBRARY = PROGRAM = diff --git a/security/nss/lib/smime/config.mk b/security/nss/lib/smime/config.mk index 090f3613859..2d483a78929 100644 --- a/security/nss/lib/smime/config.mk +++ b/security/nss/lib/smime/config.mk @@ -39,7 +39,6 @@ #TARGETS = $(LIBRARY) #SHARED_LIBRARY = #IMPORT_LIBRARY = -#PURE_LIBRARY = #PROGRAM = RELEASE_LIBS = $(TARGETS) diff --git a/security/nss/lib/softoken/config.mk b/security/nss/lib/softoken/config.mk index a73a1086eee..0a00dc61e66 100644 --- a/security/nss/lib/softoken/config.mk +++ b/security/nss/lib/softoken/config.mk @@ -39,6 +39,5 @@ TARGETS = $(LIBRARY) SHARED_LIBRARY = IMPORT_LIBRARY = -PURE_LIBRARY = PROGRAM = diff --git a/security/nss/lib/ssl/config.mk b/security/nss/lib/ssl/config.mk index 18968067d5d..5fffdaa724f 100644 --- a/security/nss/lib/ssl/config.mk +++ b/security/nss/lib/ssl/config.mk @@ -39,7 +39,6 @@ #TARGETS = $(LIBRARY) #SHARED_LIBRARY = #IMPORT_LIBRARY = -#PURE_LIBRARY = #PROGRAM = ifeq ($(OS_ARCH), WINNT) diff --git a/security/nss/lib/util/config.mk b/security/nss/lib/util/config.mk index a73a1086eee..0a00dc61e66 100644 --- a/security/nss/lib/util/config.mk +++ b/security/nss/lib/util/config.mk @@ -39,6 +39,5 @@ TARGETS = $(LIBRARY) SHARED_LIBRARY = IMPORT_LIBRARY = -PURE_LIBRARY = PROGRAM =