Get rid of the kernel 'libcompat' framework, and instead use conf/files to

decide which files must be pulled into the kernel.  Also conditionalize
the pulling of those files based on the COMPAT_* options.

1 files changed, 7 insertions, 11 deletions

diff --git a/sys/arch/hppa64/conf/Makefile.hppa64 b/sys/arch/hppa64/conf/Makefile.hppa64
index 9d912b223f1..2f7422a58cd 100644
--- a/sys/arch/hppa64/conf/Makefile.hppa64
+++ b/sys/arch/hppa64/conf/Makefile.hppa64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hppa64,v 1.4 2007/07/30 16:23:33 thib Exp $
+#	$OpenBSD: Makefile.hppa64,v 1.5 2007/11/25 11:23:33 deraadt Exp $
 
 # Makefile for OpenBSD
 #
@@ -66,14 +66,6 @@ LIBKERN=	${KERNLIB}
 LIBKERN=	${KERNLIB_PROF}
 .endif
 
-### find out what to use for libcompat
-.include "$S/compat/common/Makefile.inc"
-.ifndef PROF
-LIBCOMPAT=	${COMPATLIB}
-.else
-LIBCOMPAT=	${COMPATLIB_PROF}
-.endif
-
 # compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
 # HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
 
@@ -88,8 +80,12 @@ HOSTED_C=	${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $<
 
 %SFILES
 
-SYSTEM_OBJ=	locore.o param.o ioconf.o ${OBJS} \
-		${LIBKERN} ${LIBCOMPAT} ${LIBSPMATH}
+# load lines for config "xxx" will be emitted as:
+# xxx: ${SYSTEM_DEP} swapxxx.o
+#	${SYSTEM_LD_HEAD}
+#	${SYSTEM_LD} swapxxx.o
+#	${SYSTEM_LD_TAIL}
+SYSTEM_OBJ=	locore.o param.o ioconf.o ${OBJS} ${LIBSPMATH} ${LIBKERN}
 SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD=	@rm -f $@
 SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \