mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bugzilla bug #54711: removed unused variables MOZ_DIST and MOZ_LIB 

from OS2.mk.  Handle the different names of plc4 and plds4 libraries
on OS/2.  Thanks to Huynh Trinh <hctrinh@us.ibm.com> for the patch.
Modified Files:
    coreconf/OS2.mk nss/lib/ckfw/builtins/Makefile
    nss/lib/fortcrypt/swfort/pkcs11/Makefile
This commit is contained in:
wtc%netscape.com 2000-10-03 00:58:18 +00:00
Родитель dbbe3df0aa
Коммит c5d8f4217a
3 изменённых файлов: 25 добавлений и 17 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
security/coreconf/OS2.mk
Просмотреть файл

@ -84,14 +84,6 @@ SHLIB_LDSTARTFILE =
SHLIB_LDENDFILE =
endif
# HCT Include from Mozilla client build.
INCLUDES = -I$(CORE_DEPTH)/../dist/include -I$(CORE_DEPTH)/../include
# This is where Mozilla Client build DIST & INCLUDE.
# while DIST is where Security build put it LIB & INCLUDE
MOZ_DIST = $(CORE_DEPTH)/../dist
MOZ_LIB = $(CORE_DEPTH)/../dist/lib
OS_CFLAGS = -Wall -W -Wno-unused -Wpointer-arith -Wcast-align -Zmtd -Zomf -Zmt -DDEBUG -DDEBUG_wintrinh -DTRACING -g
# Where the libraries are

18
security/nss/lib/ckfw/builtins/Makefile
Просмотреть файл

@ -30,7 +30,7 @@
# may use your version of this file under either the MPL or the
# GPL.
#
MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.3 $ $Date: 2000-09-09 03:41:11 $ $Name: $"
MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.4 $ $Date: 2000-10-03 00:58:17 $ $Name: $"
include manifest.mn
include $(CORE_DEPTH)/coreconf/config.mk
@ -54,11 +54,19 @@ else
#
ifneq ($(OS_ARCH), OSF1)
ifeq ($(OS_ARCH), OS2)
PLC_STATIC_LIB = $(DIST)/lib/plc4.$(LIB_SUFFIX)
PLDS_STATIC_LIB = $(DIST)/lib/plds4.$(LIB_SUFFIX)
else
PLC_STATIC_LIB = $(DIST)/lib/libplc4.$(LIB_SUFFIX)
PLDS_STATIC_LIB = $(DIST)/lib/libplds4.$(LIB_SUFFIX)
endif
EXTRA_LIBS += \
$(DIST)/lib/libnssckfw.a \
$(DIST)/lib/libnssb.a \
$(DIST)/lib/libplc4.a \
$(DIST)/lib/libplds4.a \
$(DIST)/lib/libnssckfw.$(LIB_SUFFIX) \
$(DIST)/lib/libnssb.$(LIB_SUFFIX) \
$(PLC_STATIC_LIB) \
$(PLDS_STATIC_LIB) \
$(NULL)
endif

16
security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
Просмотреть файл

@ -78,8 +78,16 @@ ifdef MOZILLA_SECURITY_BUILD
CRYPTO_LIB = $(DIST)/lib/libcrypto.$(LIB_SUFFIX)
endif
ifdef MOZILLA_BSAFE_BUILD
CRYPTO_LIB += $(DIST)/lib/libbsafe.a
CRYPTO_LIB += $(DIST)/lib/libfreebl.a
CRYPTO_LIB += $(DIST)/lib/libbsafe.$(LIB_SUFFIX)
CRYPTO_LIB += $(DIST)/lib/libfreebl.$(LIB_SUFFIX)
endif
ifeq ($(OS_ARCH), OS2)
PLC_STATIC_LIB = $(DIST)/lib/plc4.$(LIB_SUFFIX)
PLDS_STATIC_LIB = $(DIST)/lib/plds4.$(LIB_SUFFIX)
else
PLC_STATIC_LIB = $(DIST)/lib/libplc4.$(LIB_SUFFIX)
PLDS_STATIC_LIB = $(DIST)/lib/libplds4.$(LIB_SUFFIX)
endif
EXTRA_LIBS += \
@ -87,8 +95,8 @@ EXTRA_LIBS += \
$(DIST)/lib/libsoftoken.$(LIB_SUFFIX) \
$(CRYPTO_LIB) \
$(DIST)/lib/libsecutil.$(LIB_SUFFIX) \
$(DIST)/lib/libplc4.$(LIB_SUFFIX) \
$(DIST)/lib/libplds4.$(LIB_SUFFIX) \
$(PLC_STATIC_LIB) \
$(PLDS_STATIC_LIB) \
$(NULL)
endif