Sync'd Makefile.in's to reflect srinivas' NSPR API changes.

This commit is contained in:
cls%seawood.org 2000-01-06 06:09:27 +00:00
Родитель 1713da7081
Коммит 0327a63675
18 изменённых файлов: 61 добавлений и 19 удалений

Просмотреть файл

@ -140,7 +140,11 @@ MDCPUCFG_H = _scoos.cfg
endif
ifeq ($(OS_ARCH),UNIXWARE)
ifeq (,$(filter-out 2.1,$(OS_RELEASE)))
MDCPUCFG_H = _unixware.cfg
else
MDCPUCFG_H = _unixware7.cfg
endif
endif
ifeq ($(OS_ARCH),NCR)

Просмотреть файл

@ -100,7 +100,7 @@ endif
ifeq ($(OS_ARCH),OSF1)
ifeq ($(USE_PTHREADS), 1)
OS_LIBS = -lpthread -lrt
OS_LIBS = -lpthread
endif
ifneq ($(OS_RELEASE),V2.0)
OS_LIBS += -lc_r
@ -124,7 +124,7 @@ OS_LIBS = -lpthread
endif
endif
ifeq ($(PTHREADS_USER), 1)
OS_LIBS = -lpthread -lrt
OS_LIBS = -lpthread
endif
ifeq ($(basename $(OS_RELEASE)),A.09)
OS_LIBS += -ldld -L/lib/pa1.1 -lm
@ -304,6 +304,7 @@ OBJS += md/windows/$(OBJDIR)/w95io.$(OBJ_SUFFIX) \
md/windows/$(OBJDIR)/win32_errors.$(OBJ_SUFFIX) \
md/windows/$(OBJDIR)/w32ipcsem.$(OBJ_SUFFIX) \
md/windows/$(OBJDIR)/w32poll.$(OBJ_SUFFIX) \
md/windows/$(OBJDIR)/w32rng.$(OBJ_SUFFIX) \
md/windows/$(OBJDIR)/w32shm.$(OBJ_SUFFIX) \
md/windows/$(OBJDIR)/w95dllmain.$(OBJ_SUFFIX)
else
@ -328,6 +329,7 @@ OBJS += md/windows/$(OBJDIR)/ntdllmn.$(OBJ_SUFFIX) \
md/windows/$(OBJDIR)/ntsem.$(OBJ_SUFFIX) \
md/windows/$(OBJDIR)/win32_errors.$(OBJ_SUFFIX) \
md/windows/$(OBJDIR)/w32ipcsem.$(OBJ_SUFFIX) \
md/windows/$(OBJDIR)/w32rng.$(OBJ_SUFFIX) \
md/windows/$(OBJDIR)/w32shm.$(OBJ_SUFFIX) \
md/windows/$(OBJDIR)/w32poll.$(OBJ_SUFFIX)
endif
@ -379,6 +381,8 @@ else
SUF = LL
endif
DEFINES += -D_NSPR_BUILD_
$(TINC):
@$(MAKE_OBJDIR)
@$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
@ -390,7 +394,7 @@ $(TINC):
@$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
$(OBJDIR)/prvrsion.$(OBJ_SUFFIX): $(srcdir)/prvrsion.c $(TINC)
$(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC)
ifeq ($(OS_ARCH), WINNT)
ifdef XP_OS2_EMX
$(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) $<

Просмотреть файл

@ -30,6 +30,8 @@ INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include
include $(topsrcdir)/config/rules.mk
DEFINES += -D_NSPR_BUILD_
export:: $(TARGETS)
install:: export

Просмотреть файл

