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
This commit is contained in:
Родитель
397a9563f5
Коммит
fb9dfd69f3
|
@ -40,6 +40,5 @@
|
||||||
TARGETS = $(PROGRAM)
|
TARGETS = $(PROGRAM)
|
||||||
SHARED_LIBRARY =
|
SHARED_LIBRARY =
|
||||||
IMPORT_LIBRARY =
|
IMPORT_LIBRARY =
|
||||||
PURE_LIBRARY =
|
|
||||||
LIBRARY =
|
LIBRARY =
|
||||||
|
|
||||||
|
|
|
@ -39,6 +39,5 @@
|
||||||
TARGETS = $(PROGRAM)
|
TARGETS = $(PROGRAM)
|
||||||
SHARED_LIBRARY =
|
SHARED_LIBRARY =
|
||||||
IMPORT_LIBRARY =
|
IMPORT_LIBRARY =
|
||||||
PURE_LIBRARY =
|
|
||||||
LIBRARY =
|
LIBRARY =
|
||||||
|
|
||||||
|
|
|
@ -39,6 +39,5 @@
|
||||||
TARGETS = $(LIBRARY)
|
TARGETS = $(LIBRARY)
|
||||||
SHARED_LIBRARY =
|
SHARED_LIBRARY =
|
||||||
IMPORT_LIBRARY =
|
IMPORT_LIBRARY =
|
||||||
PURE_LIBRARY =
|
|
||||||
PROGRAM =
|
PROGRAM =
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,6 @@ show:
|
||||||
@echo "OS_ARCH = $(OS_ARCH)"
|
@echo "OS_ARCH = $(OS_ARCH)"
|
||||||
@echo "PROGRAM = >$(PROGRAM)<"
|
@echo "PROGRAM = >$(PROGRAM)<"
|
||||||
@echo "PROGRAMS = $(PROGRAMS)"
|
@echo "PROGRAMS = $(PROGRAMS)"
|
||||||
@echo "PURE_LIBRARY = $(PURE_LIBRARY)"
|
|
||||||
@echo "SHARED_LIBRARY = $(SHARED_LIBRARY)"
|
@echo "SHARED_LIBRARY = $(SHARED_LIBRARY)"
|
||||||
@echo "TARGETS = >$(TARGETS)<"
|
@echo "TARGETS = >$(TARGETS)<"
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,6 @@
|
||||||
TARGETS = $(LIBRARY)
|
TARGETS = $(LIBRARY)
|
||||||
SHARED_LIBRARY =
|
SHARED_LIBRARY =
|
||||||
IMPORT_LIBRARY =
|
IMPORT_LIBRARY =
|
||||||
PURE_LIBRARY =
|
|
||||||
PROGRAM =
|
PROGRAM =
|
||||||
|
|
||||||
#######################################################################
|
#######################################################################
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
# may use your version of this file under either the MPL or the
|
# may use your version of this file under either the MPL or the
|
||||||
# GPL.
|
# 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
|
ifdef BUILD_IDG
|
||||||
DEFINES += -DNSSDEBUG
|
DEFINES += -DNSSDEBUG
|
||||||
|
@ -44,6 +44,5 @@ endif
|
||||||
TARGETS = $(LIBRARY)
|
TARGETS = $(LIBRARY)
|
||||||
SHARED_LIBRARY =
|
SHARED_LIBRARY =
|
||||||
IMPORT_LIBRARY =
|
IMPORT_LIBRARY =
|
||||||
PURE_LIBRARY =
|
|
||||||
PROGRAM =
|
PROGRAM =
|
||||||
|
|
||||||
|
|
|
@ -39,6 +39,5 @@
|
||||||
TARGETS = $(LIBRARY)
|
TARGETS = $(LIBRARY)
|
||||||
SHARED_LIBRARY =
|
SHARED_LIBRARY =
|
||||||
IMPORT_LIBRARY =
|
IMPORT_LIBRARY =
|
||||||
PURE_LIBRARY =
|
|
||||||
PROGRAM =
|
PROGRAM =
|
||||||
|
|
||||||
|
|
|
@ -39,6 +39,5 @@
|
||||||
TARGETS = $(LIBRARY)
|
TARGETS = $(LIBRARY)
|
||||||
SHARED_LIBRARY =
|
SHARED_LIBRARY =
|
||||||
IMPORT_LIBRARY =
|
IMPORT_LIBRARY =
|
||||||
PURE_LIBRARY =
|
|
||||||
PROGRAM =
|
PROGRAM =
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
# may use your version of this file under either the MPL or the
|
# may use your version of this file under either the MPL or the
|
||||||
# GPL.
|
# 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
|
ifdef BUILD_IDG
|
||||||
DEFINES += -DNSSDEBUG
|
DEFINES += -DNSSDEBUG
|
||||||
|
@ -49,7 +49,6 @@ endif
|
||||||
TARGETS = $(LIBRARY)
|
TARGETS = $(LIBRARY)
|
||||||
SHARED_LIBRARY =
|
SHARED_LIBRARY =
|
||||||
IMPORT_LIBRARY =
|
IMPORT_LIBRARY =
|
||||||
PURE_LIBRARY =
|
|
||||||
PROGRAM =
|
PROGRAM =
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -40,6 +40,5 @@
|
||||||
TARGETS = $(LIBRARY)
|
TARGETS = $(LIBRARY)
|
||||||
SHARED_LIBRARY =
|
SHARED_LIBRARY =
|
||||||
IMPORT_LIBRARY =
|
IMPORT_LIBRARY =
|
||||||
PURE_LIBRARY =
|
|
||||||
PROGRAM =
|
PROGRAM =
|
||||||
|
|
||||||
|
|
|
@ -39,6 +39,5 @@
|
||||||
TARGETS = $(LIBRARY)
|
TARGETS = $(LIBRARY)
|
||||||
SHARED_LIBRARY =
|
SHARED_LIBRARY =
|
||||||
IMPORT_LIBRARY =
|
IMPORT_LIBRARY =
|
||||||
PURE_LIBRARY =
|
|
||||||
PROGRAM =
|
PROGRAM =
|
||||||
|
|
||||||
|
|
|
@ -39,6 +39,5 @@
|
||||||
TARGETS = $(LIBRARY)
|
TARGETS = $(LIBRARY)
|
||||||
SHARED_LIBRARY =
|
SHARED_LIBRARY =
|
||||||
IMPORT_LIBRARY =
|
IMPORT_LIBRARY =
|
||||||
PURE_LIBRARY =
|
|
||||||
PROGRAM =
|
PROGRAM =
|
||||||
|
|
||||||
|
|
|
@ -68,14 +68,12 @@ endif
|
||||||
# - (1) LIBRARY: a static (archival) library
|
# - (1) LIBRARY: a static (archival) library
|
||||||
# - (2) SHARED_LIBRARY: a shared (dynamic link) library
|
# - (2) SHARED_LIBRARY: a shared (dynamic link) library
|
||||||
# - (3) IMPORT_LIBRARY: an import library, used only on Windows
|
# - (3) IMPORT_LIBRARY: an import library, used only on Windows
|
||||||
# - (4) PURE_LIBRARY: a library for Purify
|
# - (4) PROGRAM: an executable binary
|
||||||
# - (5) PROGRAM: an executable binary
|
|
||||||
#
|
#
|
||||||
# override these variables to prevent building a DSO/DLL.
|
# override these variables to prevent building a DSO/DLL.
|
||||||
TARGETS = $(LIBRARY)
|
TARGETS = $(LIBRARY)
|
||||||
SHARED_LIBRARY =
|
SHARED_LIBRARY =
|
||||||
IMPORT_LIBRARY =
|
IMPORT_LIBRARY =
|
||||||
PURE_LIBRARY =
|
|
||||||
PROGRAM =
|
PROGRAM =
|
||||||
|
|
||||||
else
|
else
|
||||||
|
@ -83,7 +81,6 @@ else
|
||||||
|
|
||||||
TARGETS = $(SHARED_LIBRARY)
|
TARGETS = $(SHARED_LIBRARY)
|
||||||
LIBRARY =
|
LIBRARY =
|
||||||
PURE_LIBRARY =
|
|
||||||
PROGRAM =
|
PROGRAM =
|
||||||
|
|
||||||
#ifeq ($(OS_ARCH), HP-UX)
|
#ifeq ($(OS_ARCH), HP-UX)
|
||||||
|
|
|
@ -39,6 +39,5 @@
|
||||||
TARGETS = $(LIBRARY)
|
TARGETS = $(LIBRARY)
|
||||||
SHARED_LIBRARY =
|
SHARED_LIBRARY =
|
||||||
IMPORT_LIBRARY =
|
IMPORT_LIBRARY =
|
||||||
PURE_LIBRARY =
|
|
||||||
PROGRAM =
|
PROGRAM =
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,6 @@
|
||||||
#TARGETS = $(LIBRARY)
|
#TARGETS = $(LIBRARY)
|
||||||
#SHARED_LIBRARY =
|
#SHARED_LIBRARY =
|
||||||
#IMPORT_LIBRARY =
|
#IMPORT_LIBRARY =
|
||||||
#PURE_LIBRARY =
|
|
||||||
#PROGRAM =
|
#PROGRAM =
|
||||||
|
|
||||||
# can't do this in manifest.mn because OS_ARCH isn't defined there.
|
# can't do this in manifest.mn because OS_ARCH isn't defined there.
|
||||||
|
|
|
@ -39,6 +39,5 @@
|
||||||
TARGETS = $(LIBRARY)
|
TARGETS = $(LIBRARY)
|
||||||
SHARED_LIBRARY =
|
SHARED_LIBRARY =
|
||||||
IMPORT_LIBRARY =
|
IMPORT_LIBRARY =
|
||||||
PURE_LIBRARY =
|
|
||||||
PROGRAM =
|
PROGRAM =
|
||||||
|
|
||||||
|
|
|
@ -40,6 +40,5 @@
|
||||||
TARGETS = $(LIBRARY)
|
TARGETS = $(LIBRARY)
|
||||||
SHARED_LIBRARY =
|
SHARED_LIBRARY =
|
||||||
IMPORT_LIBRARY =
|
IMPORT_LIBRARY =
|
||||||
PURE_LIBRARY =
|
|
||||||
PROGRAM =
|
PROGRAM =
|
||||||
|
|
||||||
|
|
|
@ -39,5 +39,4 @@
|
||||||
TARGETS = $(LIBRARY)
|
TARGETS = $(LIBRARY)
|
||||||
SHARED_LIBRARY =
|
SHARED_LIBRARY =
|
||||||
IMPORT_LIBRARY =
|
IMPORT_LIBRARY =
|
||||||
PURE_LIBRARY =
|
|
||||||
PROGRAM =
|
PROGRAM =
|
||||||
|
|
|
@ -39,7 +39,6 @@
|
||||||
#TARGETS = $(LIBRARY)
|
#TARGETS = $(LIBRARY)
|
||||||
#SHARED_LIBRARY =
|
#SHARED_LIBRARY =
|
||||||
#IMPORT_LIBRARY =
|
#IMPORT_LIBRARY =
|
||||||
#PURE_LIBRARY =
|
|
||||||
#PROGRAM =
|
#PROGRAM =
|
||||||
|
|
||||||
RELEASE_LIBS = $(TARGETS)
|
RELEASE_LIBS = $(TARGETS)
|
||||||
|
|
|
@ -39,6 +39,5 @@
|
||||||
TARGETS = $(LIBRARY)
|
TARGETS = $(LIBRARY)
|
||||||
SHARED_LIBRARY =
|
SHARED_LIBRARY =
|
||||||
IMPORT_LIBRARY =
|
IMPORT_LIBRARY =
|
||||||
PURE_LIBRARY =
|
|
||||||
PROGRAM =
|
PROGRAM =
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,6 @@
|
||||||
#TARGETS = $(LIBRARY)
|
#TARGETS = $(LIBRARY)
|
||||||
#SHARED_LIBRARY =
|
#SHARED_LIBRARY =
|
||||||
#IMPORT_LIBRARY =
|
#IMPORT_LIBRARY =
|
||||||
#PURE_LIBRARY =
|
|
||||||
#PROGRAM =
|
#PROGRAM =
|
||||||
|
|
||||||
ifeq ($(OS_ARCH), WINNT)
|
ifeq ($(OS_ARCH), WINNT)
|
||||||
|
|
|
@ -39,6 +39,5 @@
|
||||||
TARGETS = $(LIBRARY)
|
TARGETS = $(LIBRARY)
|
||||||
SHARED_LIBRARY =
|
SHARED_LIBRARY =
|
||||||
IMPORT_LIBRARY =
|
IMPORT_LIBRARY =
|
||||||
PURE_LIBRARY =
|
|
||||||
PROGRAM =
|
PROGRAM =
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче