diff options
author | cls%seawood.org <devnull@localhost> | 2000-01-06 06:09:27 +0000 |
---|---|---|
committer | cls%seawood.org <devnull@localhost> | 2000-01-06 06:09:27 +0000 |
commit | 1236850131dc4b2de7fea978f7a599b78ebfe59e (patch) | |
tree | 704ce4bf4f8fa8908ccdd92cd5fc45a6755bc2c2 | |
parent | ebd9fa3dd939aeaef66d12d6163a5d611861490e (diff) | |
download | nspr-hg-NSIFILE_0106200_BASE.tar.gz |
Sync'd Makefile.in's to reflect srinivas' NSPR API changes.NSIFILE_0106200_BASE
-rw-r--r-- | pr/include/md/Makefile.in | 4 | ||||
-rw-r--r-- | pr/src/Makefile.in | 10 | ||||
-rw-r--r-- | pr/src/bthreads/Makefile.in | 2 | ||||
-rw-r--r-- | pr/src/cplus/Makefile.in | 4 | ||||
-rw-r--r-- | pr/src/io/Makefile.in | 2 | ||||
-rw-r--r-- | pr/src/linking/Makefile.in | 2 | ||||
-rw-r--r-- | pr/src/malloc/Makefile.in | 2 | ||||
-rw-r--r-- | pr/src/md/Makefile.in | 2 | ||||
-rw-r--r-- | pr/src/md/beos/Makefile.in | 2 | ||||
-rw-r--r-- | pr/src/md/os2/Makefile.in | 2 | ||||
-rw-r--r-- | pr/src/md/unix/Makefile.in | 4 | ||||
-rw-r--r-- | pr/src/md/windows/Makefile.in | 4 | ||||
-rw-r--r-- | pr/src/memory/Makefile.in | 2 | ||||
-rw-r--r-- | pr/src/misc/Makefile.in | 2 | ||||
-rw-r--r-- | pr/src/pthreads/Makefile.in | 2 | ||||
-rw-r--r-- | pr/src/threads/Makefile.in | 2 | ||||
-rw-r--r-- | pr/src/threads/combined/Makefile.in | 2 | ||||
-rw-r--r-- | pr/tests/Makefile.in | 30 |
18 files changed, 61 insertions, 19 deletions
diff --git a/pr/include/md/Makefile.in b/pr/include/md/Makefile.in index 17667279..0ab32b1d 100644 --- a/pr/include/md/Makefile.in +++ b/pr/include/md/Makefile.in @@ -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) diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in index 18321c5e..de397356 100644 --- a/pr/src/Makefile.in +++ b/pr/src/Makefile.in @@ -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) $< diff --git a/pr/src/bthreads/Makefile.in b/pr/src/bthreads/Makefile.in index ee373bed..e0300039 100644 --- a/pr/src/bthreads/Makefile.in +++ b/pr/src/bthreads/Makefile.in @@ -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 diff --git a/pr/src/cplus/Makefile.in b/pr/src/cplus/Makefile.in index 82f0037a..a7caae58 100644 --- a/pr/src/cplus/Makefile.in +++ b/pr/src/cplus/Makefile.in @@ -47,7 +47,9 @@ INCLUDES = -I$(DIST)/include include $(topsrcdir)/config/rules.mk -HEADERS = *.h +DEFINES += -D_NSPR_BUILD_ + +HEADERS = $(srcdir)/*.h export:: $(TARGETS) diff --git a/pr/src/io/Makefile.in b/pr/src/io/Makefile.in index cf16d8b1..40be6e7d 100644 --- a/pr/src/io/Makefile.in +++ b/pr/src/io/Makefile.in @@ -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) diff --git a/pr/src/linking/Makefile.in b/pr/src/linking/Makefile.in index af1b0449..d518a886 100644 --- a/pr/src/linking/Makefile.in +++ b/pr/src/linking/Makefile.in @@ -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) diff --git a/pr/src/malloc/Makefile.in b/pr/src/malloc/Makefile.in index 4fd60862..d058996d 100644 --- a/pr/src/malloc/Makefile.in +++ b/pr/src/malloc/Makefile.in @@ -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 diff --git a/pr/src/md/Makefile.in b/pr/src/md/Makefile.in index 68a47723..5e78b60b 100644 --- a/pr/src/md/Makefile.in +++ b/pr/src/md/Makefile.in @@ -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) diff --git a/pr/src/md/beos/Makefile.in b/pr/src/md/beos/Makefile.in index bc5774de..9e407a95 100644 --- a/pr/src/md/beos/Makefile.in +++ b/pr/src/md/beos/Makefile.in @@ -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) diff --git a/pr/src/md/os2/Makefile.in b/pr/src/md/os2/Makefile.in index 4ecaf6d9..72414033 100644 --- a/pr/src/md/os2/Makefile.in +++ b/pr/src/md/os2/Makefile.in @@ -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) diff --git a/pr/src/md/unix/Makefile.in b/pr/src/md/unix/Makefile.in index 49539257..9fb73bf8 100644 --- a/pr/src/md/unix/Makefile.in +++ b/pr/src/md/unix/Makefile.in @@ -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) diff --git a/pr/src/md/windows/Makefile.in b/pr/src/md/windows/Makefile.in index 255a2886..89100b06 100644 --- a/pr/src/md/windows/Makefile.in +++ b/pr/src/md/windows/Makefile.in @@ -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) diff --git a/pr/src/memory/Makefile.in b/pr/src/memory/Makefile.in index 84a17212..7fa317e3 100644 --- a/pr/src/memory/Makefile.in +++ b/pr/src/memory/Makefile.in @@ -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) diff --git a/pr/src/misc/Makefile.in b/pr/src/misc/Makefile.in index 973bdffd..5c0bf1a0 100644 --- a/pr/src/misc/Makefile.in +++ b/pr/src/misc/Makefile.in @@ -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 diff --git a/pr/src/pthreads/Makefile.in b/pr/src/pthreads/Makefile.in index 45b08f96..f8328e90 100644 --- a/pr/src/pthreads/Makefile.in +++ b/pr/src/pthreads/Makefile.in @@ -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) diff --git a/pr/src/threads/Makefile.in b/pr/src/threads/Makefile.in index b935fca9..8e091510 100644 --- a/pr/src/threads/Makefile.in +++ b/pr/src/threads/Makefile.in @@ -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) diff --git a/pr/src/threads/combined/Makefile.in b/pr/src/threads/combined/Makefile.in index e4e2de37..ecaca4bf 100644 --- a/pr/src/threads/combined/Makefile.in +++ b/pr/src/threads/combined/Makefile.in @@ -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) diff --git a/pr/tests/Makefile.in b/pr/tests/Makefile.in index 0b3479d2..9d6a0de9 100644 --- a/pr/tests/Makefile.in +++ b/pr/tests/Makefile.in @@ -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 |