@ -47,7 +47,9 @@ INCLUDES = -I$(DIST)/include
include $(topsrcdir)/config/rules.mk
HEADERS = *.h
DEFINES += -D_NSPR_BUILD_
HEADERS = $(srcdir)/*.h
export:: $(TARGETS)

Просмотреть файл

@ -64,6 +64,8 @@ TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_
include $(topsrcdir)/config/rules.mk
export:: $(TARGETS)

Просмотреть файл

@ -41,6 +41,8 @@ TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_
include $(topsrcdir)/config/rules.mk
export:: $(TARGETS)

Просмотреть файл

@ -37,6 +37,8 @@ TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_
CSRCS = prmalloc.c prmem.c
include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -59,6 +59,8 @@ TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include
DEFINES += -D_NSPR_BUILD_
include $(topsrcdir)/config/rules.mk
export:: $(TARGETS)

Просмотреть файл

@ -26,6 +26,8 @@ TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_
include $(topsrcdir)/config/rules.mk
export:: $(TARGETS)

Просмотреть файл

@ -45,6 +45,8 @@ TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
DEFINES += -D_NSPR_BUILD_
include $(topsrcdir)/config/rules.mk
export:: $(TARGETS)

Просмотреть файл

@ -39,8 +39,8 @@ CSRCS = \
unix.c \
unix_errors.c \
uxproces.c \
uxshm.c \
uxrng.c \
uxshm.c \
uxwrap.c \
$(NULL)
@ -300,6 +300,8 @@ endif # ! USE_AUTOCONF
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_
include $(topsrcdir)/config/rules.mk
export:: $(TARGETS)

Просмотреть файл

@ -59,6 +59,7 @@ CSRCS = \
win32_errors.c \
w32ipcsem.c \
w32poll.c \
w32rng.c \
w32shm.c \
w95dllmain.c \
$(NULL)
@ -74,6 +75,7 @@ CSRCS = \
win32_errors.c \
w32ipcsem.c \
w32poll.c \
w32rng.c \
w32shm.c \
$(NULL)
endif
@ -83,6 +85,8 @@ TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_
include $(topsrcdir)/config/rules.mk
export:: $(TARGETS)

Просмотреть файл

@ -41,6 +41,8 @@ TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_
include $(topsrcdir)/config/rules.mk
export:: $(TARGETS)

Просмотреть файл

@ -68,6 +68,8 @@ TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_
RELEASE_BINS = compile-et.pl prerr.properties
include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -44,6 +44,8 @@ TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_
include $(topsrcdir)/config/rules.mk
export:: $(TARGETS)

Просмотреть файл

@ -75,6 +75,8 @@ TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_
include $(topsrcdir)/config/rules.mk
export:: $(TARGETS)

Просмотреть файл

@ -52,6 +52,8 @@ TARGETS = $(OBJS)
INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
DEFINES += -D_NSPR_BUILD_
include $(topsrcdir)/config/rules.mk
export:: $(TARGETS)

Просмотреть файл

@ -95,7 +95,9 @@ CSRCS = \
nbconn.c \
nblayer.c \
nonblock.c \
ntioto.c \
op_2long.c \
op_excl.c \
op_filnf.c \
op_filok.c \
op_noacc.c \
@ -116,6 +118,7 @@ CSRCS = \
provider.c \
prpoll.c \
ranfile.c \
randseed.c \
rwlocktest.c \
sel_spd.c \
selct_er.c \
@ -394,6 +397,12 @@ ifeq ($(OS_ARCH), UNIXWARE)
export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR)
endif
ifeq ($(OS_ARCH),OpenBSD)
ifeq ($(USE_PTHREADS),1)
LDOPTS += -pthread
endif
endif
ifeq ($(OS_ARCH),FreeBSD)
ifeq ($(USE_PTHREADS),1)
LDOPTS += -pthread
@ -408,22 +417,15 @@ endif
endif
ifeq ($(USE_PTHREADS),1)
LIBPTHREAD = -lpthread
ifeq ($(OS_ARCH),AIX)
LIBPTHREAD = -lpthreads
else
ifeq ($(OS_ARCH),FreeBSD)
LIBPTHREAD =
else
ifeq ($(OS_ARCH)$(basename $(OS_RELEASE)),HP-UXB.10)
LIBPTHREAD = -ldce
else
ifeq ($(OS_ARCH),BSD_OS)
LIBPTHREAD =
else
LIBPTHREAD = -lpthread
endif
endif
endif
endif
ifeq (,$(filter-out FreeBSD OpenBSD BSD_OS NTO,$(OS_ARCH)))
LIBPTHREAD =
endif
ifeq ($(OS_ARCH)$(basename $(OS_RELEASE)),HP-UXB.10)
LIBPTHREAD = -ldce
endif
endif