Every Makefile on every architecture had deviated in unique ways.

Eliminate many more differences.  When it makes sense, build bsd.rd
and miniroot/ramdisk.fs and cd.iso in the same directory.  More steps
coming after this..

10 files changed, 101 insertions, 285 deletions

diff --git a/distrib/alpha/Makefile b/distrib/alpha/Makefile
index 0149db1ed34..22efc74cc34 100644
--- a/distrib/alpha/Makefile
+++ b/distrib/alpha/Makefile
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile,v 1.13 2017/09/17 16:31:59 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.14 2019/04/30 17:46:00 deraadt Exp $
 
-SUBDIR= bsd.rd miniroot cdfs
+SUBDIR= miniroot
 
 .if	make(obj) || make(cleandir) || make(clean)
 SUBDIR+= iso
@@ -8,10 +8,5 @@ SUBDIR+= iso
 
 unconfig:
 	cd miniroot; ${MAKE} unconfig
-	cd floppy; ${MAKE} unconfig
-	cd floppyB; ${MAKE} unconfig
-	cd floppyC; ${MAKE} unconfig
-	cd cdfs; ${MAKE} unconfig
-	cd iso; ${MAKE} unconfig
 
 .include <bsd.subdir.mk>
diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile
deleted file mode 100644
index 7c24cf4bf7c..00000000000
--- a/distrib/alpha/bsd.rd/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-#	$OpenBSD: Makefile,v 1.37 2019/04/29 15:56:23 deraadt Exp $
-
-IMAGE=		ramdisk${OSrev}.fs
-
-STRIPOPTS?=	-R .SUNW_ctf -R .shstrtab
-
-UTILS=		${.CURDIR}/../../miniroot
-LISTS?=		${.CURDIR}/../common/list
-MTREE=		${UTILS}/mtree.conf
-STRIPOPTS?=	-R .eh_frame -R .SUNW_ctf -R .shstrtab
-
-LISTS+=		${.CURDIR}/list.local
-
-all: bsd.rd
-
-DISKTYPE=	rdroot
-MAKEFSARGS_RD=	-o disklabel=${DISKTYPE},minfree=0,density=8192
-
-bsd.rd:	bsd.rd_unz
-	objcopy -Sg -R .comment bsd.rd_unz bsd.strip
-	strip ${STRIPOPTS} bsd.strip
-	gzip -c -9nv bsd.strip > bsd.rd
-
-bsd.rd_unz: bsd ${IMAGE}
-	cp bsd bsd.rd_unz
-	rdsetroot bsd.rd_unz ${IMAGE}
-	strip -R .SUNW_ctf -R .shstrtab bsd.rd_unz
-
-bsd:
-	cd ${.CURDIR}/../../../sys/arch/alpha/compile/RAMDISKBIG && \
-	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}'
-	cp -p ${.CURDIR}/../../../sys/arch/alpha/compile/RAMDISKBIG/obj/bsd bsd
-
-${IMAGE}: instbin
-	rm -rf $@.d
-	install -d -o root -g wheel $@.d
-	mtree -def ${MTREE} -p $@.d -u
-	CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
-	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
-	    sh ${UTILS}/runlist.sh ${LISTS}
-	rm $@.d/instbin
-	makefs ${MAKEFSARGS_RD} $@ $@.d
-
-instbin.conf: ${LISTS}
-	awk -f ${UTILS}/makeconf.awk  ${LISTS} > instbin.conf
-
-instbin.mk instbin.cache instbin.c: instbin.conf
-	crunchgen -E -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib instbin.conf
-
-instbin: instbin.mk instbin.cache instbin.c
-	${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all
-	strip ${STRIPOPTS} instbin
-
-clean cleandir:
-	/bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \
-	    *.o *.lo *.c \
-	    lib*.a lib*.olist instbin.map ${CLEANFILES}
-	/bin/rm -rf ${IMAGE}.d
-
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>
-
-.ifdef RELEASEDIR
-beforeinstall:
-	cp bsd.rd ${RELEASEDIR}
-	chmod a+r ${RELEASEDIR}/bsd.rd
-.endif
diff --git a/distrib/alpha/cdfs/Makefile b/distrib/alpha/cdfs/Makefile
deleted file mode 100644
index 1707a992a9c..00000000000
--- a/distrib/alpha/cdfs/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#	$OpenBSD: Makefile,v 1.10 2019/04/29 15:56:24 deraadt Exp $
-
-CDROM=		cd${OSrev}.iso
-MOUNT_POINT=	/mnt
-
-all: ${CDROM}
-
-${CDROM}:
-	-rm -rf ${.OBJDIR}/cd-dir
-	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
-
-	cp ${.OBJDIR}/../bsd.rd/bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
-
-	# make sure right kernel is in /
-	ln ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/bsd.rd ${.OBJDIR}/cd-dir/bsd.rd
-	ln ${.OBJDIR}/cd-dir/bsd.rd ${.OBJDIR}/cd-dir/bsd
-
-	cp ${DESTDIR}/usr/mdec/boot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
-	cp ${DESTDIR}/usr/mdec/bootxx ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
-
-	(mkhybrid -a -R -v -v -T -L -d -D -N -o ${.OBJDIR}/${CDROM} \
-	    -A "OpenBSD ${OSREV} ${MACHINE} bootonly CD" \
-	    -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
-	    -p "Theo de Raadt <deraadt@openbsd.org>" \
-	    -V "OpenBSD/${MACHINE}   ${OSREV} boot-only CD" \
-	    ${.OBJDIR}/cd-dir 2>&1) | tee log
-	vnconfig -v ${CDROM} > vnd
-	mount -t cd9660 /dev/`cat vnd`a ${MOUNT_POINT}
-	/usr/mdec/installboot -v \
-	    -s `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f1` \
-	    -e `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f2` \
-	    ${MOUNT_POINT}/${OSREV}/${MACHINE}/boot /usr/mdec/bootxx `cat vnd`
-	umount ${MOUNT_POINT}
-	vnconfig -u `cat vnd`
-	rm -f vnd
-
-.ifdef RELEASEDIR
-install:
-	cp ${CDROM} ${RELEASEDIR}
-.endif
-
-clean cleandir:
-	/bin/rm -f ${CDROM}
-	rm -rf cd-dir log
-
-unconfig:
-	-umount -f ${MOUNT_POINT}
-	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
-
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>
diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc
deleted file mode 100644
index eb01bb24454..00000000000
--- a/distrib/alpha/common/Makefile.inc
+++ /dev/null
@@ -1,99 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.43 2019/04/29 15:56:25 deraadt Exp $
-
-IMAGE=		ramdisk${OSrev}.fs
-
-MOUNT_POINT=	/mnt
-
-STRIPOPTS?=	-R .SUNW_ctf -R .shstrtab
-INSTALLBOOT?=	/usr/mdec/installboot -v
-
-XNAME?=		floppy
-FLOPPY?=	${XNAME}${OSrev}.fs
-FLOPPYBLKS?=	2880
-FLOPPYTYPE?=	floppy
-BOOT?=		/usr/mdec/boot
-BOOTXX?=	/usr/mdec/bootxx
-
-UTILS=		${.CURDIR}/../../miniroot
-
-LISTS?=		${.CURDIR}/../common/list
-CRUNCHCONF?=	instbin.conf
-MTREE=		${UTILS}/mtree.conf
-STRIPOPTS?=	-R .eh_frame -R .SUNW_ctf -R .shstrtab
-
-instbin.conf: ${LISTS}
-	awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf
-
-instbin.mk instbin.cache instbin.c: instbin.conf
-	crunchgen -E -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib instbin.conf
-
-instbin: instbin.mk instbin.cache instbin.c
-	${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all
-	strip ${STRIPOPTS} instbin
-
-all: ${FLOPPY}
-
-DISKTYPE=	rdroot
-MAKEFSARGS_RD=	-o disklabel=${DISKTYPE},minfree=0,density=8192
-
-# old format, minfree, opt, b/i  trks, sects, cpg
-NEWFSARGS=	-t ffs -m 0 -o space
-NEWFSARGS_FD=	-i 524288 -c ${FLOPPYBLKS}
-
-CLEANFILES+=	bsd bsd.rd bsd.gz ${FLOPPY}
-
-${FLOPPY}:	bsd.gz
-	dd if=/dev/zero of=${FLOPPY} count=${FLOPPYBLKS}
-	vnconfig -v ${FLOPPY} > vnd
-	disklabel -w `cat vnd` ${FLOPPYTYPE}
-	newfs ${NEWFSARGS} ${NEWFSARGS_FD} -s ${FLOPPYBLKS} /dev/r`cat vnd`a
-	mount /dev/`cat vnd`a ${MOUNT_POINT}
-	dd if=${DESTDIR}/${BOOT} of=${MOUNT_POINT}/boot bs=512
-	dd if=bsd.gz of=${MOUNT_POINT}/bsd bs=512
-	${INSTALLBOOT} ${MOUNT_POINT}/boot ${BOOTXX} `cat vnd`
-	df -i ${MOUNT_POINT}
-	umount ${MOUNT_POINT}
-	vnconfig -u `cat vnd`
-	rm -f vnd
-
-bsd.gz:	bsd.rd
-	objcopy -Sg -R .comment -R .SUNW_ctf -R .shstrtab -R .shstrtab bsd.rd bsd.strip
-	strip bsd.strip
-	gzip -c -9nv bsd.strip > bsd.gz
-
-bsd.rd: bsd ${IMAGE}
-	cp bsd bsd.rd
-	rdsetroot bsd.rd ${IMAGE}
-
-bsd:
-	cd ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK} && \
-	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}'
-	cp -p ${.CURDIR}/../../../sys/arch/alpha/compile/${RAMDISK}/obj/bsd bsd
-
-${IMAGE}: instbin
-	rm -rf $@.d
-	install -d -o root -g wheel $@.d
-	mtree -def ${MTREE} -p $@.d -u
-	CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
-	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
-	    sh ${UTILS}/runlist.sh ${LISTS}
-	rm $@.d/instbin
-	makefs ${MAKEFSARGS_RD} $@ $@.d
-
-unconfig:
-	-umount -f ${MOUNT_POINT}
-	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
-
-.ifdef RELEASEDIR
-beforeinstall:
-	cp ${FLOPPY} ${RELEASEDIR}
-.endif
-
-clean cleandir:
-	/bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \
-	    *.o *.lo *.c \
-	    lib*.a lib*.olist instbin.map ${CLEANFILES}
-	/bin/rm -rf ${IMAGE}.d
-
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>
diff --git a/distrib/alpha/floppy/Makefile b/distrib/alpha/floppy/Makefile
deleted file mode 100644
index 19fd646b1ae..00000000000
--- a/distrib/alpha/floppy/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 2015/09/19 10:42:10 miod Exp $
-
-RAMDISK=RAMDISK
-XNAME=floppy
-
-.include "${.CURDIR}/../common/Makefile.inc"
diff --git a/distrib/alpha/floppyB/Makefile b/distrib/alpha/floppyB/Makefile
deleted file mode 100644
index 91d3f641076..00000000000
--- a/distrib/alpha/floppyB/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$OpenBSD: Makefile,v 1.2 2015/09/19 10:42:10 miod Exp $
-
-RAMDISK=RAMDISKB
-XNAME=floppyB
-
-.include "${.CURDIR}/../common/Makefile.inc"
diff --git a/distrib/alpha/floppyC/Makefile b/distrib/alpha/floppyC/Makefile
deleted file mode 100644
index 3345d8299d7..00000000000
--- a/distrib/alpha/floppyC/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$OpenBSD: Makefile,v 1.3 2015/09/19 10:42:10 miod Exp $
-
-RAMDISK=RAMDISKC
-XNAME=floppyC
-
-.include "${.CURDIR}/../common/Makefile.inc"
diff --git a/distrib/alpha/iso/Makefile b/distrib/alpha/iso/Makefile
index 3e607fd8e1b..727fd6fd0c0 100644
--- a/distrib/alpha/iso/Makefile
+++ b/distrib/alpha/iso/Makefile
@@ -1,9 +1,10 @@
-#	$OpenBSD: Makefile,v 1.17 2019/04/29 15:56:25 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.18 2019/04/30 17:46:03 deraadt Exp $
 
 CDROM=		install${OSrev}.iso
