From 3a439412745839ee1a509a2a5dd9a6a3e88dce7d Mon Sep 17 00:00:00 2001 From: "wtc%netscape.com" Date: Fri, 2 Feb 2001 02:34:26 +0000 Subject: [PATCH] Bugzilla bug #63768: removed references to obsolete make variables HAVE_PURIFY and PURE_LIBRARY in JSS files. Reviewed by James Nicolson. Modified files: jss/config/libnames.mk, jss/lib/config.mk, jss/lib/rules.mk --- security/jss/config/libnames.mk | 5 ----- security/jss/lib/config.mk | 2 -- security/jss/lib/rules.mk | 8 -------- 3 files changed, 15 deletions(-) diff --git a/security/jss/config/libnames.mk b/security/jss/config/libnames.mk index d460bd882fd..02fef2ca53d 100644 --- a/security/jss/config/libnames.mk +++ b/security/jss/config/libnames.mk @@ -223,11 +223,6 @@ ifndef BUILD_OPT else SHARED_LIBRARY_G = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_g.$(DLL_SUFFIX) endif - ifdef HAVE_PURIFY - ifdef DSO_BACKEND - PURE_LIBRARY_G = $(OBJDIR)/purelib$(LIBRARY_NAME)$(LIBRARY_VERSION)_g.$(DLL_SUFFIX) - endif - endif endif endif endif diff --git a/security/jss/lib/config.mk b/security/jss/lib/config.mk index 131c0c9b4ca..64d40515ce6 100644 --- a/security/jss/lib/config.mk +++ b/security/jss/lib/config.mk @@ -37,7 +37,6 @@ # We don't need static, import, or purify libraries LIBRARY= IMPORT_LIBRARY= -PURE_LIBRARY= # Get rid of embedded "32" in library names on Windows ifeq ($(OS_ARCH),WINNT) @@ -56,7 +55,6 @@ endif # Only used for "sanitizing" the release STATIC_LIB_EXTENSION= DYNAMIC_LIB_EXTENSION= -PURE_LIB_EXTENSION= # Include "funky" link path to pick up ALL native libraries for OSF/1. ifeq ($(OS_ARCH), OSF1) diff --git a/security/jss/lib/rules.mk b/security/jss/lib/rules.mk index 1a61aaac2cd..ad6732759d1 100644 --- a/security/jss/lib/rules.mk +++ b/security/jss/lib/rules.mk @@ -49,12 +49,4 @@ ifeq ($(OS_ARCH),WINNT) -rm $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)/$(IMPORT_LIB_PREFIX)jsspolicy$(IMPORT_LIB_EXTENSION)$(IMPORT_LIB_SUFFIX) -rm $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)/$(IMPORT_LIB_PREFIX)jssssl$(IMPORT_LIB_EXTENSION)$(IMPORT_LIB_SUFFIX) -rm $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)/$(IMPORT_LIB_PREFIX)jssutil$(IMPORT_LIB_EXTENSION)$(IMPORT_LIB_SUFFIX) -else - -rm $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)/$(PURE_LIB_PREFIX)jsscrypto$(PURE_LIB_EXTENSION)$(PURE_LIB_SUFFIX) - -rm $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)/$(PURE_LIB_PREFIX)jsshclhacks$(PURE_LIB_EXTENSION)$(PURE_LIB_SUFFIX) - -rm $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)/$(PURE_LIB_PREFIX)jssmanage$(PURE_LIB_EXTENSION)$(PURE_LIB_SUFFIX) - -rm $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)/$(PURE_LIB_PREFIX)jsspkcs11$(PURE_LIB_EXTENSION)$(PURE_LIB_SUFFIX) - -rm $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)/$(PURE_LIB_PREFIX)jsspolicy$(PURE_LIB_EXTENSION)$(PURE_LIB_SUFFIX) - -rm $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)/$(PURE_LIB_PREFIX)jssssl$(PURE_LIB_EXTENSION)$(PURE_LIB_SUFFIX) - -rm $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR)/$(PURE_LIB_PREFIX)jssutil$(PURE_LIB_EXTENSION)$(PURE_LIB_SUFFIX) endif