Changed all paths to be relative to src/lib instead of src/lib/libc

so that all these makefiles can be used to build libc_r too. Added .if ${LIB} == "c" tests to restrict man page builds to libc to avoid needlessly building them with libc_r too. Split libc Makefile into Makefile and Makefile.inc to allow the libc_r Makefile to include Makefile.inc too.
svn path=/head/; revision=25401
1997-05-03 03:50:06 +00:00 · 1997-05-03 03:50:06 +00:00 · 870039320f · 2020-12-20 02:59:44 +00:00
commit 870039320f
parent 85351f7d5a
27 changed files with 203 additions and 98 deletions
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@ -1,4 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
+#	$Id$
 #
 # All library objects contain rcsid strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@ -14,27 +15,10 @@ CLEANFILES+=tags
 INSTALL_PIC_ARCHIVE=	yes
 PRECIOUSLIB=	yes

-.include "${.CURDIR}/db/Makefile.inc"
-.include "${.CURDIR}/compat-43/Makefile.inc"
-.include "${.CURDIR}/gen/Makefile.inc"
-.include "${.CURDIR}/gmon/Makefile.inc"
-.include "${.CURDIR}/locale/Makefile.inc"
-.include "${.CURDIR}/net/Makefile.inc"
-.include "${.CURDIR}/nls/Makefile.inc"
-.include "${.CURDIR}/quad/Makefile.inc"
-.include "${.CURDIR}/regex/Makefile.inc"
-.include "${.CURDIR}/stdio/Makefile.inc"
-.include "${.CURDIR}/stdlib/Makefile.inc"
-.include "${.CURDIR}/stdtime/Makefile.inc"
-.include "${.CURDIR}/string/Makefile.inc"
-.include "${.CURDIR}/sys/Makefile.inc"
-.include "${.CURDIR}/rpc/Makefile.inc"
-.include "${.CURDIR}/xdr/Makefile.inc"
-.if !defined(NO_YP_LIBC)
-CFLAGS+= -DYP
-.include "${.CURDIR}/yp/Makefile.inc"
-.endif
-.include "${.CURDIR}/${MACHINE}/sys/Makefile.inc"
+#
+# Include make rules that are shared with libc_r.
+#
+.include "${.CURDIR}/Makefile.inc"

 KQSRCS=	adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \
 	lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \
--- a/lib/libc/Makefile.inc
+++ b/lib/libc/Makefile.inc
@ -0,0 +1,25 @@
+#	$Id$
+#
+# This file contains make rules that are shared by libc and libc_r.
+#
+.include "${.CURDIR}/../libc/db/Makefile.inc"
+.include "${.CURDIR}/../libc/compat-43/Makefile.inc"
+.include "${.CURDIR}/../libc/gen/Makefile.inc"
+.include "${.CURDIR}/../libc/gmon/Makefile.inc"
+.include "${.CURDIR}/../libc/locale/Makefile.inc"
+.include "${.CURDIR}/../libc/net/Makefile.inc"
+.include "${.CURDIR}/../libc/nls/Makefile.inc"
+.include "${.CURDIR}/../libc/quad/Makefile.inc"
+.include "${.CURDIR}/../libc/regex/Makefile.inc"
+.include "${.CURDIR}/../libc/stdio/Makefile.inc"
+.include "${.CURDIR}/../libc/stdlib/Makefile.inc"
+.include "${.CURDIR}/../libc/stdtime/Makefile.inc"
+.include "${.CURDIR}/../libc/string/Makefile.inc"
+.include "${.CURDIR}/../libc/sys/Makefile.inc"
+.include "${.CURDIR}/../libc/rpc/Makefile.inc"
+.include "${.CURDIR}/../libc/xdr/Makefile.inc"
+.if !defined(NO_YP_LIBC)
+CFLAGS+= -DYP
+.include "${.CURDIR}/../libc/yp/Makefile.inc"
+.endif
+.include "${.CURDIR}/../libc/${MACHINE}/sys/Makefile.inc"
--- a/lib/libc/amd64/sys/Makefile.inc
+++ b/lib/libc/amd64/sys/Makefile.inc
@ -1,10 +1,13 @@
 #	from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp
-#	$Id$
+#	$Id: Makefile.inc,v 1.4 1997/02/22 14:59:27 peter Exp $

-.PATH:	${.CURDIR}/${MACHINE}/sys
+.PATH:	${.CURDIR}/../libc/${MACHINE}/sys

 SRCS+=	i386_get_ldt.c i386_set_ldt.c

