Use the sources that exist in sibdirs of libpthread, not libc_r

6 files changed, 26 insertions, 30 deletions

diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile
index b391e0098eb..7bd7077e0af 100644
--- a/lib/libpthread/Makefile
+++ b/lib/libpthread/Makefile
@@ -1,26 +1,22 @@
-#	$OpenBSD: Makefile,v 1.16 2003/01/14 20:04:44 marc Exp $
+#	$OpenBSD: Makefile,v 1.17 2003/01/20 18:12:11 marc Exp $
 
 #
 # The pthread library is formed from the FreeBSD uthread sources of 
-# libc_r, and exploits weak symbols in libc.   It is installed as
-# libnpthread (new pthread) so it will not be picked up in addition to
-# libc_r by misbehaving ports.
+# libc_r, and exploits weak symbols in libc.
 #
 
-LIBC_RSRCDIR=	${.CURDIR}/../libc_r
+SRCDIR=		${.CURDIR}
 LIBCSRCDIR=	${.CURDIR}/../libc
 
-.PATH:		${LIBC_RSRCDIR}
-
 LIB=		pthread
 LINTFLAGS=	-z
 CFLAGS+=	-DPTHREAD_KERNEL -D_POSIX_THREADS -D_THREAD_SAFE -Wall
-CFLAGS+=	-I${LIBC_RSRCDIR}/uthread
-CFLAGS+=	-I${LIBC_RSRCDIR}/include
+CFLAGS+=	-I${SRCDIR}/uthread
+CFLAGS+=	-I${SRCDIR}/include
 CFLAGS+=	-I${LIBCSRCDIR}/include
-AINC+=		-I${LIBC_RSRCDIR}/uthread
+AINC+=		-I${SRCDIR}/uthread
 
-# Uncomment this if you want libc_r to contain debug information for
+# Uncomment this if you want libpthread to contain debug information for
 # thread locking.
 CFLAGS+=	-D_LOCK_DEBUG
 #DEBUG=		-g
@@ -28,11 +24,11 @@ CFLAGS+=	-D_LOCK_DEBUG
 # enable extra internal consistency checks
 CFLAGS+=	-D_PTHREADS_INVARIANTS
 
-.include "${LIBC_RSRCDIR}/include/Makefile.inc"
-.include "${LIBC_RSRCDIR}/sys/Makefile.inc"
-.include "${LIBC_RSRCDIR}/thread/Makefile.inc"
-.include "${LIBC_RSRCDIR}/uthread/Makefile.inc"
-.include "${LIBC_RSRCDIR}/man/Makefile.inc"
+.include "${SRCDIR}/include/Makefile.inc"
+.include "${SRCDIR}/sys/Makefile.inc"
+.include "${SRCDIR}/thread/Makefile.inc"
+.include "${SRCDIR}/uthread/Makefile.inc"
+.include "${SRCDIR}/man/Makefile.inc"
 
 .include <bsd.own.mk>
 .include <bsd.lib.mk>
diff --git a/lib/libpthread/include/Makefile.inc b/lib/libpthread/include/Makefile.inc
index 5bf12b96d4b..4da28f90ddb 100644
--- a/lib/libpthread/include/Makefile.inc
+++ b/lib/libpthread/include/Makefile.inc
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile.inc,v 1.4 2002/01/18 00:36:36 fgsch Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2003/01/20 18:12:11 marc Exp $
 
 includes:
