зеркало из https://github.com/mozilla/pjs.git
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
This commit is contained in:
Родитель
ebd4fb290f
Коммит
3a43941274
|
@ -223,11 +223,6 @@ ifndef BUILD_OPT
|
||||||
else
|
else
|
||||||
SHARED_LIBRARY_G = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_g.$(DLL_SUFFIX)
|
SHARED_LIBRARY_G = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_g.$(DLL_SUFFIX)
|
||||||
endif
|
endif
|
||||||
ifdef HAVE_PURIFY
|
|
||||||
ifdef DSO_BACKEND
|
|
||||||
PURE_LIBRARY_G = $(OBJDIR)/purelib$(LIBRARY_NAME)$(LIBRARY_VERSION)_g.$(DLL_SUFFIX)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -37,7 +37,6 @@
|
||||||
# We don't need static, import, or purify libraries
|
# We don't need static, import, or purify libraries
|
||||||
LIBRARY=
|
LIBRARY=
|
||||||
IMPORT_LIBRARY=
|
IMPORT_LIBRARY=
|
||||||
PURE_LIBRARY=
|
|
||||||
|
|
||||||
# Get rid of embedded "32" in library names on Windows
|
# Get rid of embedded "32" in library names on Windows
|
||||||
ifeq ($(OS_ARCH),WINNT)
|
ifeq ($(OS_ARCH),WINNT)
|
||||||
|
@ -56,7 +55,6 @@ endif
|
||||||
# Only used for "sanitizing" the release
|
# Only used for "sanitizing" the release
|
||||||
STATIC_LIB_EXTENSION=
|
STATIC_LIB_EXTENSION=
|
||||||
DYNAMIC_LIB_EXTENSION=
|
DYNAMIC_LIB_EXTENSION=
|
||||||
PURE_LIB_EXTENSION=
|
|
||||||
|
|
||||||
# Include "funky" link path to pick up ALL native libraries for OSF/1.
|
# Include "funky" link path to pick up ALL native libraries for OSF/1.
|
||||||
ifeq ($(OS_ARCH), OSF1)
|
ifeq ($(OS_ARCH), OSF1)
|
||||||
|
|
|
@ -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)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)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)
|
-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
|
endif
|
||||||
|
|
Загрузка…
Ссылка в новой задаче