+# Only build man pages with libc.
+.if ${LIB} == "c"
 MAN2+=	i386/sys/i386_get_ldt.2

 MLINKS+=i386_get_ldt.2 i386_set_ldt.2
+.endif
--- a/lib/libc/compat-43/Makefile.inc
+++ b/lib/libc/compat-43/Makefile.inc
@ -1,11 +1,14 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/2/93
+#	$Id$

 # compat-43 sources
-.PATH: ${.CURDIR}/${MACHINE}/compat-43 ${.CURDIR}/compat-43
+.PATH: ${.CURDIR}/../libc/${MACHINE}/compat-43 ${.CURDIR}/../libc/compat-43

 SRCS+=	creat.c gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \
 	setrgid.c setruid.c sigcompat.c

+# Only build man pages with libc.
+.if ${LIB} == "c"
 MAN2+=	compat-43/creat.2 compat-43/killpg.2 \
 	compat-43/sigblock.2 \
 	compat-43/sigpause.2 compat-43/sigsetmask.2 compat-43/sigvec.2
@ -14,3 +17,4 @@ MAN3+=  compat-43/gethostid.3 compat-43/setruid.3

 MLINKS+=setruid.3 setrgid.3
 MLINKS+=gethostid.3 sethostid.3
+.endif
--- a/lib/libc/db/Makefile.inc
+++ b/lib/libc/db/Makefile.inc
@ -1,10 +1,11 @@
-#	@(#)Makefile.inc	8.2 (Berkeley) 2/21/94
+#	from @(#)Makefile.inc	8.2 (Berkeley) 2/21/94
+#	$Id$
 #
 CFLAGS+=-D__DBINTERFACE_PRIVATE

-.include "${.CURDIR}/db/btree/Makefile.inc"
-.include "${.CURDIR}/db/db/Makefile.inc"
-.include "${.CURDIR}/db/hash/Makefile.inc"
-.include "${.CURDIR}/db/man/Makefile.inc"
-.include "${.CURDIR}/db/mpool/Makefile.inc"
-.include "${.CURDIR}/db/recno/Makefile.inc"
+.include "${.CURDIR}/../libc/db/btree/Makefile.inc"
+.include "${.CURDIR}/../libc/db/db/Makefile.inc"
+.include "${.CURDIR}/../libc/db/hash/Makefile.inc"
+.include "${.CURDIR}/../libc/db/man/Makefile.inc"
+.include "${.CURDIR}/../libc/db/mpool/Makefile.inc"
+.include "${.CURDIR}/../libc/db/recno/Makefile.inc"
--- a/lib/libc/db/btree/Makefile.inc
+++ b/lib/libc/db/btree/Makefile.inc
@ -1,6 +1,7 @@
-#	@(#)Makefile.inc	8.2 (Berkeley) 7/14/94
+#	from @(#)Makefile.inc	8.2 (Berkeley) 7/14/94
+#	$Id$

-.PATH: ${.CURDIR}/db/btree
+.PATH: ${.CURDIR}/../libc/db/btree

 SRCS+=	bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c bt_open.c \
 	bt_overflow.c bt_page.c bt_put.c bt_search.c bt_seq.c bt_split.c \
--- a/lib/libc/db/db/Makefile.inc
+++ b/lib/libc/db/db/Makefile.inc
@ -1,5 +1,6 @@
-#       @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	$Id$

-.PATH: ${.CURDIR}/db/db
+.PATH: ${.CURDIR}/../libc/db/db

 SRCS+=	db.c
--- a/lib/libc/db/hash/Makefile.inc
+++ b/lib/libc/db/hash/Makefile.inc
@ -1,6 +1,7 @@
-#       @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	$Id$

-.PATH: ${.CURDIR}/db/hash
+.PATH: ${.CURDIR}/../libc/db/hash

 SRCS+=	hash.c hash_bigkey.c hash_buf.c hash_func.c hash_log2.c \
 	hash_page.c hsearch.c ndbm.c
--- a/lib/libc/db/man/Makefile.inc
+++ b/lib/libc/db/man/Makefile.inc
@ -1,8 +1,12 @@
-#       @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	#Id$

-.PATH: ${.CURDIR}/db/man
+.PATH: ${.CURDIR}/../libc/db/man

+# Only build man pages with libc.
+.if ${LIB} == "c"
 # mpool.3
 MAN3+=	db/man/btree.3 db/man/dbopen.3 db/man/hash.3 db/man/recno.3
 MAN3+=	db/man/mpool.3
 MLINKS+= dbopen.3 db.3
+.endif
--- a/lib/libc/db/mpool/Makefile.inc
+++ b/lib/libc/db/mpool/Makefile.inc
@ -1,5 +1,6 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	$Id$

-.PATH: ${.CURDIR}/db/mpool
+.PATH: ${.CURDIR}/../libc/db/mpool

 SRCS+=	mpool.c
--- a/lib/libc/db/recno/Makefile.inc
+++ b/lib/libc/db/recno/Makefile.inc
@ -1,6 +1,7 @@
-#       @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	$Id$

-.PATH: ${.CURDIR}/db/recno
+.PATH: ${.CURDIR}/../libc/db/recno

 SRCS+=	rec_close.c rec_delete.c rec_get.c rec_open.c rec_put.c rec_search.c \
 	rec_seq.c rec_utils.c
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@ -2,7 +2,7 @@
 #	$Id: Makefile.inc,v 1.31 1997/04/13 15:12:14 davidn Exp $

 # machine-independent gen sources
-.PATH: ${.CURDIR}/${MACHINE}/gen ${.CURDIR}/gen
+.PATH: ${.CURDIR}/../libc/${MACHINE}/gen ${.CURDIR}/../libc/gen

 SRCS+=	alarm.c assert.c clock.c closedir.c config.c confstr.c crypt.c \
 	ctermid.c daemon.c devname.c disklabel.c err.c errlst.c \
@ -27,16 +27,18 @@ SRCS+=	_rand48.c drand48.c erand48.c jrand48.c lcong48.c lrand48.c \
 	mrand48.c nrand48.c seed48.c srand48.c

 # machine-dependent gen sources
-.include "${.CURDIR}/${MACHINE}/gen/Makefile.inc"
+.include "${.CURDIR}/../libc/${MACHINE}/gen/Makefile.inc"

 .if (${MACHINE} == "tahoe" || ${MACHINE} == "vax")
 errlst.o errlst.po:
 	${CC} -S ${CFLAGS} ${.IMPSRC}
-	ed - < ${.CURDIR}/${MACHINE}/:errfix errlst.s
+	ed - < ${.CURDIR}/../libc/${MACHINE}/:errfix errlst.s
 	${AS} -o ${.TARGET} errlst.s
 	rm -f errlst.s
 .endif

+# Only build man pages with libc.
+.if ${LIB} == "c"
 MAN3+=	gen/alarm.3 gen/clock.3 gen/confstr.3 gen/config_open.3 \
 	gen/crypt.3 gen/ctermid.3 \
 	gen/daemon.3 gen/devname.3 gen/directory.3 gen/err.3 gen/exec.3 \
@ -123,3 +125,4 @@ MLINKS+=vis.3 strvis.3 vis.3 strvisx.3
 MLINKS+=unvis.3 strunvis.3 
 MLINKS+=fts.3 fts_open.3 fts.3 fts_read.3 fts.3 fts_children.3 \
 	fts.3 fts_close.3 fts.3 fts_set.3
+.endif
--- a/lib/libc/gmon/Makefile.inc
+++ b/lib/libc/gmon/Makefile.inc
@ -1,11 +1,16 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	$Id$

 # gmon sources
-.PATH: ${.CURDIR}/gmon
+.PATH: ${.CURDIR}/../libc/gmon

 SRCS+=	gmon.c mcount.c
+
+# Only build man pages with libc.
+.if ${LIB} == "c"
 MAN3+=	gmon/moncontrol.3
 MLINKS+= moncontrol.3 monstartup.3
+.endif

 # mcount cannot be compiled with profiling
 mcount.po: mcount.o
--- a/lib/libc/i386/sys/Makefile.inc
+++ b/lib/libc/i386/sys/Makefile.inc
@ -1,10 +1,13 @@
 #	from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp
-#	$Id$
+#	$Id: Makefile.inc,v 1.4 1997/02/22 14:59:27 peter Exp $

-.PATH:	${.CURDIR}/${MACHINE}/sys
+.PATH:	${.CURDIR}/../libc/${MACHINE}/sys

 SRCS+=	i386_get_ldt.c i386_set_ldt.c

+# Only build man pages with libc.
+.if ${LIB} == "c"
 MAN2+=	i386/sys/i386_get_ldt.2

 MLINKS+=i386_get_ldt.2 i386_set_ldt.2
+.endif
--- a/lib/libc/locale/Makefile.inc
+++ b/lib/libc/locale/Makefile.inc
@ -1,13 +1,16 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	$Id$

 # locale sources
-.PATH: ${.CURDIR}/${MACHINE}/locale ${.CURDIR}/locale
+.PATH: ${.CURDIR}/../libc/${MACHINE}/locale ${.CURDIR}/../libc/locale

 SRCS+=	ansi.c ctype.c euc.c frune.c isctype.c lconv.c localeconv.c \
 	mbrune.c none.c rune.c setlocale.c table.c utf2.c setrunelocale.c \
 	runetype.c tolower.c toupper.c nomacros.c collate.c setinvalidrune.c \
 	collcmp.c

+# Only build man pages with libc.
+.if ${LIB} == "c"
 MAN3+=	locale/ctype.3 locale/isalnum.3 locale/isalpha.3 locale/isascii.3 \
 	locale/isblank.3 locale/iscntrl.3 locale/isdigit.3 locale/isgraph.3 \
 	locale/islower.3 locale/isprint.3 locale/ispunct.3 locale/isspace.3 \
@ -20,3 +23,4 @@ MLINKS+= rune.3 setrunelocale.3 rune.3 setinvalidrune.3 rune.3 sgetrune.3 \
 	 rune.3 fputrune.3 mbrune.3 mbrrune.3 mbrune.3 mbmb.3 \
 	 multibyte.3 mblen.3 multibyte.3 mbstowcs.3 multibyte.3 mbtowc.3 \
 	 multibyte.3 wcstombs.3 multibyte.3 wctomb.3 setlocale.3 localeconv.3
+.endif
--- a/lib/libc/net/Makefile.inc
+++ b/lib/libc/net/Makefile.inc
@ -1,7 +1,8 @@
-#	@(#)Makefile.inc	8.2 (Berkeley) 9/5/93
+#	from @(#)Makefile.inc	8.2 (Berkeley) 9/5/93
+#	$Id$

 # machine-independent net sources
-.PATH: ${.CURDIR}/${MACHINE}/net ${.CURDIR}/net
+.PATH: ${.CURDIR}/../libc/${MACHINE}/net ${.CURDIR}/../libc/net

 SRCS+=	addr2ascii.c ascii2addr.c base64.c \
 	gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \
@ -18,8 +19,10 @@ SRCS+=	addr2ascii.c ascii2addr.c base64.c \
 # iso_addr.c 

 # machine-dependent net sources
-.include "${.CURDIR}/${MACHINE}/net/Makefile.inc"
+.include "${.CURDIR}/../libc/${MACHINE}/net/Makefile.inc"

+# Only build man pages with libc.
+.if ${LIB} == "c"
 MAN3+=	net/addr2ascii.3 \
 	net/byteorder.3 net/ethers.3 net/gethostbyname.3 net/getnetent.3 \
 	net/getprotoent.3 net/getservent.3 net/inet.3 net/linkaddr.3 \
@ -51,3 +54,4 @@ MLINKS+=rcmd.3 rresvport.3 rcmd.3 iruserok.3 rcmd.3 ruserok.3
 MLINKS+=resolver.3 dn_comp.3 resolver.3 dn_expand.3 resolver.3 res_init.3 \
 	resolver.3 res_mkquery.3 resolver.3 res_send.3 resolver.3 res_query.3 \
 	resolver.3 res_search.3
+.endif
--- a/lib/libc/nls/Makefile.inc
+++ b/lib/libc/nls/Makefile.inc
@ -1,6 +1,11 @@
-#	$NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $
+#	from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $
+#	$Id$

-.PATH: ${.CURDIR}/nls
+.PATH: ${.CURDIR}/../libc/nls

 SRCS+=	catclose.c catgets.c catopen.c msgcat.c
+
+# Only build man pages with libc.
+.if ${LIB} == "c"
 MAN3+=  nls/catclose.3 nls/catgets.3 nls/catopen.3
+.endif
--- a/lib/libc/quad/Makefile.inc
+++ b/lib/libc/quad/Makefile.inc
@ -1,4 +1,5 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	$Id$

 # Quad support, if needed

@ -16,4 +17,4 @@ SRCS+=	adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c fixdfdi.c \

 .endif