+MOUNT_POINT=	/mnt
+
 RELXDIR?=	/home/relx-${MACHINE}
 RELDIR?=	/home/rel-${MACHINE}
-MOUNT_POINT=	/mnt
 
 BASE=		${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
 		${RELDIR}/game${OSrev}.tgz ${RELDIR}/man${OSrev}.tgz \
@@ -15,7 +16,7 @@ XBASE=		${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xfont${OSrev}.tgz \
 all: ${CDROM}
 
 ${CDROM}: ${BASE} ${XBASE}
-	-rm -rf ${.OBJDIR}/cd-dir
+	rm -rf ${.OBJDIR}/cd-dir
 	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
 	cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
@@ -48,6 +49,10 @@ ${CDROM}: ${BASE} ${XBASE}
 	vnconfig -u `cat vnd`
 	rm -f vnd
 
+unconfig:
+	-umount -f ${MOUNT_POINT}
+	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
+
 install:
 	cp ${CDROM} ${RELDIR}/
 
@@ -55,9 +60,4 @@ clean cleandir:
 	/bin/rm -f ${CDROM}
 	rm -rf cd-dir log
 
-unconfig:
-	-umount -f ${MOUNT_POINT}
-	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
-
 .include <bsd.obj.mk>
-.include <bsd.subdir.mk>
diff --git a/distrib/alpha/miniroot/Makefile b/distrib/alpha/miniroot/Makefile
index 97bdcd45087..6f496bd1134 100644
--- a/distrib/alpha/miniroot/Makefile
+++ b/distrib/alpha/miniroot/Makefile
@@ -1,50 +1,102 @@
-#	$OpenBSD: Makefile,v 1.7 2019/04/29 15:56:25 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.8 2019/04/30 17:46:03 deraadt Exp $
 
 FS=		miniroot${OSrev}.fs
+FSSIZE=		5760
+FSDISKTYPE=	fakeramdisk
+CDROM=		cd${OSrev}.iso
 MOUNT_POINT=	/mnt
+MTREE=		${UTILS}/mtree.conf
 
-.ifndef DESTDIR
-all ${FS}:
-	@echo setenv DESTDIR before making a ramdisk!
-	@false
-.else
+LISTS=		${.CURDIR}/../common/list ${.CURDIR}/list.local
+UTILS=		${.CURDIR}/../../miniroot
 
-all: ${FS}
+STRIPOPTS=	-R .eh_frame -R .SUNW_ctf -R .shstrtab
 
-${FS}: vn_up install_files installboot showit vn_down
+MRDISKTYPE=	rdroot
+MRMAKEFSARGS=	-o disklabel=${MRDISKTYPE},minfree=0,density=8192
 
-vn_up: blank_filesystem
+all: ${FS} ${CDROM}
+
+${FS}: bsd.rd
+	dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE}
 	vnconfig -v ${FS} > vnd
-	disklabel -w `cat vnd` fakeramdisk
+	disklabel -w `cat vnd` ${FSDISKTYPE}
 	newfs -m 0 /dev/r`cat vnd`a
 	mount /dev/`cat vnd`a ${MOUNT_POINT}
-
-showit:
+	install -c -m 555 -o root -g wheel bsd.rd ${MOUNT_POINT}/bsd
+	install -c -m 555 -o root -g wheel \
+	    ${DESTDIR}/usr/mdec/boot ${MOUNT_POINT}/boot
+	/usr/mdec/installboot -v \
+	    ${MOUNT_POINT}/boot ${DESTDRIR}/usr/mdec/bootxx `cat vnd`
 	df -i ${MOUNT_POINT}
-
-vn_down:
 	umount ${MOUNT_POINT}
 	vnconfig -u `cat vnd`
 	rm -f vnd
 
-install_files: bsd.rd boot
-
-bsd.rd:
-	install -c -m 555 -o root -g wheel \
-	    ${.OBJDIR}/../bsd.rd/bsd.rd ${MOUNT_POINT}/bsd
-
-boot:
-	install -c -m 555 -o root -g wheel \
-	    ${DESTDIR}/usr/mdec/boot ${MOUNT_POINT}/boot
-
-installboot:
-	/usr/mdec/installboot -v ${MOUNT_POINT}/boot \
-	    ${DESTDRIR}/usr/mdec/bootxx `cat vnd`
-
-blank_filesystem:
-	dd if=/dev/zero of=${FS} bs=512 count=5760
+${CDROM}: bsd.rd
+	rm -rf ${.OBJDIR}/cd-dir
+	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+
+	cp bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+
+	# make sure right kernel is in /
+	ln ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/bsd.rd ${.OBJDIR}/cd-dir/bsd.rd
+	ln ${.OBJDIR}/cd-dir/bsd.rd ${.OBJDIR}/cd-dir/bsd
+
+	cp ${DESTDIR}/usr/mdec/boot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+	cp ${DESTDIR}/usr/mdec/bootxx ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+
+	(mkhybrid -a -R -v -v -T -L -d -D -N -o ${.OBJDIR}/${CDROM} \
+	    -A "OpenBSD ${OSREV} ${MACHINE} bootonly CD" \
+	    -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
+	    -p "Theo de Raadt <deraadt@openbsd.org>" \
+	    -V "OpenBSD/${MACHINE}   ${OSREV} boot-only CD" \
+	    ${.OBJDIR}/cd-dir 2>&1) | tee log
+	vnconfig -v ${CDROM} > vnd
+	mount -t cd9660 /dev/`cat vnd`a ${MOUNT_POINT}
+	/usr/mdec/installboot -v \
+	    -s `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f1` \
+	    -e `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f2` \
+	    ${MOUNT_POINT}/${OSREV}/${MACHINE}/boot /usr/mdec/bootxx `cat vnd`
+	umount ${MOUNT_POINT}
+	vnconfig -u `cat vnd`
+	rm -f vnd
 
-.endif
+bsd.rd: bsd.rd_unz
+	objcopy -Sg -R .comment bsd.rd_unz bsd.strip
+	strip ${STRIPOPTS} bsd.strip
+	gzip -c -9nv bsd.strip > bsd.rd
+
+bsd.rd_unz: bsd mr.fs
+	cp bsd bsd.rd_unz
+	rdsetroot bsd.rd_unz mr.fs
+	strip -R .SUNW_ctf -R .shstrtab bsd.rd_unz
+
+bsd:
+	cd ${.CURDIR}/../../../sys/arch/alpha/compile/RAMDISKBIG && \
+	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}'
+	cp -p ${.CURDIR}/../../../sys/arch/alpha/compile/RAMDISKBIG/obj/bsd bsd
+
+mr.fs: instbin
+	rm -rf $@.d
+	install -d -o root -g wheel $@.d
+	mtree -def ${MTREE} -p $@.d -u
+	CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
+	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
+	    sh ${UTILS}/runlist.sh ${LISTS}
+	rm $@.d/instbin
+	makefs ${MRMAKEFSARGS} $@ $@.d
+
+instbin.conf: ${LISTS}
+	awk -f ${UTILS}/makeconf.awk  ${LISTS} > instbin.conf
+
+instbin.mk instbin.cache instbin.c: instbin.conf
+	crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib \
+	    -c instbin.c -e instbin -m instbin.mk instbin.conf
+
+instbin: instbin.mk instbin.cache instbin.c
+	${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all
+	strip ${STRIPOPTS} instbin
 
 unconfig:
 	-umount -f ${MOUNT_POINT}
@@ -52,12 +104,16 @@ unconfig:
 
 .ifdef RELEASEDIR
 install:
+	cp bsd.rd ${RELEASEDIR}
+	chmod a+r ${RELEASEDIR}/bsd.rd
 	cp ${FS} ${RELEASEDIR}
+	cp ${CDROM} ${RELEASEDIR}
 .endif
 
-clean:
-	rm -f ${FS}
+clean cleandir:
+	/bin/rm -f *.core mr.fs instbin instbin.mk instbin.cache \
+	    *.o *.lo *.c \
+	    lib*.a lib*.olist instbin.map ${CLEANFILES}
+	/bin/rm -rf mr.fs.d
 
-.include <bsd.own.mk>
 .include <bsd.obj.mk>
-.include <bsd.subdir.mk>
diff --git a/distrib/alpha/bsd.rd/list.local b/distrib/alpha/miniroot/list.local
index c8d52363fe5..c8d52363fe5 100644
--- a/distrib/alpha/bsd.rd/list.local
+++ b/distrib/alpha/miniroot/list.local