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

Merged NSPRPUB_CLIENT_BRANCH onto the trunk.

This commit is contained in:
wtc%netscape.com 2001-05-12 04:47:05 +00:00
Родитель bc9b0a44d0
Коммит 69cd646c07
6 изменённых файлов: 10 добавлений и 500 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

269
nsprpub/pr/src/md/unix/Makefile.in
Просмотреть файл

@ -41,17 +41,6 @@ include $(MOD_DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk
ifndef USE_AUTOCONF
# Disable optimization of the nspr on SunOS4.1.3
ifeq ($(OS_ARCH),SunOS)
ifeq ($(OS_RELEASE),4.1.3_U1)
OPTIMIZER =
endif
endif
endif # ! USE_AUTOCONF
CSRCS = \ CSRCS = \
unix.c \ unix.c \
unix_errors.c \ unix_errors.c \
@ -69,244 +58,16 @@ ifeq ($(PTHREADS_USER),1)
CSRCS += pthreads_user.c CSRCS += pthreads_user.c
endif endif
ifndef USE_AUTOCONF CSRCS += $(PR_MD_CSRCS)
ASFILES += $(PR_MD_ASFILES)
IRIX_CSRCS = \ TARGETS = $(OBJS)
irix.c \
$(NULL)
SUNOS4_CSRCS = \
sunos4.c \
$(NULL)
SOLARIS_CSRCS = \
solaris.c \
$(NULL)
AIX_CSRCS = \
aix.c \
$(NULL)
FREEBSD_CSRCS = \
freebsd.c \
$(NULL)
NETBSD_CSRCS = \
netbsd.c \
$(NULL)
OPENBSD_CSRCS = \
openbsd.c \
$(NULL)
BSDI_CSRCS = \
bsdi.c \
$(NULL)
HPUX_CSRCS = \
hpux.c \
$(NULL)
OPENVMS_CSRCS = \
openvms.c \
$(NULL)
OSF1_CSRCS = \
osf1.c \
$(NULL)
LINUX_CSRCS = \
linux.c \
$(NULL)
UNIXWARE_CSRCS = \
unixware.c \
$(NULL)
RELIANTUNIX_CSRCS = \
reliantunix.c \
$(NULL)
RHAPSODY_CSRCS = \
rhapsody.c \
$(NULL)
NEXTSTEP_CSRCS = \
nextstep.c \
$(NULL)
NEC_CSRCS = \
nec.c \
$(NULL)
SONY_CSRCS = \
sony.c \
$(NULL)
NCR_CSRCS = \
ncr.c \
$(NULL)
SCOOS_CSRCS = \
scoos.c \
$(NULL)
DGUX_CSRCS = \
dgux.c \
$(NULL)
QNX_CSRCS = \
qnx.c \
$(NULL)
NTO_CSRCS = \
nto.c \
$(NULL)
ifeq ($(OS_ARCH),IRIX)
CSRCS += $(IRIX_CSRCS)
endif
ifeq ($(OS_ARCH),SunOS)
ifeq ($(OS_RELEASE),4.1.3_U1)
CSRCS += $(SUNOS4_CSRCS)
else
CSRCS += $(SOLARIS_CSRCS)
endif
endif
ifeq ($(OS_ARCH),AIX)
CSRCS += $(AIX_CSRCS)
endif
ifeq ($(OS_ARCH),FreeBSD)
CSRCS += $(FREEBSD_CSRCS)
endif
ifeq ($(OS_ARCH),NetBSD)
CSRCS += $(NETBSD_CSRCS)
endif
ifeq ($(OS_ARCH),OpenBSD)
CSRCS += $(OPENBSD_CSRCS)
endif
ifeq ($(OS_ARCH),BSD_OS)
CSRCS += $(BSDI_CSRCS)
endif
ifeq ($(OS_ARCH),HP-UX)
CSRCS += $(HPUX_CSRCS)
endif
ifeq ($(OS_ARCH),OpenVMS)
CSRCS += $(OPENVMS_CSRCS)
endif
ifeq ($(OS_ARCH),OSF1)
CSRCS += $(OSF1_CSRCS)
endif
ifeq ($(OS_ARCH),Linux)
CSRCS += $(LINUX_CSRCS)
endif
ifeq ($(OS_ARCH),UNIXWARE)
CSRCS += $(UNIXWARE_CSRCS)
endif
ifeq ($(OS_ARCH),SINIX)
CSRCS += $(RELIANTUNIX_CSRCS)
endif
ifeq ($(OS_ARCH),Rhapsody)
CSRCS += $(RHAPSODY_CSRCS)
endif
ifeq ($(OS_ARCH),NEXTSTEP)
CSRCS += $(NEXTSTEP_CSRCS)
endif
ifeq ($(OS_ARCH),NEC)
CSRCS += $(NEC_CSRCS)
endif
ifeq ($(OS_ARCH),NEWS-OS)
CSRCS += $(SONY_CSRCS)
endif
ifeq ($(OS_ARCH),NCR)
CSRCS += $(NCR_CSRCS)
endif
ifeq ($(OS_ARCH),SCOOS)
CSRCS += $(SCOOS_CSRCS)
endif
ifeq ($(OS_ARCH),DGUX)
CSRCS += $(DGUX_CSRCS)
endif
ifeq ($(OS_ARCH),NTO)
CSRCS += $(NTO_CSRCS)
endif
ifeq ($(OS_ARCH),QNX)
ifeq ($(OS_TARGET),NTO)
CSRCS += $(NTO_CSRCS)
else
CSRCS += $(QNX_CSRCS)
endif
endif
#
# Some Unix platforms have an assembly language file.
# E.g., AIX 3.2, Solaris (both sparc and x86).
#
ifeq ($(OS_ARCH), AIX)
ifeq ($(OS_RELEASE), 3.2)
ASFILES = os_$(OS_ARCH).s
endif
endif
ifeq ($(OS_ARCH),SunOS)
ifneq ($(OS_RELEASE),4.1.3_U1)
ifneq ($(LOCAL_THREADS_ONLY),1)
ifeq ($(CPU_ARCH),x86)
ASFILES = os_$(OS_ARCH)_x86.s
else
ASFILES = os_$(OS_ARCH).s
ifneq ($(USE_64),1)
ASFILES += os_$(OS_ARCH)_32.s
endif
endif
endif
endif
endif
ifeq ($(OS_ARCH),Linux)
ifeq ($(CPU_ARCH),x86)
ASFILES = os_Linux_x86.s
endif
ifeq ($(CPU_ARCH),ia64)
ASFILES = os_Linux_ia64.s
endif
endif
ifeq ($(OS_ARCH), SINIX)
ifeq ($(CPU_ARCH),mips)
ASFILES = os_ReliantUNIX.s
endif
endif
ifeq ($(OS_ARCH)$(OS_RELEASE),BSD_OS2.1)
ASFILES = os_BSD_386_2.s
endif
ifeq ($(OS_ARCH), IRIX)
ASFILES = os_Irix.s
endif
ifeq ($(OS_ARCH), HP-UX)
ASFILES = os_HPUX.s
endif
TARGETS = $(OBJS)
ifeq ($(OS_ARCH),AIX)
ifeq (,$(filter-out 3.2 4.1,$(OS_RELEASE)))
ifneq ($(USE_PTHREADS), 1)
#TARGETS += $(OBJDIR)/aixwrap.$(OBJ_SUFFIX)
endif
endif
endif
ifeq ($(OS_ARCH),SunOS) ifeq ($(OS_ARCH),SunOS)
ifneq ($(OS_RELEASE),4.1.3_U1) ifneq ($(OS_RELEASE),4.1.3_U1)
ifeq ($(OS_TEST),sun4u) ifeq ($(OS_TEST),sun4u)
LIBRARY_NAME = $(ULTRASPARC_LIBRARY) LIBRARY_NAME = $(ULTRASPARC_LIBRARY)
LIBRARY_VERSION = $(MOD_VERSION) LIBRARY_VERSION = $(MOD_MAJOR_VERSION)
ULTRASPARC_ASFILES = os_$(OS_ARCH)_ultrasparc.s ULTRASPARC_ASFILES = os_$(OS_ARCH)_ultrasparc.s
ULTRASPARC_ASOBJS = $(addprefix $(OBJDIR)/,$(ULTRASPARC_ASFILES:.s=.$(OBJ_SUFFIX))) ULTRASPARC_ASOBJS = $(addprefix $(OBJDIR)/,$(ULTRASPARC_ASFILES:.s=.$(OBJ_SUFFIX)))
TARGETS += $(ULTRASPARC_ASOBJS) $(SHARED_LIBRARY) TARGETS += $(ULTRASPARC_ASOBJS) $(SHARED_LIBRARY)
@ -315,37 +76,20 @@ ifeq ($(OS_ARCH),SunOS)
endif endif
endif endif
else # USE_AUTOCONF INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
CSRCS += $(PR_MD_CSRCS)
ASFILES += $(PR_MD_ASFILES)
TARGETS = $(OBJS)
endif # ! USE_AUTOCONF
INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_ DEFINES += -D_NSPR_BUILD_
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
export:: $(TARGETS) export:: $(TARGETS)
#ifeq ($(OS_ARCH),AIX)
#ifeq (,$(filter-out 3.2 4.1,$(OS_RELEASE)))
#ifneq ($(USE_PTHREADS), 1)
# $(INSTALL) -m 444 $(OBJDIR)/aixwrap.$(OBJ_SUFFIX) $(libdir)
#endif
#endif
#endif
ifndef USE_AUTOCONF
ifeq ($(OS_ARCH),SunOS) ifeq ($(OS_ARCH),SunOS)
ifneq ($(OS_RELEASE),4.1.3_U1) ifneq ($(OS_RELEASE),4.1.3_U1)
ifeq ($(OS_TEST),sun4u) ifeq ($(OS_TEST),sun4u)
$(SHARED_LIBRARY): $(ULTRASPARC_ASOBJS) $(SHARED_LIBRARY): $(ULTRASPARC_ASOBJS)
$(LD) -G -z text -o $@ $(ULTRASPARC_ASOBJS) $(LD) -G -z text -o $@ $(ULTRASPARC_ASOBJS)
$(INSTALL) -m 444 $(SHARED_LIBRARY) $(libdir) $(INSTALL) -m 444 $(SHARED_LIBRARY) $(dist_libdir)
$(ULTRASPARC_ASOBJS): $(ULTRASPARC_ASFILES) $(ULTRASPARC_ASOBJS): $(ULTRASPARC_ASFILES)
ifeq ($(USE_64),1) ifeq ($(USE_64),1)
@ -359,4 +103,3 @@ clean::
endif endif
endif endif
endif endif
endif #!USE_AUTOCONF

226
nsprpub/pr/src/md/unix/objs.mk
Просмотреть файл

@ -51,235 +51,9 @@ ifeq ($(PTHREADS_USER),1)
CSRCS += pthreads_user.c CSRCS += pthreads_user.c
endif endif
ifdef USE_AUTOCONF
CSRCS += $(PR_MD_CSRCS) CSRCS += $(PR_MD_CSRCS)
ASFILES += $(PR_MD_ASFILES) ASFILES += $(PR_MD_ASFILES)
else # ! USE_AUTOCONF
IRIX_CSRCS = \
irix.c \
$(NULL)
SUNOS4_CSRCS = \
sunos4.c \
$(NULL)
SOLARIS_CSRCS = \
solaris.c \
$(NULL)
AIX_CSRCS = \
aix.c \
$(NULL)
FREEBSD_CSRCS = \
freebsd.c \
$(NULL)
NETBSD_CSRCS = \
netbsd.c \
$(NULL)
OPENBSD_CSRCS = \
openbsd.c \
$(NULL)
BSDI_CSRCS = \
bsdi.c \
$(NULL)
HPUX_CSRCS = \
hpux.c \
$(NULL)
OSF1_CSRCS = \
osf1.c \
$(NULL)
OPENVMS_CSRCS = \
openvms.c \
$(NULL)
LINUX_CSRCS = \
linux.c \
$(NULL)
UNIXWARE_CSRCS = \
unixware.c \
$(NULL)
RELIANTUNIX_CSRCS = \
reliantunix.c \
$(NULL)
RHAPSODY_CSRCS = \
rhapsody.c \
$(NULL)
NEXTSTEP_CSRCS = \
nextstep.c \
$(NULL)
NEC_CSRCS = \
nec.c \
$(NULL)
SONY_CSRCS = \
sony.c \
$(NULL)
NCR_CSRCS = \
ncr.c \
$(NULL)
SCOOS_CSRCS = \
scoos.c \
$(NULL)
DGUX_CSRCS = \
dgux.c \
$(NULL)
QNX_CSRCS = \
qnx.c \
$(NULL)
NTO_CSRCS = \
nto.c \
$(NULL)
ifeq ($(OS_ARCH),IRIX)
CSRCS += $(IRIX_CSRCS)
endif
ifeq ($(OS_ARCH),SunOS)
ifeq ($(OS_RELEASE),4.1.3_U1)
CSRCS += $(SUNOS4_CSRCS)
else
CSRCS += $(SOLARIS_CSRCS)
endif
endif
ifeq ($(OS_ARCH),AIX)
CSRCS += $(AIX_CSRCS)
endif
ifeq ($(OS_ARCH),FreeBSD)
CSRCS += $(FREEBSD_CSRCS)
endif
ifeq ($(OS_ARCH),NetBSD)
CSRCS += $(NETBSD_CSRCS)
endif
ifeq ($(OS_ARCH),OpenBSD)
CSRCS += $(OPENBSD_CSRCS)
endif
ifeq ($(OS_ARCH),BSD_OS)
CSRCS += $(BSDI_CSRCS)
endif
ifeq ($(OS_ARCH),HP-UX)
CSRCS += $(HPUX_CSRCS)
endif
ifeq ($(OS_ARCH),OSF1)
CSRCS += $(OSF1_CSRCS)
endif
ifeq ($(OS_ARCH),OpenVMS)
CSRCS += $(OPENVMS_CSRCS)
endif
ifeq ($(OS_ARCH),Linux)
CSRCS += $(LINUX_CSRCS)
endif
ifeq ($(OS_ARCH),UNIXWARE)
CSRCS += $(UNIXWARE_CSRCS)
endif
ifeq ($(OS_ARCH),SINIX)
CSRCS += $(RELIANTUNIX_CSRCS)
endif
ifeq ($(OS_ARCH),Rhapsody)
CSRCS += $(RHAPSODY_CSRCS)
endif
ifeq ($(OS_ARCH),NEXTSTEP)
CSRCS += $(NEXTSTEP_CSRCS)
endif
ifeq ($(OS_ARCH),NEC)
CSRCS += $(NEC_CSRCS)
endif
ifeq ($(OS_ARCH),NEWS-OS)
CSRCS += $(SONY_CSRCS)
endif
ifeq ($(OS_ARCH),NCR)
CSRCS += $(NCR_CSRCS)
endif
ifeq ($(OS_ARCH),SCOOS)
CSRCS += $(SCOOS_CSRCS)
endif
ifeq ($(OS_ARCH),DGUX)
CSRCS += $(DGUX_CSRCS)
endif
ifeq ($(OS_ARCH),NTO)
CSRCS += $(NTO_CSRCS)
endif
ifeq ($(OS_ARCH),QNX)
ifeq ($(OS_TARGET),NTO)
CSRCS += $(NTO_CSRCS)
else
CSRCS += $(QNX_CSRCS)
endif
endif
#
# Some Unix platforms have an assembly language file.
# E.g., AIX 3.2, Solaris (both sparc and x86).
#
ifeq ($(OS_ARCH), AIX)
ifeq ($(OS_RELEASE), 3.2)
ASFILES = os_$(OS_ARCH).s
endif
endif
ifeq ($(OS_ARCH),SunOS)
ifneq ($(OS_RELEASE),4.1.3_U1)
ifneq ($(LOCAL_THREADS_ONLY),1)
ifeq ($(CPU_ARCH),x86)
ASFILES = os_$(OS_ARCH)_x86.s
else
ASFILES = os_$(OS_ARCH).s
ifneq ($(USE_64),1)
ASFILES += os_$(OS_ARCH)_32.s
endif
endif
endif
endif
endif
ifeq ($(OS_ARCH),Linux)
ifeq ($(CPU_ARCH),x86)
ASFILES = os_Linux_x86.s
endif
ifeq ($(CPU_ARCH),ia64)
ASFILES = os_Linux_ia64.s
endif
endif
ifeq ($(OS_ARCH), SINIX)
ifeq ($(CPU_ARCH),mips)
ASFILES = os_ReliantUNIX.s
endif
endif
ifeq ($(OS_ARCH), HP-UX)
ASFILES = os_HPUX.s
endif
ifeq ($(OS_ARCH), IRIX)
ASFILES = os_Irix.s
endif
ifeq ($(OS_ARCH)$(OS_RELEASE),BSD_OS2.1)
ASFILES = os_BSD_386_2.s
endif
endif # !USE_AUTOCONF
OBJS += $(addprefix md/unix/$(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX))) \ OBJS += $(addprefix md/unix/$(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX))) \
$(addprefix md/unix/$(OBJDIR)/,$(ASFILES:.s=.$(OBJ_SUFFIX))) $(addprefix md/unix/$(OBJDIR)/,$(ASFILES:.s=.$(OBJ_SUFFIX)))