-.PATH: ${.CURDIR}/${MACHINE}/quad ${.CURDIR}/quad
+.PATH: ${.CURDIR}/../libc/${MACHINE}/quad ${.CURDIR}/../libc/quad
--- a/lib/libc/regex/Makefile.inc
+++ b/lib/libc/regex/Makefile.inc
@ -1,14 +1,18 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
+#	$Id$

 # regex sources
-.PATH: ${.CURDIR}/regex
+.PATH: ${.CURDIR}/../libc/regex

 CFLAGS+=-DPOSIX_MISTAKE

 SRCS+=	regcomp.c regerror.c regexec.c regfree.c

+# Only build man pages with libc.
+.if ${LIB} == "c"
 MAN3+=	regex/regex.3
 MAN7+=	regex/re_format.7

 MLINKS+=regex.3 regcomp.3 regex.3 regexec.3 regex.3 regerror.3
 MLINKS+=regexec.3 regfree.3
+.endif
--- a/lib/libc/rpc/Makefile.inc
+++ b/lib/libc/rpc/Makefile.inc
@ -1,6 +1,7 @@
-#	@(#)Makefile	5.11 (Berkeley) 9/6/90
+#	from @(#)Makefile	5.11 (Berkeley) 9/6/90
+#	$Id$

-.PATH: ${.CURDIR}/rpc ${.CURDIR}/.
+.PATH: ${.CURDIR}/../libc/rpc ${.CURDIR}/.
 SRCS+=	auth_none.c auth_unix.c  authunix_prot.c bindresvport.c \
 	clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c clnt_tcp.c \
 	clnt_udp.c rpc_dtablesize.c get_myaddress.c getrpcent.c getrpcport.c \
@ -9,6 +10,8 @@ SRCS+=	auth_none.c auth_unix.c  authunix_prot.c bindresvport.c \
 	svc.c svc_auth.c svc_auth_unix.c svc_raw.c svc_run.c svc_simple.c \
 	svc_tcp.c svc_udp.c

+# Only build man pages with libc.
+.if ${LIB} == "c"
 #
 # XXX -- rstat.1 and rstat_svc.8 shouldn't really be here
 #        but there's no rstat command, don't know why, so I'm
@ -90,3 +93,4 @@ MLINKS+=	getrpcent.3 getrpcbyname.3 \
 		rpc.3 xprt_unregister.3 \

 MLINKS+=getrpcent.3 getrpcbyname.3 getrpcent.3 getrpcbynumber.3
+.endif
--- a/lib/libc/stdio/Makefile.inc
+++ b/lib/libc/stdio/Makefile.inc
@ -1,8 +1,8 @@
 #	@(#)Makefile.inc	8.3 (Berkeley) 4/17/94
-#	$Id$
+#	$Id: Makefile.inc,v 1.8 1997/02/22 15:01:45 peter Exp $

 # stdio sources
-.PATH: ${.CURDIR}/stdio
+.PATH: ${.CURDIR}/../libc/stdio

 SRCS+=	asprintf.c clrerr.c fclose.c fdopen.c feof.c ferror.c fflush.c \
 	fgetc.c fgetln.c fgetpos.c fgets.c fileno.c findfp.c flags.c fopen.c \
@ -15,6 +15,8 @@ SRCS+=	asprintf.c clrerr.c fclose.c fdopen.c feof.c ferror.c fflush.c \
 	vfprintf.c vfscanf.c vprintf.c vscanf.c vsnprintf.c vsprintf.c \
 	vsscanf.c wbuf.c wsetup.c

+# Only build man pages with libc.
+.if ${LIB} == "c"
 MAN3+=	stdio/fclose.3 stdio/ferror.3 stdio/fflush.3 stdio/fgetln.3 \
 	stdio/fgets.3 stdio/fopen.3 stdio/fputs.3 stdio/fread.3 stdio/fseek.3 \
 	stdio/funopen.3 stdio/getc.3 stdio/mktemp.3 stdio/printf.3 \
@ -39,3 +41,4 @@ MLINKS+=scanf.3 fscanf.3 scanf.3 sscanf.3 scanf.3 vfscanf.3 scanf.3 vscanf.3 \
 	scanf.3 vsscanf.3
 MLINKS+=setbuf.3 setbuffer.3 setbuf.3 setlinebuf.3 setbuf.3 setvbuf.3
 MLINKS+=tmpnam.3 tempnam.3 tmpnam.3 tmpfile.3
