From 9e19b4c525251f7c7d87e3df44cc75993a9e7397 Mon Sep 17 00:00:00 2001
From: John Birrell <jb@FreeBSD.org>
Date: Sat, 3 May 1997 04:05:57 +0000
Subject: [PATCH] Nuke makefiles that duplicate those in libc now that libc is
 libc_r aware. This simplifies things for libc_r.

---
 lib/libc_r/compat-43/Makefile.inc   |  7 ---
 lib/libc_r/db/Makefile.inc          |  9 ----
 lib/libc_r/db/btree/Makefile.inc    |  7 ---
 lib/libc_r/db/db/Makefile.inc       |  5 --
 lib/libc_r/db/hash/Makefile.inc     |  6 ---
 lib/libc_r/db/mpool/Makefile.inc    |  5 --
 lib/libc_r/db/recno/Makefile.inc    |  6 ---
 lib/libc_r/gen/Makefile.inc         | 29 ----------
 lib/libc_r/gmon/Makefile.inc        | 10 ----
 lib/libc_r/i386/gen/Makefile.inc    |  5 --
 lib/libc_r/i386/net/Makefile.inc    |  4 --
 lib/libc_r/i386/stdlib/Makefile.inc |  4 --
 lib/libc_r/i386/string/Makefile.inc |  8 ---
 lib/libc_r/i386/sys/Makefile.inc    |  6 ---
 lib/libc_r/locale/Makefile.inc      |  9 ----
 lib/libc_r/net/Makefile.inc         | 20 -------
 lib/libc_r/nls/Makefile.inc         |  5 --
 lib/libc_r/quad/Makefile.inc        | 20 -------
 lib/libc_r/regex/Makefile.inc       |  8 ---
 lib/libc_r/rpc/Makefile.inc         | 10 ----
 lib/libc_r/stdio/Makefile.inc       | 15 ------
 lib/libc_r/stdlib/Makefile.inc      | 13 -----
 lib/libc_r/stdtime/Makefile.inc     |  5 --
 lib/libc_r/string/Makefile.inc      | 82 -----------------------------
 lib/libc_r/xdr/Makefile.inc         |  5 --
 lib/libc_r/yp/Makefile.inc          | 17 ------
 26 files changed, 320 deletions(-)
 delete mode 100644 lib/libc_r/compat-43/Makefile.inc
 delete mode 100644 lib/libc_r/db/Makefile.inc
 delete mode 100644 lib/libc_r/db/btree/Makefile.inc
 delete mode 100644 lib/libc_r/db/db/Makefile.inc
 delete mode 100644 lib/libc_r/db/hash/Makefile.inc
 delete mode 100644 lib/libc_r/db/mpool/Makefile.inc
 delete mode 100644 lib/libc_r/db/recno/Makefile.inc
 delete mode 100644 lib/libc_r/gen/Makefile.inc
 delete mode 100644 lib/libc_r/gmon/Makefile.inc
 delete mode 100644 lib/libc_r/i386/gen/Makefile.inc
 delete mode 100644 lib/libc_r/i386/net/Makefile.inc
 delete mode 100644 lib/libc_r/i386/stdlib/Makefile.inc
 delete mode 100644 lib/libc_r/i386/string/Makefile.inc
 delete mode 100644 lib/libc_r/i386/sys/Makefile.inc
 delete mode 100644 lib/libc_r/locale/Makefile.inc
 delete mode 100644 lib/libc_r/net/Makefile.inc
 delete mode 100644 lib/libc_r/nls/Makefile.inc
 delete mode 100644 lib/libc_r/quad/Makefile.inc
 delete mode 100644 lib/libc_r/regex/Makefile.inc
 delete mode 100644 lib/libc_r/rpc/Makefile.inc
 delete mode 100644 lib/libc_r/stdio/Makefile.inc
 delete mode 100644 lib/libc_r/stdlib/Makefile.inc
 delete mode 100644 lib/libc_r/stdtime/Makefile.inc
 delete mode 100644 lib/libc_r/string/Makefile.inc
 delete mode 100644 lib/libc_r/xdr/Makefile.inc
 delete mode 100644 lib/libc_r/yp/Makefile.inc