-	@cd ${LIBC_RSRCDIR}/include; \
+	@cd ${SRCDIR}/include; \
 	 for h in pthread.h pthread_np.h sched.h semaphore.h spinlock.h; do \
 		cmp -s $$h ${DESTDIR}/usr/include/$$h > /dev/null 2>&1 || \
 		(echo ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \
diff --git a/lib/libpthread/man/Makefile.inc b/lib/libpthread/man/Makefile.inc
index b0d611a0adb..46dfba808e8 100644
--- a/lib/libpthread/man/Makefile.inc
+++ b/lib/libpthread/man/Makefile.inc
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile.inc,v 1.15 2002/02/20 05:16:20 fgsch Exp $
+# $OpenBSD: Makefile.inc,v 1.16 2003/01/20 18:12:11 marc Exp $
 # $FreeBSD: Makefile.inc,v 1.6 1999/08/28 00:03:02 peter Exp $
 
 # POSIX thread man files
 
-.PATH: ${LIBC_RSRCDIR}/man
+.PATH: ${SRCDIR}/man
 
 MAN+=	\
 	pthread_attr_init.3 \
diff --git a/lib/libpthread/sys/Makefile.inc b/lib/libpthread/sys/Makefile.inc
index aff80e5ba05..8594adea8e1 100644
--- a/lib/libpthread/sys/Makefile.inc
+++ b/lib/libpthread/sys/Makefile.inc
@@ -1,14 +1,14 @@
-#	$OpenBSD: Makefile.inc,v 1.9 2002/01/17 04:47:14 fgsch Exp $
+#	$OpenBSD: Makefile.inc,v 1.10 2003/01/20 18:12:11 marc Exp $
 
-.PATH:	 ${LIBC_RSRCDIR}/sys ${LIBC_RSRCDIR}/arch/${MACHINE_ARCH}
+.PATH:	 ${SRCDIR}/sys ${SRCDIR}/arch/${MACHINE_ARCH}
 
 SRCS+=	uthread_error.c
 SRCS+=	_atomic_lock.c slow_atomic_lock.c
 
-.if exists(${LIBC_RSRCDIR}/arch/${MACHINE_ARCH}/uthread_machdep_asm.S)
+.if exists(${SRCDIR}/arch/${MACHINE_ARCH}/uthread_machdep_asm.S)
 SRCS+=	uthread_machdep_asm.S
 .endif
-.if exists(${LIBC_RSRCDIR}/arch/${MACHINE_ARCH}/uthread_machdep.c)
+.if exists(${SRCDIR}/arch/${MACHINE_ARCH}/uthread_machdep.c)
 SRCS+=	uthread_machdep.c
 .endif
 
@@ -33,7 +33,7 @@ HIDDEN_SYSCALLS= accept.o bind.o close.o connect.o dup.o dup2.o \
 SRCS+= _sys_aliases.c
 CLEANFILES += _sys_aliases.c
 
-_sys_aliases.c: ${LIBC_RSRCDIR}/Makefile ${LIBCSRCDIR}/sys/Makefile.inc
+_sys_aliases.c: ${SRCDIR}/Makefile ${LIBCSRCDIR}/sys/Makefile.inc
 	echo '#include <sys/cdefs.h>' > ${.TARGET}
 	for fn in ${ASM:R} ${PSEUDO:R} ""; do \
 		case $$fn in ${HIDDEN_SYSCALLS:.o=|}"") : stays hidden ;; \
diff --git a/lib/libpthread/thread/Makefile.inc b/lib/libpthread/thread/Makefile.inc
index 7d9e4a17fa7..074139f176b 100644
--- a/lib/libpthread/thread/Makefile.inc
+++ b/lib/libpthread/thread/Makefile.inc
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile.inc,v 1.4 2002/11/05 22:19:55 marc Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2003/01/20 18:12:11 marc Exp $
 
-.PATH: ${LIBC_RSRCDIR}/thread
+.PATH: ${SRCDIR}/thread
 
 SRCS+=	thread_storage.c thread_malloc_lock.c
diff --git a/lib/libpthread/uthread/Makefile.inc b/lib/libpthread/uthread/Makefile.inc
index b9a005b26fe..4c1c840eee4 100644
--- a/lib/libpthread/uthread/Makefile.inc
+++ b/lib/libpthread/uthread/Makefile.inc
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile.inc,v 1.13 2002/01/18 22:07:27 fgsch Exp $
+# $OpenBSD: Makefile.inc,v 1.14 2003/01/20 18:12:11 marc Exp $
 # $FreeBSD: Makefile.inc,v 1.19 1999/08/28 00:03:19 peter Exp $
 
 # uthread sources
-.PATH: ${LIBC_RSRCDIR}/uthread
+.PATH: ${SRCDIR}/uthread
 
-CFLAGS += -I${LIBC_RSRCDIR}/arch/${MACHINE_ARCH}
+CFLAGS += -I${SRCDIR}/arch/${MACHINE_ARCH}
 
 SRCS+= \
 	uthread_accept.c \