+.endif
--- a/lib/libc/stdlib/Makefile.inc
+++ b/lib/libc/stdlib/Makefile.inc
@ -1,7 +1,8 @@
-#	@(#)Makefile.inc	8.3 (Berkeley) 2/4/95
+#	from @(#)Makefile.inc	8.3 (Berkeley) 2/4/95
+#	$Id$

 # machine-independent stdlib sources
-.PATH: ${.CURDIR}/${MACHINE}/stdlib ${.CURDIR}/stdlib
+.PATH: ${.CURDIR}/../libc/${MACHINE}/stdlib ${.CURDIR}/../libc/stdlib

 SRCS+=	abort.c atexit.c atof.c atoi.c atol.c bsearch.c calloc.c div.c \
 	exit.c getenv.c getopt.c getsubopt.c strhash.c heapsort.c labs.c \
@ -10,8 +11,10 @@ SRCS+=	abort.c atexit.c atof.c atoi.c atol.c bsearch.c calloc.c div.c \
 	strtouq.c system.c

 # machine-dependent stdlib sources
-.include "${.CURDIR}/${MACHINE}/stdlib/Makefile.inc"
+.include "${.CURDIR}/../libc/${MACHINE}/stdlib/Makefile.inc"

+# Only build man pages with libc.
+.if ${LIB} == "c"
 MAN3+=	stdlib/abort.3 stdlib/abs.3 stdlib/alloca.3 stdlib/atexit.3 \
 	stdlib/atof.3 stdlib/atoi.3 stdlib/atol.3 stdlib/bsearch.3 \
 	stdlib/calloc.3 stdlib/div.3 stdlib/exit.3 \
@ -29,3 +32,4 @@ MLINKS+=random.3 initstate.3 random.3 setstate.3 random.3 srandom.3 \
 MLINKS+=strtol.3 strtoq.3
 MLINKS+=strtoul.3 strtouq.3
 MLINKS+=malloc.3 free.3 malloc.3 realloc.3
+.endif
--- a/lib/libc/stdtime/Makefile.inc
+++ b/lib/libc/stdtime/Makefile.inc
@ -1,11 +1,16 @@
 #	Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp
+#	$Id$

-.PATH:	${.CURDIR}/stdtime
+.PATH:	${.CURDIR}/../libc/stdtime

 SRCS+=	asctime.c localtime.c strftime.c difftime.c
+
+# Only build man pages with libc.
+.if ${LIB} == "c"
 MAN5+=	stdtime/tzfile.5
 MAN3+=	stdtime/ctime.3 stdtime/strftime.3 stdtime/time2posix.3

 MLINKS+=ctime.3 asctime.3 ctime.3 difftime.3 ctime.3 gmtime.3 \
 	ctime.3 localtime.3 ctime.3 mktime.3
 MLINKS+=time2posix.3 posix2time.3
+.endif
--- a/lib/libc/string/Makefile.inc
+++ b/lib/libc/string/Makefile.inc
@ -1,15 +1,15 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-#	$Id$
+#	$Id: Makefile.inc,v 1.9 1997/02/22 15:03:21 peter Exp $

-.PATH: ${.CURDIR}/${MACHINE}/string ${.CURDIR}/string
+.PATH: ${.CURDIR}/../libc/${MACHINE}/string ${.CURDIR}/../libc/string

-CFLAGS += -I${.CURDIR}/locale
+CFLAGS += -I${.CURDIR}/../libc/locale
 # machine-independent string sources
 SRCS+=	memccpy.c strcasecmp.c strcoll.c strdup.c strerror.c \
 	strmode.c strtok.c strxfrm.c

 # machine-dependent string sources
-.include "${.CURDIR}/${MACHINE}/string/Makefile.inc"
+.include "${.CURDIR}/../libc/${MACHINE}/string/Makefile.inc"

 # If no machine specific bzero(3), build one out of memset(3).
 .if empty(SRCS:Mbzero.S)
@ -81,6 +81,8 @@ strrchr.po: rindex.c
 	@mv -f a.out ${.TARGET}
 .endif
 #
+# Only build man pages with libc.
+.if ${LIB} == "c"
 MAN3+=	string/bcmp.3 string/bcopy.3 string/bstring.3 string/bzero.3 \
 	string/ffs.3 string/index.3 string/memccpy.3 string/memchr.3 \
 	string/memcmp.3 string/memcpy.3 string/memmove.3 string/memset.3 \
