For now... libpthread is just a container directory, since all the new

goop is in librthread.  As a result, the top-level Makefile and
shlib_version here are simply very confusing and tell lies.  Remove
them, and update the instructions in libc to not make my mistake
again.
ok guenther

2 files changed, 0 insertions, 38 deletions

diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile
deleted file mode 100644
index 6946dc8c4d3..00000000000
--- a/lib/libpthread/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#	$OpenBSD: Makefile,v 1.23 2005/11/24 20:49:20 deraadt Exp $
-
-#
-# The pthread library is formed from the FreeBSD uthread sources of 
-# libc_r, and exploits weak symbols in libc.
-#
-
-SRCDIR=		${.CURDIR}
-LIBCSRCDIR=	${.CURDIR}/../libc
-
-LIB=		pthread
-WANTLINT=
-LINTFLAGS=	-z
-CFLAGS+=	-DPTHREAD_KERNEL -D_POSIX_THREADS -D_THREAD_SAFE -Wall
-CFLAGS+=	-Wpointer-arith -Wwrite-strings -Wstrict-prototypes
-CFLAGS+=	-Wmissing-prototypes -Wsign-compare # -Werror
-CFLAGS+=	-I${SRCDIR}/uthread
-CFLAGS+=	-I${SRCDIR}/include
-CFLAGS+=	-I${LIBCSRCDIR}/include
-AINC+=		-I${SRCDIR}/uthread
-
-# Uncomment this if you want libpthread to contain debug information for
-# thread locking.
-CFLAGS+=	-D_LOCK_DEBUG
-#DEBUG=		-g
-
-# enable extra internal consistency checks
-CFLAGS+=	-D_PTHREADS_INVARIANTS
-
-.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.lib.mk>
diff --git a/lib/libpthread/shlib_version b/lib/libpthread/shlib_version
deleted file mode 100644
index 9c18c67a61b..00000000000
--- a/lib/libpthread/shlib_version
+++ /dev/null
@@ -1,2 +0,0 @@
-major=13
-minor=3