1
nsprpub/pr/src/md/windows/.cvsignore Normal file
Просмотреть файл

@ -0,0 +1 @@
Makefile

2
nsprpub/pr/src/md/windows/Makefile.in
Просмотреть файл

@ -101,7 +101,7 @@ endif
TARGETS = $(OBJS) TARGETS = $(OBJS)
INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_ DEFINES += -D_NSPR_BUILD_

1
nsprpub/pr/src/memory/.cvsignore Normal file
Просмотреть файл

@ -0,0 +1 @@
Makefile

11
nsprpub/pr/src/memory/Makefile.in
Просмотреть файл

@ -42,15 +42,6 @@ include $(MOD_DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk
ifndef USE_AUTOCONF
# Disable optimization of the nspr on SunOS4.1.3
ifeq ($(OS_ARCH),SunOS)
ifeq ($(OS_RELEASE),4.1.3_U1)
OPTIMIZER =
endif
endif
endif #!USE_AUTOCONF
CSRCS = prseg.c prshm.c prshma.c CSRCS = prseg.c prshm.c prshma.c
ifdef GC_LEAK_DETECTOR ifdef GC_LEAK_DETECTOR
@ -59,7 +50,7 @@ endif
TARGETS = $(OBJS) TARGETS = $(OBJS)
INCLUDES = -I$(includedir) -I$(includedir)/boehm -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private INCLUDES = -I$(dist_includedir) -I$(dist_includedir)/.. -I$(dist_includedir)/../boehm -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_ DEFINES += -D_NSPR_BUILD_