@ -96,3 +98,4 @@ MLINKS+=strcat.3 strncat.3
 MLINKS+=strcmp.3 strncmp.3
 MLINKS+=strcpy.3 strncpy.3
 MLINKS+=strerror.3 perror.3 strerror.3 sys_errlist.3 strerror.3 sys_nerr.3
+.endif
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@ -1,8 +1,8 @@
 #	@(#)Makefile.inc	8.3 (Berkeley) 10/24/94
-#	$Id: Makefile.inc,v 1.27 1997/04/01 23:07:55 ache Exp $
+#	$Id: Makefile.inc,v 1.28 1997/04/23 10:49:54 bde Exp $

 # sys sources
-.PATH: ${.CURDIR}/${MACHINE}/sys ${.CURDIR}/sys
+.PATH: ${.CURDIR}/../libc/${MACHINE}/sys ${.CURDIR}/../libc/sys

 # modules with non-default implementations on at least one architecture:
 SRCS+=	Ovfork.S brk.S cerror.S exect.S fork.S pipe.S ptrace.S reboot.S \
@ -13,48 +13,74 @@ SRCS+=	Ovfork.S brk.S cerror.S exect.S fork.S pipe.S ptrace.S reboot.S \
 SRCS+=	ftruncate.c lseek.c mmap.c truncate.c

 # modules with default implementations on all architectures:
-ASM=	accept.o access.o acct.o adjtime.o bind.o chdir.o chflags.o chmod.o \
-	chown.o chroot.o close.o connect.o dup.o dup2.o execve.o fchdir.o \
-	fchflags.o fchmod.o fchown.o fcntl.o flock.o fpathconf.o fstat.o \
-	fstatfs.o fsync.o getdirentries.o getdtablesize.o getegid.o \
+ASM=	access.o acct.o adjtime.o chdir.o chflags.o chmod.o \
+	chown.o chroot.o \
+	getdtablesize.o getegid.o \
 	geteuid.o getfh.o getfsstat.o getgid.o getgroups.o getitimer.o \
-	getpeername.o getpgrp.o getpid.o getppid.o getpriority.o \
-	getrlimit.o getrusage.o getsockname.o getsockopt.o gettimeofday.o \
-	getuid.o ioctl.o issetugid.o kill.o ktrace.o lchown.o \
+	getpgrp.o getpid.o getppid.o getpriority.o \
+	getrlimit.o getrusage.o gettimeofday.o \
+	getuid.o issetugid.o kill.o ktrace.o lchown.o \
 	lfs_bmapv.o lfs_markv.o \
-	lfs_segclean.o lfs_segwait.o link.o listen.o lstat.o \
-	madvise.o mincore.o minherit.o mkdir.o mkfifo.o mknod.o mlock.o \
+	lfs_segclean.o lfs_segwait.o link.o lstat.o \
+	madvise.o mincore.o minherit.o mkdir.o mlock.o \
 	mount.o \
-	mprotect.o msgsys.o msync.o munlock.o munmap.o nfssvc.o \
-	ntp_adjtime.o open.o pathconf.o profil.o quotactl.o read.o \
-	readlink.o readv.o recvfrom.o recvmsg.o rename.o revoke.o rmdir.o \
-	rtprio.o select.o semsys.o sendmsg.o sendto.o setegid.o seteuid.o \
+	mprotect.o msgsys.o msync.o munlock.o munmap.o \
+	ntp_adjtime.o pathconf.o profil.o quotactl.o \
+	readlink.o rename.o revoke.o rmdir.o \
+	rtprio.o semsys.o setegid.o seteuid.o \
 	setgid.o \
 	setgroups.o setitimer.o	setpgid.o setpriority.o	\
 	setregid.o setreuid.o setrlimit.o \
-	setsid.o setsockopt.o settimeofday.o setuid.o shmsys.o shutdown.o \
-	sigaction.o sigaltstack.o socket.o socketpair.o stat.o statfs.o \
+	setsid.o settimeofday.o setuid.o shmsys.o \
+	stat.o statfs.o \
 	swapon.o symlink.o sync.o sysarch.o \
 	umask.o undelete.o unlink.o unmount.o utimes.o utrace.o \
-	vadvise.o wait4.o write.o writev.o __syscall.o __sysctl.o
+	vadvise.o __syscall.o __sysctl.o