diff --git a/lib/libc_r/compat-43/Makefile.inc b/lib/libc_r/compat-43/Makefile.inc
deleted file mode 100644
index 633f6dc7358d..000000000000
--- a/lib/libc_r/compat-43/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/2/93
-
-# compat-43 sources
-.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
diff --git a/lib/libc_r/db/Makefile.inc b/lib/libc_r/db/Makefile.inc
deleted file mode 100644
index dd09d32fdc65..000000000000
--- a/lib/libc_r/db/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-#	@(#)Makefile.inc	8.2 (Berkeley) 2/21/94
-#
-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/mpool/Makefile.inc"
-.include "${.CURDIR}/db/recno/Makefile.inc"
diff --git a/lib/libc_r/db/btree/Makefile.inc b/lib/libc_r/db/btree/Makefile.inc
deleted file mode 100644
index ac1ee475ce46..000000000000
--- a/lib/libc_r/db/btree/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	@(#)Makefile.inc	8.2 (Berkeley) 7/14/94
-
-.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 \
-	bt_utils.c
diff --git a/lib/libc_r/db/db/Makefile.inc b/lib/libc_r/db/db/Makefile.inc
deleted file mode 100644
index 8f16baa9e952..000000000000
--- a/lib/libc_r/db/db/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#       @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-
-.PATH: ${.CURDIR}/../libc/db/db
-
-SRCS+=	db.c
diff --git a/lib/libc_r/db/hash/Makefile.inc b/lib/libc_r/db/hash/Makefile.inc
deleted file mode 100644
index f0c858517c28..000000000000
--- a/lib/libc_r/db/hash/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#       @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-
-.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
diff --git a/lib/libc_r/db/mpool/Makefile.inc b/lib/libc_r/db/mpool/Makefile.inc
deleted file mode 100644
index 6179487bfac9..000000000000
--- a/lib/libc_r/db/mpool/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-
-.PATH: ${.CURDIR}/../libc/db/mpool
-
-SRCS+=	mpool.c
diff --git a/lib/libc_r/db/recno/Makefile.inc b/lib/libc_r/db/recno/Makefile.inc
deleted file mode 100644
index 154999318686..000000000000
--- a/lib/libc_r/db/recno/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#       @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-
-.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
diff --git a/lib/libc_r/gen/Makefile.inc b/lib/libc_r/gen/Makefile.inc
deleted file mode 100644
index 7799b3563168..000000000000
--- a/lib/libc_r/gen/Makefile.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-#	From: @(#)Makefile.inc	8.3 (Berkeley) 4/16/94
-#	$Id$
-
-# machine-independent gen sources
-.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 \
-	exec.c fnmatch.c frexp.c fstab.c fts.c getbootfile.c getbsize.c \
-	getcap.c getcwd.c getdomainname.c getgrent.c getgrouplist.c \
-	gethostname.c getloadavg.c getlogin.c getmntinfo.c getnetgrent.c \
-	getosreldate.c getpagesize.c getpass.c getpwent.c getttyent.c \
-	getusershell.c getvfsent.c glob.c initgroups.c isatty.c msgctl.c \
-	msgget.c msgrcv.c msgsnd.c nice.c nlist.c ntp_gettime.c opendir.c \
-	pause.c popen.c psignal.c pwcache.c raise.c readdir.c rewinddir.c \
-	scandir.c seekdir.c semconfig.c semctl.c semget.c semop.c \
-	setdomainname.c sethostname.c setjmperr.c setmode.c shmat.c \
-	shmctl.c shmdt.c shmget.c siginterrupt.c siglist.c signal.c \
-	sigsetops.c sleep.c sysconf.c sysctl.c syslog.c \
-	telldir.c termios.c time.c times.c timezone.c ttyname.c ttyslot.c \
-	ualarm.c uname.c unvis.c usleep.c utime.c valloc.c vis.c wait.c \
-	wait3.c waitpid.c
-
-# *rand48 family, from 1.1.5
-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"
diff --git a/lib/libc_r/gmon/Makefile.inc b/lib/libc_r/gmon/Makefile.inc
deleted file mode 100644
index f0cc7e5bd4d5..000000000000
--- a/lib/libc_r/gmon/Makefile.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-
-# gmon sources
-.PATH: ${.CURDIR}/../libc/gmon
-
-SRCS+=	gmon.c mcount.c
-
-# mcount cannot be compiled with profiling
-mcount.po: mcount.o
-	cp mcount.o mcount.po
diff --git a/lib/libc_r/i386/gen/Makefile.inc b/lib/libc_r/i386/gen/Makefile.inc
deleted file mode 100644
index 457d5c3c4f4a..000000000000
--- a/lib/libc_r/i386/gen/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-#	$Id$
-
-SRCS+=	isinf.c infinity.c
-SRCS+=	_setjmp.S alloca.S fabs.S ldexp.c modf.S setjmp.S sigsetjmp.S
diff --git a/lib/libc_r/i386/net/Makefile.inc b/lib/libc_r/i386/net/Makefile.inc
deleted file mode 100644
index dff7fd1066b7..000000000000
--- a/lib/libc_r/i386/net/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-#	$Id$
-
-SRCS+=	htonl.S htons.S ntohl.S ntohs.S
diff --git a/lib/libc_r/i386/stdlib/Makefile.inc b/lib/libc_r/i386/stdlib/Makefile.inc
deleted file mode 100644
index 65ce3481497f..000000000000
--- a/lib/libc_r/i386/stdlib/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-#	$Id$
-
-SRCS+=	abs.S
diff --git a/lib/libc_r/i386/string/Makefile.inc b/lib/libc_r/i386/string/Makefile.inc
deleted file mode 100644
index be5827f0e4cf..000000000000
--- a/lib/libc_r/i386/string/Makefile.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-#	$Id$
-
-SRCS+=	bcmp.S bcopy.S bzero.S ffs.S index.S memchr.S memcmp.S \
-	memmove.S memset.S \
-	rindex.S strcat.S strchr.S strcmp.S strcpy.S strcspn.c \
-	strlen.S strncat.c strncmp.S strncpy.c strpbrk.c strsep.c \
-	strspn.c strrchr.S strstr.c swab.S
diff --git a/lib/libc_r/i386/sys/Makefile.inc b/lib/libc_r/i386/sys/Makefile.inc
deleted file mode 100644
index fd725fce57d0..000000000000
--- a/lib/libc_r/i386/sys/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp
-#	$Id$
-
-.PATH:	${.CURDIR}/../libc/${MACHINE}/sys
-
-SRCS+=	i386_get_ldt.c i386_set_ldt.c
diff --git a/lib/libc_r/locale/Makefile.inc b/lib/libc_r/locale/Makefile.inc
deleted file mode 100644
index e6be02824c5b..000000000000
--- a/lib/libc_r/locale/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-
-# locale sources
-.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
diff --git a/lib/libc_r/net/Makefile.inc b/lib/libc_r/net/Makefile.inc
deleted file mode 100644
index bb7e4beb075a..000000000000
--- a/lib/libc_r/net/Makefile.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-#	@(#)Makefile.inc	8.2 (Berkeley) 9/5/93
-
-# machine-independent net sources
-.PATH: ${.CURDIR}/../libc/${MACHINE}/net ${.CURDIR}/../libc/net
-
-SRCS+=	addr2ascii.c ascii2addr.c base64.c \
-	gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \
-	getnetbydns.c getnetbyht.c getnetbynis.c getnetnamadr.c \
-	getproto.c getprotoent.c getprotoname.c getservbyname.c \
-	getservbyport.c getservent.c herror.c inet_addr.c inet_lnaof.c \
-	inet_makeaddr.c inet_netof.c inet_network.c inet_ntoa.c inet_ntop.c \
-	inet_net_ntop.c inet_net_pton.c inet_neta.c \
-	inet_pton.c linkaddr.c map_v4v6.c nsap_addr.c \
-	rcmd.c recv.c res_comp.c res_data.c res_debug.c \
-	res_init.c res_mkquery.c res_query.c res_send.c res_stubs.c \
-	send.c ether_addr.c \
-	ns_addr.c ns_ntoa.c 
-
-# machine-dependent net sources
-.include "${.CURDIR}/../libc/${MACHINE}/net/Makefile.inc"
diff --git a/lib/libc_r/nls/Makefile.inc b/lib/libc_r/nls/Makefile.inc
deleted file mode 100644
index 6c2c51a6106d..000000000000
--- a/lib/libc_r/nls/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $
-
-.PATH: ${.CURDIR}/../libc/nls
-
-SRCS+=	catclose.c catgets.c catopen.c msgcat.c
diff --git a/lib/libc_r/quad/Makefile.inc b/lib/libc_r/quad/Makefile.inc
deleted file mode 100644
index 33ffeedc7413..000000000000
--- a/lib/libc_r/quad/Makefile.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-
-# Quad support, if needed
-
-.if ${MACHINE} == "i386"
-
-SRCS+=	cmpdi2.c \
-	divdi3.c moddi3.c udivdi3.c umoddi3.c qdivrem.c 
-
-.else
-
-SRCS+=	adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c fixdfdi.c \
-	fixsfdi.c fixunsdfdi.c fixunssfdi.c floatdidf.c floatdisf.c \
-	floatunsdidf.c iordi3.c lshldi3.c lshrdi3.c moddi3.c muldi3.c \
-	negdi2.c notdi2.c qdivrem.c subdi3.c ucmpdi2.c udivdi3.c umoddi3.c \
-	xordi3.c
-
-.endif
-
-.PATH: ${.CURDIR}/../libc/${MACHINE}/quad ${.CURDIR}/../libc/quad
diff --git a/lib/libc_r/regex/Makefile.inc b/lib/libc_r/regex/Makefile.inc
deleted file mode 100644
index dd98c9ec5975..000000000000
--- a/lib/libc_r/regex/Makefile.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-
-# regex sources
-.PATH: ${.CURDIR}/../libc/regex
-
-CFLAGS+=-DPOSIX_MISTAKE
-
-SRCS+=	regcomp.c regerror.c regexec.c regfree.c
diff --git a/lib/libc_r/rpc/Makefile.inc b/lib/libc_r/rpc/Makefile.inc
deleted file mode 100644
index b0009420d103..000000000000
--- a/lib/libc_r/rpc/Makefile.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-#	@(#)Makefile	5.11 (Berkeley) 9/6/90
-
-.PATH: ${.CURDIR}/../libc/rpc ${.CURDIR}/../libc
-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 \
-	pmap_clnt.c pmap_getmaps.c pmap_getport.c pmap_prot.c \
-	pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c rpc_callmsg.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
diff --git a/lib/libc_r/stdio/Makefile.inc b/lib/libc_r/stdio/Makefile.inc
deleted file mode 100644
index d63e196fbdd6..000000000000
--- a/lib/libc_r/stdio/Makefile.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-#	@(#)Makefile.inc	8.3 (Berkeley) 4/17/94
-
-# stdio sources
-.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 \
-	fprintf.c fpurge.c fputc.c fputs.c fread.c freopen.c fscanf.c \
-	fseek.c fsetpos.c ftell.c funopen.c fvwrite.c fwalk.c fwrite.c \
-	getc.c getchar.c gets.c getw.c makebuf.c mktemp.c perror.c \
-	printf.c putc.c putchar.c puts.c putw.c refill.c remove.c rewind.c \
-	rget.c scanf.c setbuf.c setbuffer.c setvbuf.c snprintf.c sprintf.c \
-	sscanf.c stdio.c tempnam.c tmpfile.c tmpnam.c ungetc.c vasprintf.c \
-	vfprintf.c vfscanf.c vprintf.c vscanf.c vsnprintf.c vsprintf.c \
-	vsscanf.c wbuf.c wsetup.c
diff --git a/lib/libc_r/stdlib/Makefile.inc b/lib/libc_r/stdlib/Makefile.inc
deleted file mode 100644
index 90582f7a6c16..000000000000
--- a/lib/libc_r/stdlib/Makefile.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-#	@(#)Makefile.inc	8.2 (Berkeley) 2/16/94
-
-# machine-independent stdlib sources
-.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 \
-	ldiv.c malloc.c merge.c putenv.c qsort.c radixsort.c rand.c random.c \
-	realpath.c setenv.c strtod.c strtol.c strtoq.c strtoul.c \
-	strtouq.c system.c
-
-# machine-dependent stdlib sources
-.include "${.CURDIR}/${MACHINE}/stdlib/Makefile.inc"
diff --git a/lib/libc_r/stdtime/Makefile.inc b/lib/libc_r/stdtime/Makefile.inc
deleted file mode 100644
index 6802ec350b96..000000000000
--- a/lib/libc_r/stdtime/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$Id$
-
-.PATH:	${.CURDIR}/../libc/stdtime
-
-SRCS+=	asctime.c localtime.c strftime.c difftime.c
diff --git a/lib/libc_r/string/Makefile.inc b/lib/libc_r/string/Makefile.inc
deleted file mode 100644
index f34813ad62dc..000000000000
--- a/lib/libc_r/string/Makefile.inc
+++ /dev/null
@@ -1,82 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-#	$Id$
-
-.PATH: ${.CURDIR}/../libc/${MACHINE}/string ${.CURDIR}/../libc/string
-
-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"
-
-# If no machine specific bzero(3), build one out of memset(3).
-.if empty(SRCS:Mbzero.S)
-OBJS+=	bzero.o
-bzero.o: memset.c
-	${CC} -DBZERO ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
-	@${LD} -x -r ${.TARGET}
-	@mv -f a.out ${.TARGET}
-
-bzero.po: memset.c
-	${CC} -DBZERO ${CFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
-	@${LD} -X -r ${.TARGET}
-	@mv -f a.out ${.TARGET}
-.endif
-
-# If no machine specific memmove(3), build one out of bcopy(3).
-.if empty(SRCS:Mmemmove.S)
-OBJS+=	memmove.o
-memmove.o: bcopy.c
-	${CC} -DMEMMOVE ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
-	@${LD} -x -r ${.TARGET}
-	@mv -f a.out ${.TARGET}
-
-memmove.po: bcopy.c
-	${CC} -DMEMMOVE ${CFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
-	@${LD} -X -r ${.TARGET}
-	@mv -f a.out ${.TARGET}
-.endif
-
-# If no machine specific memcpy(3), build one out of bcopy(3).
-.if empty(SRCS:Mmemmove.S)
-OBJS+=	memcpy.o
-memcpy.o: bcopy.c
-	${CC} -DMEMCOPY ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
-	@${LD} -x -r ${.TARGET}
-	@mv -f a.out ${.TARGET}
-
-memcpy.po: bcopy.c
-	${CC} -DMEMCOPY ${CFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
-	@${LD} -X -r ${.TARGET}
-	@mv -f a.out ${.TARGET}
-.endif
-
-# If no machine specific strchr(3), build one out of index(3).
-.if empty(SRCS:Mstrchr.S)
-OBJS+=	strchr.o
-strchr.o: index.c
-	${CC} -DSTRCHR ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
-	@${LD} -x -r ${.TARGET}
-	@mv -f a.out ${.TARGET}
-
-strchr.po: index.c
-	${CC} -DSTRCHR ${CFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
-	@${LD} -X -r ${.TARGET}
-	@mv -f a.out ${.TARGET}
-.endif
-
-# If no machine specific strrchr(3), build one out of rindex(3).
-.if empty(SRCS:Mstrrchr.S)
-OBJS+=	strrchr.o
-strrchr.o: rindex.c
-	${CC} -DSTRRCHR ${CFLAGS} -c ${.ALLSRC} -o ${.TARGET}
-	@${LD} -x -r ${.TARGET}
-	@mv -f a.out ${.TARGET}
-
-strrchr.po: rindex.c
-	${CC} -DSTRRCHR ${CFLAGS} -c -p ${.ALLSRC} -o ${.TARGET}
-	@${LD} -X -r ${.TARGET}
-	@mv -f a.out ${.TARGET}
-.endif
diff --git a/lib/libc_r/xdr/Makefile.inc b/lib/libc_r/xdr/Makefile.inc
deleted file mode 100644
index cdf7ab1553b2..000000000000
--- a/lib/libc_r/xdr/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#	@(#)Makefile	5.11 (Berkeley) 9/6/90
-
-.PATH: ${.CURDIR}/../libc/xdr ${.CURDIR}/../libc
-SRCS+=	xdr.c xdr_array.c xdr_float.c xdr_mem.c \
-	xdr_rec.c xdr_reference.c xdr_stdio.c
diff --git a/lib/libc_r/yp/Makefile.inc b/lib/libc_r/yp/Makefile.inc
deleted file mode 100644
index 05e181124670..000000000000
--- a/lib/libc_r/yp/Makefile.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-#	from: @(#)Makefile.inc	5.3 (Berkeley) 2/20/91
-#	$Id$
-
-# yp sources
-.PATH: ${.CURDIR}/../libc/yp
-
-SRCS+=		xdryp.c yp_xdr.c yplib.c
-CLEANFILES+=	yp_xdr.c yp.h
-
-RPCSRC= ${.DESTDIR}/usr/include/rpcsvc/yp.x
-RPCGEN= rpcgen
-
-yp_xdr.c: ${RPCSRC} yp.h
-	${RPCGEN} -c -o ${.TARGET} ${RPCSRC}
-
-yp.h: ${RPCSRC}
-	${RPCGEN} -h -o ${.TARGET} ${RPCSRC}