libkern, begone. Move to a new mechanism where config(8)'s "file"

directive can select between MI and MD versions of these files.  At
the same time, adjust the boot programs to pick exactly what they need,
instead of the 7 or 8 mechanisms previously used.

There will be some fallout from this, but testing it all by myself is a
ridiculously slow process; it will be finished in-tree.

Various developers were very nice and avoided making fun of me when I
was gibbering in the corner..

1 files changed, 3 insertions, 8 deletions

diff --git a/sys/arch/vax/stand/xxboot/Makefile b/sys/arch/vax/stand/xxboot/Makefile
index 3b10714a293..b20744469d5 100644
--- a/sys/arch/vax/stand/xxboot/Makefile
+++ b/sys/arch/vax/stand/xxboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 2006/07/04 21:43:53 martin Exp $
+#	$OpenBSD: Makefile,v 1.7 2007/11/25 18:25:33 deraadt Exp $
 #	$NetBSD: Makefile,v 1.12 2002/02/24 01:04:25 matt Exp $
 
 S=	${.CURDIR}/../../../../
@@ -29,10 +29,6 @@ SA_AS=	library
 .include "${S}/lib/libsa/Makefile.inc"
 LIBSA=	${SALIB}
 
-#KERN_AS=library
-#.include "${S}/lib/libkern/Makefile.inc"
-#LIBKERN=${KERNLIB}
-
 .if ${MACHINE} == "vax"
 .PHONY: machine-links
 beforedepend: machine-links
@@ -43,9 +39,8 @@ machine-links:
 CLEANFILES+= machine ${MACHINE_ARCH} ${PROG}.out
 .endif
 
-${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
-${PROG}: ${OBJS} ${LIBSA} ${LIBKERN}
-	${LD} -N -Ttext 100000 -o ${PROG}.out ${OBJS} ${LIBSA} ${LIBKERN}
+${PROG}: ${OBJS} ${LIBSA}
+	${LD} -N -Ttext 100000 -o ${PROG}.out ${OBJS} ${LIBSA}
 	/usr/bin/strip ${PROG}.out
 	/usr/bin/size ${PROG}.out
 	/bin/dd if=${PROG}.out of=${PROG} bs=32 skip=1