-PSEUDO=	_exit.o _getlogin.o
+# Syscalls renamed as _thread_sys_{syscall} when building libc_r.
+ASMR=	accept.o bind.o close.o connect.o dup.o dup2.o \
+	execve.o fchdir.o fchflags.o fchmod.o fchown.o fcntl.o \
+	flock.o fpathconf.o fstat.o fstatfs.o fsync.o getdirentries.o \
+	getpeername.o getsockname.o getsockopt.o ioctl.o listen.o \
+	mkfifo.o mknod.o nfssvc.o open.o read.o readv.o recvfrom.o \
+	recvmsg.o select.o sendmsg.o sendto.o setsockopt.o \
+	shutdown.o sigaction.o sigaltstack.o socket.o socketpair.o \
+	wait4.o write.o writev.o

-OBJS+=	${ASM} ${PSEUDO}
+PSEUDO=	_getlogin.o
+
+# Pseudo syscalls that are renamed as _thread_sys_{pseudo} when
+# building libc_r.
+PSEUDOR=	_exit.o
+
+OBJS+=	${ASM} ${ASMR} ${PSEUDO} ${PSEUDOR}

 SASM=	${ASM:S/.o/.S/}

+SASMR=	${ASMR:S/.o/.S/}
+
 SPSEUDO= ${PSEUDO:S/.o/.S/}

-SRCS+=	${SASM} ${SPSEUDO}
+SPSEUDOR= ${PSEUDOR:S/.o/.S/}
+
+SRCS+=	${SASM} ${SASMR} ${SPSEUDO} ${SPSEUDOR}

 ${SASM}:
 	printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' > ${.TARGET}

+${SASMR}:
+	printf '#include "SYS.h"\nPRSYSCALL(${.PREFIX})\n' > ${.TARGET}
+
 ${SPSEUDO}:
 	printf '#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' \
 	    > ${.TARGET}

+${SPSEUDOR}:
+	printf '#include "SYS.h"\nPPSEUDO(${.PREFIX},${.PREFIX:S/_//})\n' \
+	    > ${.TARGET}
+
+# Only build man pages with libc.
+.if ${LIB} == "c"
 MAN2+=	sys/accept.2 sys/access.2 sys/acct.2 sys/adjtime.2 sys/bind.2 \
 	sys/brk.2 sys/chdir.2 sys/chflags.2 sys/chmod.2 sys/chown.2 \
 	sys/chroot.2 sys/close.2 sys/connect.2 sys/dup.2 sys/execve.2 \
@ -116,3 +142,4 @@ MLINKS+=syscall.2 __syscall.2
 MLINKS+=truncate.2 ftruncate.2
 MLINKS+=wait.2 wait3.2 wait.2 wait4.2 wait.2 waitpid.2
 MLINKS+=write.2 writev.2
+.endif
--- a/lib/libc/xdr/Makefile.inc
+++ b/lib/libc/xdr/Makefile.inc
@ -1,9 +1,12 @@
-#	@(#)Makefile	5.11 (Berkeley) 9/6/90
+#	from @(#)Makefile	5.11 (Berkeley) 9/6/90
+#	$Id$

-.PATH: ${.CURDIR}/xdr ${.CURDIR}/.
+.PATH: ${.CURDIR}/../libc/xdr ${.CURDIR}/.
 SRCS+=	xdr.c xdr_array.c xdr_float.c xdr_mem.c \
 	xdr_rec.c xdr_reference.c xdr_stdio.c

+# Only build man pages with libc.
+.if ${LIB} == "c"
 MAN3+=	xdr/xdr.3

 MLINKS+=	xdr.3 xdr_array.3 \
@ -38,3 +41,4 @@ MLINKS+=	xdr.3 xdr_array.3 \
 		xdr.3 xdr_vector.3 \
 		xdr.3 xdr_void.3 \
 		xdr.3 xdr_wrapstring.3
+.endif
--- a/lib/libc/yp/Makefile.inc
+++ b/lib/libc/yp/Makefile.inc
@ -1,8 +1,8 @@
 #	from: @(#)Makefile.inc	5.3 (Berkeley) 2/20/91
-#	$Id$
+#	$Id: Makefile.inc,v 1.4 1997/02/22 15:04:58 peter Exp $

 # yp sources
-.PATH: ${.CURDIR}/yp
+.PATH: ${.CURDIR}/../libc/yp

 SRCS+=		xdryp.c yp_xdr.c yplib.c
 CLEANFILES+=	yp_xdr.c yp.h