summaryrefslogtreecommitdiff
path: root/pr/tests/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'pr/tests/Makefile.in')
-rw-r--r--pr/tests/Makefile.in172
1 files changed, 66 insertions, 106 deletions
diff --git a/pr/tests/Makefile.in b/pr/tests/Makefile.in
index 30dad6d7..80e3738a 100644
--- a/pr/tests/Makefile.in
+++ b/pr/tests/Makefile.in
@@ -26,16 +26,7 @@ include $(MOD_DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
-ifeq ($(OS_TARGET), WIN16)
-OS_CFLAGS = $(OS_EXE_CFLAGS)
-W16STDIO = $(MOD_DEPTH)/pr/src/md/windows/$(OBJDIR)/w16stdio.$(OBJ_SUFFIX)
-endif
-
-ifeq ($(OS_TARGET),WIN16)
-DIRS = dll w16gui
-else
DIRS = dll
-endif
ifeq ($(OS_TARGET),OS2)
OS_CFLAGS = $(OS_EXE_CFLAGS)
@@ -93,11 +84,11 @@ CSRCS = \
multiacc.c \
multiwait.c \
many_cv.c \
- nameshm1.c \
+ nameshm1.c \
nbconn.c \
nblayer.c \
nonblock.c \
- ntioto.c \
+ ntioto.c \
ntoh.c \
op_2long.c \
op_excl.c \
@@ -122,7 +113,7 @@ CSRCS = \
provider.c \
prpoll.c \
ranfile.c \
- randseed.c \
+ randseed.c \
rwlocktest.c \
sel_spd.c \
selct_er.c \
@@ -130,12 +121,12 @@ CSRCS = \
selct_to.c \
select2.c \
sem.c \
- sema.c \
- semaerr.c \
- semaerr1.c \
- semaping.c \
- semapong.c \
- sendzlf.c \
+ sema.c \
+ semaerr.c \
+ semaerr1.c \
+ semaping.c \
+ semapong.c \
+ sendzlf.c \
server_test.c \
servr_kk.c \
servr_ku.c \
@@ -159,6 +150,8 @@ CSRCS = \
system.c \
testbit.c \
testfile.c \
+ thrpool_server.c \
+ thrpool_client.c \
threads.c \
thruput.c \
timemac.c \
@@ -172,7 +165,7 @@ CSRCS = \
writev.c \
xnotify.c \
y2k.c \
- y2ktmo.c \
+ y2ktmo.c \
zerolen.c \
$(NULL)
@@ -184,7 +177,7 @@ CSRCS += \
$(NULL)
endif
-ifeq ($(OS_ARCH), WINNT)
+ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
PROG_SUFFIX = .exe
else
PROG_SUFFIX =
@@ -194,42 +187,22 @@ PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX)))
TARGETS = $(PROGS)
-INCLUDES = -I$(DIST)/include -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
-
-# Setting the variables LDOPTS and LIBPR. We first initialize
-# them to the default values, then adjust them for some platforms.
-LDOPTS = -L$(DIST)/lib
-LIBPR = -lnspr$(MOD_VERSION)
-LIBPLC = -lplc$(MOD_VERSION)
-
-ifndef USE_AUTOCONF
+INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
ifeq ($(OS_ARCH), WINNT)
-ifeq ($(OS_TARGET), WIN16)
- LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
- LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).lib
-else
-ifeq ($(OS_TARGET), OS2)
-ifdef XP_OS2_VACPP
- LDOPTS =
- LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib
- LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).lib
-else
- LDOPTS = -Zlinker /PM:VIO
-endif
-else
LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
- ifeq ($(OS_TARGET), WIN95)
- LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX)
- LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).$(LIB_SUFFIX)
- else
- LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).$(LIB_SUFFIX)
- LIBPLC= $(DIST)/lib/libplc$(MOD_VERSION).$(LIB_SUFFIX)
- endif
ifdef PROFILE
LDOPTS += -PROFILE -MAP
endif # profile
endif
+
+ifeq ($(OS_ARCH),OS2)
+ifeq ($(MOZ_OS2_TOOLS),VACPP)
+ LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO
+else
+ifeq ($(MOZ_OS2_EMX_OBJECTFORMAT),OMF)
+ LDOPTS = -Zlinker /PM:VIO
+endif
endif
endif
@@ -238,11 +211,11 @@ ifneq ($(OS_ARCH), WINNT)
# or -rpath linker option or the LD_RUN_PATH environment variable).
ifeq (,$(patsubst /%,,$(DIST)))
# $(DIST) is already an absolute pathname.
-ABSOLUTE_LIB_DIR = $(DIST)/lib
+ABSOLUTE_LIB_DIR = $(dist_libdir)
else
# $(DIST) is a relative pathname: prepend the current directory.
PWD = $(shell pwd)
-ABSOLUTE_LIB_DIR = $(PWD)/$(DIST)/lib
+ABSOLUTE_LIB_DIR = $(PWD)/$(dist_libdir)
endif
endif
@@ -274,8 +247,8 @@ ifeq ($(OS_ARCH), OSF1)
# I haven't figured out how to pass -rpath to cc on OSF1 V3.2, so
# we do static linking.
ifeq (,$(filter-out V2.0 V3.2,$(OS_RELEASE)))
- LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).a
- LIBPLC = $(DIST)/lib/libplc$(MOD_VERSION).a
+ LIBNSPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a
+ LIBPLC = $(dist_libdir)/libplc$(MOD_MAJOR_VERSION).a
EXTRA_LIBS = -lc_r
else
LDOPTS += -rpath $(ABSOLUTE_LIB_DIR)
@@ -285,8 +258,8 @@ endif
ifeq ($(OS_ARCH), HP-UX)
LDOPTS += -z -Wl,+s,+b,$(ABSOLUTE_LIB_DIR)
ifeq ($(USE_64),1)
- LDOPTS += +DA2.0W
- EXTRA_LIBS = -lpthread
+ LDOPTS += +DA2.0W
+ EXTRA_LIBS = -lpthread
endif
endif
@@ -294,8 +267,8 @@ endif
ifeq ($(OS_ARCH),AIX)
LDOPTS += -blibpath:$(ABSOLUTE_LIB_DIR):/usr/lib:/lib
ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1)
- LIBPR = -lnspr$(MOD_VERSION)_shr
- LIBPLC = -lplc$(MOD_VERSION)_shr
+ LIBNSPR = -lnspr$(MOD_MAJOR_VERSION)_shr
+ LIBPLC = -lplc$(MOD_MAJOR_VERSION)_shr
else
LDOPTS += -brtl
EXTRA_LIBS = -ldl
@@ -363,8 +336,8 @@ ifeq ($(OS_ARCH), NEWS-OS)
# libnspr.so etc. at program startup. Equivalent to the -R or -rpath
# option for ld on other platforms.
#export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR)
- LIBPR = $(DIST)/lib/libnspr$(MOD_VERSION).a
- LIBPLC = $(DIST)/lib/libplc$(MOD_VERSION).a
+ LIBNSPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a
+ LIBPLC = $(dist_libdir)/libplc$(MOD_MAJOR_VERSION).a
EXTRA_LIBS = -lsocket -lnsl -lgen -lresolv
endif
@@ -401,6 +374,13 @@ ifeq ($(OS_ARCH), UNIXWARE)
export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR)
endif
+ifeq ($(OS_ARCH),FreeBSD)
+ifeq ($(USE_PTHREADS),1)
+LDOPTS += -pthread
+endif
+LDOPTS += -Xlinker -R $(ABSOLUTE_LIB_DIR)
+endif
+
ifeq ($(OS_ARCH),OpenBSD)
ifeq ($(USE_PTHREADS),1)
LDOPTS += -pthread
@@ -414,6 +394,12 @@ endif
LDOPTS += -Xlinker -R $(ABSOLUTE_LIB_DIR)
endif
+ifeq ($(OS_ARCH),OpenBSD)
+ifeq ($(USE_PTHREADS),1)
+LDOPTS += -pthread
+endif
+endif
+
ifeq ($(OS_ARCH),BSD_OS)
ifneq ($(OS_RELEASE),1.1)
EXTRA_LIBS = -ldl
@@ -425,7 +411,7 @@ LIBPTHREAD = -lpthread
ifeq ($(OS_ARCH),AIX)
LIBPTHREAD = -lpthreads
endif
-ifeq (,$(filter-out FreeBSD OpenBSD BSD_OS NTO,$(OS_ARCH)))
+ifeq (,$(filter-out FreeBSD OpenBSD BSD_OS NTO Rhapsody,$(OS_ARCH)))
LIBPTHREAD =
endif
ifeq ($(OS_ARCH)$(basename $(OS_RELEASE)),HP-UXB.10)
@@ -433,7 +419,6 @@ LIBPTHREAD = -ldce
endif
endif
-endif # !USE_AUTOCONF
#####################################################
#
@@ -443,11 +428,6 @@ endif # !USE_AUTOCONF
include $(topsrcdir)/config/rules.mk
-ifdef USE_AUTOCONF
-$(OBJDIR)/%$(PROG_SUFFIX): %.c
- $(CC) $< -o $@ $(CFLAGS) $(LDOPTS) $(LIBPLC) $(LIBPR) $(OS_LIBS)
-
-else
AIX_PRE_4_2 = 0
ifeq ($(OS_ARCH),AIX)
ifeq ($(OS_RELEASE),4.1)
@@ -470,7 +450,7 @@ ifeq ($(AIX_PRE_4_2),1)
$(OBJDIR)/%: $(OBJDIR)/%.$(OBJ_SUFFIX)
@$(MAKE_OBJDIR)
rm -f $@ $(AIX_TMP)
- $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(DIST)/lib/libnspr$(MOD_VERSION).a
+ $(CC) $(AIX_LINK_OPTS) -o $(AIX_TMP) $< $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).a
$(CC) -o $@ $(AIX_TMP) $(AIX_WRAP)
rm -f $(AIX_TMP)
@@ -481,66 +461,46 @@ else
$(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
@$(MAKE_OBJDIR)
ifeq ($(OS_ARCH), WINNT)
-ifeq ($(OS_TARGET),WIN16)
- echo system windows >w16link
- echo name $@ >>w16link
- echo option map >>w16link
-# echo option CASEEXACT >>w16link
- echo option stack=16K >>w16link
- echo debug $(DEBUGTYPE) all >>w16link
- echo file >>w16link
- echo $< , >>w16link
- echo $(W16STDIO) >>w16link
- echo library >>w16link
- echo $(LIBPR), >>w16link
- echo $(LIBPLC), >>w16link
- echo winsock.lib >>w16link
- wlink @w16link.
+ link $(LDOPTS) $(EXTRA_LDOPTS) $< $(LIBPLC) $(LIBNSPR) $(EXTRA_LIBS) wsock32.lib -out:$@
else
-ifeq ($(OS_TARGET),OS2)
- $(LINK) $(EXEFLAGS) $(LDOPTS) $< $(LIBPLC) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS)
+ifeq ($(OS_ARCH),OS2)
+ $(LINK) $(EXEFLAGS) $(LDOPTS) $< $(LIBPLC) $(LIBNSPR) $(OS_LIBS) $(EXTRA_LIBS)
else
- link $(LDOPTS) $(EXTRA_LDOPTS) $< $(LIBPLC) $(LIBPR) $(EXTRA_LIBS) wsock32.lib -out:$@
-endif
-endif
-else
- $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(EXTRA_LIBS) -o $@
-endif
-
-endif
-
-endif # !USE_AUTOCONF
+ $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(EXTRA_LIBS) -o $@
+endif # OS/2
+endif # WINNT
+endif # AIX_PRE_4_2
export:: $(TARGETS)
-install:: export
clean::
rm -f $(TARGETS)
-ifndef USE_AUTOCONF
-# The prpoll test calls BSD socket functions, so it needs to link
+# The following tests call BSD socket functions, so they need to link
# with -lsocket on some platforms.
ifeq ($(OS_ARCH),SunOS)
ifneq ($(OS_RELEASE),4.1.3_U1)
+ifeq ($(USE_IPV6),1)
+$(OBJDIR)/gethost: $(OBJDIR)/gethost.o
+ $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) -lsocket $(EXTRA_LIBS) -o $@
+endif
$(OBJDIR)/prpoll: $(OBJDIR)/prpoll.o
- $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) -lsocket $(EXTRA_LIBS) -o $@
+ $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) -lsocket $(EXTRA_LIBS) -o $@
endif
endif
ifeq ($(USE_PTHREADS), 1)
$(OBJDIR)/attach: $(OBJDIR)/attach.o
- $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@
+ $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@
$(OBJDIR)/foreign: $(OBJDIR)/foreign.o
- $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@
+ $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@
$(OBJDIR)/provider: $(OBJDIR)/provider.o
- $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@
+ $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@
$(OBJDIR)/socket: $(OBJDIR)/socket.o
- $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@
+ $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@
$(OBJDIR)/testfile: $(OBJDIR)/testfile.o
- $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@
+ $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@
endif
-endif # !USE_AUTOCONF
-
#
# Run the test programs with no arguments
#
@@ -552,7 +512,7 @@ PROGRAMS = $(notdir $(PROGS))
ifdef NSPR_TEST_LOGFILE
LOGFILE = $(NSPR_TEST_LOGFILE)
else
-ifeq ($(OS_ARCH), WINNT)
+ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
LOGFILE = nul
else
LOGFILE = /dev/null
View Lorry Controller Status