clean. define LIBC_RSRCDIR for lipthread (ugh)

1 files changed, 21 insertions, 43 deletions

diff --git a/lib/libc_r/Makefile b/lib/libc_r/Makefile
index 814a49ed975..53931928187 100644
--- a/lib/libc_r/Makefile
+++ b/lib/libc_r/Makefile
@@ -1,64 +1,42 @@
-#	$OpenBSD: Makefile,v 1.9 1999/11/28 11:32:55 d Exp $
-#
-# All library objects contain sccsid strings by default; they may be
-# excluded as a space-saving measure.  To produce a library that does
-# not contain these strings, delete -DLIBC_SCCS and -DSYSLIBC_SCCS
-# from CFLAGS below.  To remove these strings from just the system call
-# stubs, remove just -DSYSLIBC_SCCS from CFLAGS.
-#
-# The NLS (message catalog) functions are always in libc.  To choose that
-# strerror(), perror(), strsignal(), psignal(), etc. actually call the NLS
-# functions, put -DNLS on the CFLAGS line below.
-#
-# The YP functions are always in libc. To choose that getpwent() and friends
-# actually call the YP functions, put -DYP on the CFLAGS line below.
+#	$OpenBSD: Makefile,v 1.10 2000/01/06 07:09:36 d Exp $
+
+# After OpenBSD 2.7, libc_r will be depreceated and replaced by libpthread.
+# See also comments in ../libc/Makefile.
 
 .include <bsd.own.mk>
 
-#DEBUG=		-ggdb -Wall
+LIBCSRCDIR = ${.CURDIR}/../libc
+LIBC_RSRCDIR = ${.CURDIR}
+
 LIB=		c_r
 LINTFLAGS=	-z
 CFLAGS+=	-DPTHREAD_KERNEL -D_POSIX_THREADS -D_THREAD_SAFE 
 CFLAGS+=	-D_PTHREADS_INVARIANTS
-CFLAGS+=	-DNOPOLL -I${.CURDIR}/uthread
-CFLAGS+=	-I${.CURDIR}/include
+CFLAGS+=	-DNOPOLL -I${LIBC_RSRCDIR}/uthread
+CFLAGS+=	-I${LIBC_RSRCDIR}/include
+CFLAGS+=	-I${LIBCSRCDIR}/include
 
 # Uncomment this if you want libc_r to contain debug information for
 # thread locking.
 CFLAGS+=	-D_LOCK_DEBUG
+#DEBUG=		-ggdb -Wall
 
-#
-# This is a list of syscalls that are renamed as _thread_sys_{syscall}
-# so that libc_r can provide replacement functions.
-#
-HIDDEN_SYSCALLS= accept.o bind.o close.o connect.o dup.o dup2.o \
-	execve.o fchflags.o fchmod.o fchown.o fcntl.o \
-	flock.o fpathconf.o fstat.o fstatfs.o fsync.o getdirentries.o \
-	getlogin.o getpeername.o getsockname.o getsockopt.o ioctl.o listen.o \
-	msync.o nanosleep.o open.o pipe.o poll.o read.o readv.o recvfrom.o \
-	recvmsg.o sched_yield.o select.o sendmsg.o sendto.o \
-	setsockopt.o shutdown.o sigaction.o sigaltstack.o \
-	sigprocmask.o sigsuspend.o \
-	socket.o socketpair.o wait4.o write.o writev.o \
-	_exit.o 
-
-.include "${.CURDIR}/uthread/Makefile.inc"
-
-LIBCSRCDIR = ${.CURDIR}/../libc
 .include "${LIBCSRCDIR}/Makefile.inc"
 
-# libc man pages built/installed by libc
+# annul man pages that are built/installed by libc
 MAN=
 MLINKS=
 
-.include "${.CURDIR}/man/Makefile.inc"
-.include "${.CURDIR}/sys/Makefile.inc"
-
-AINC+=	-I${.CURDIR}/uthread
+# XXX bogus version number!
+SHLIB_MAJOR != . ${LIBC_RSRCDIR}/shlib_version ; echo $$major
+SHLIB_MINOR != . ${LIBC_RSRCDIR}/shlib_version ; echo $$minor
 
-SHLIB_MAJOR != . ${LIBCSRCDIR}/shlib_version ; echo $$major
-SHLIB_MINOR != . ${LIBCSRCDIR}/shlib_version ; echo $$minor
+AINC+=	-I${LIBC_RSRCDIR}/uthread
 
-.include "${.CURDIR}/include/Makefile.inc"
+.include "${LIBC_RSRCDIR}/uthread/Makefile.inc"
+.include "${LIBC_RSRCDIR}/sys/Makefile.inc"
+.include "${LIBC_RSRCDIR}/thread/Makefile.inc"
+.include "${LIBC_RSRCDIR}/man/Makefile.inc"
+.include "${LIBC_RSRCDIR}/include/Makefile.inc"
 
 .include <bsd.lib.mk>