Rework how KERNOBJDIR functions; now it's always determined with

cd ${KERNSRCDIR}/${KERNARCHDIR}/compile && ${PRINTOBJDIR}
This is far simpler than the previous system, and more robust with
objdirs built via BSDOBJDIR.

The previous method of finding KERNOBJDIR when using BSDOBJDIR by
referencing _SRC_TOP_OBJ_ from another directory was extremely
fragile due to the depth first tree walk by <bsd.subdir.mk>, and
the caching of _SRC_TOP_OBJ_ (with MAKEOVERRIDES) which would be
empty on the *first* pass to create fresh objdirs.

This change requires adding sys/arch/*/compile/Makefile to create
the objdir in that directory, and descending into arch/*/compile
from arch/*/Makefile.  Remove the now-unnecessary .keep_me files
whilst here.

Per lengthy discussion with Andrew Brown.

Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.197 2003/01/04 15:50:32 lukem Exp $
+#	$NetBSD: Makefile,v 1.198 2003/01/06 17:40:18 lukem Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -323,22 +323,8 @@ dependall-distrib depend-distrib all-distrib:
 	@true
 
 .include <bsd.obj.mk>
-.include <bsd.kernobj.mk>
 .include <bsd.subdir.mk>
 
-#
-# Create ${KERNOBJDIR}.
-# Done here to ensure that it's "last", for BSDOBJDIR uses.
-#
-.if commands(obj)
-obj-kernobjdir: .USE
-	@echo "obj ===> sys/arch/${MACHINE}/compile"
-	@mkdir -p ${KERNOBJDIR}
-obj: obj-kernobjdir
-
-.endif
-
-
 build-docs: ${.CURDIR}/BUILDING
 ${.CURDIR}/BUILDING: doc/BUILDING.mdoc
 	groff -mdoc -Tascii -P-b -P-u -P-o $> >$@

share/mk/bsd.kernobj.mk

@@ -1,59 +1,26 @@
-#	$NetBSD: bsd.kernobj.mk,v 1.9 2002/04/26 15:02:02 lukem Exp $
+#	$NetBSD: bsd.kernobj.mk,v 1.10 2003/01/06 17:40:19 lukem Exp $
 
 # KERNSRCDIR	Is the location of the top of the kernel src.
-# 		It defaults to ${NETBSDSRCDIR}/sys
+# 		It defaults to `${NETBSDSRCDIR}/sys'.
 # 
-# KERNARCHDIR	Is the location of the machine dependent kernel
-# 		sources.  It defaults to arch/${MACHINE}
+# KERNARCHDIR	Is the location of the machine dependent kernel sources.
+#		It defaults to `arch/${MACHINE}', but may be overridden
+#		in case ${MACHINE} is not correct.
 # 		
-# KERNCONFDIR	Is where the configuration files for kernels are
-# 		found; default is ${KERNSRCDIR}/${KERNARCHDIR}/conf.
+# KERNCONFDIR	Is where the configuration files for kernels are found.
+#		It defaults to `${KERNSRCDIR}/${KERNARCHDIR}/conf'.
 # 
 # KERNOBJDIR	Is the kernel build directory.  The kernel GENERIC for
 # 		instance will be compiled in ${KERNOBJDIR}/GENERIC.
-# 		The default value is
-# 		${KERNSRCDIR}/${KERNARCHDIR}/compile
-#
-#		If MAKEOBJDIRPREFIX or _SRC_TOP_OBJ is set than the value will
-#		be either 
-#
-#		${MAKEOBJDIRPREFIX}${KERNSRCDIR}/${KERNARCHDIR}/compile
-#
-#		or
-#
-#		${_SRC_TOP_OBJ_}/sys/${KERNARCHDIR}/compile
-#
-#		with MAKEOBJDIRPREFIX taking priority over _SRC_TOP_OBJ_ 
+# 		The default is the .OBJDIR of
+#		`${KERNSRCDIR}/${KERNARCHDIR}/compile'.
 # 
 
 .include <bsd.own.mk>
 
 KERNSRCDIR?=	${NETBSDSRCDIR}/sys
-# just incase ${MACHINE} is not always correct
 KERNARCHDIR?=	arch/${MACHINE}
-
-#
-# XXX It's ugly but it does what we need here. If making objects use the above
-# rules for trying to figure out a KERNOBJDIR.
-#
-# When coming back through here in rules (such as building kernels for
-# a release), check which vars we're using and which directory base has been
-# made in the previous obj stage to figure out which one to expose.
-#
-# All cases will fall through to the ${KERNSRCDIR}/${KERNARCHDIR}/compile case
-# if nothing ends up setting this.
-.if make(obj) || \
-    (defined(MAKEOBJDIRPREFIX) && exists(${MAKEOBJDIRPREFIX}${KERNSRCDIR}/${KERNARCHDIR}/compile)) || \
-    (defined(_SRC_TOP_OBJ_) && exists(${_SRC_TOP_OBJ_}/sys/${KERNARCHDIR}/compile))
-.if defined (MAKEOBJDIRPREFIX)
-KERNOBJDIR?=    ${MAKEOBJDIRPREFIX}${KERNSRCDIR}/${KERNARCHDIR}/compile
-.else
-.if defined(_SRC_TOP_OBJ_) && ${_SRC_TOP_OBJ_} != ""
-KERNOBJDIR?=	${_SRC_TOP_OBJ_}/sys/${KERNARCHDIR}/compile
-.endif
-.endif
-.endif
-
-KERNOBJDIR?=	${KERNSRCDIR}/${KERNARCHDIR}/compile
-
 KERNCONFDIR?=	${KERNSRCDIR}/${KERNARCHDIR}/conf
+.if !defined(KERNOBJDIR)
+KERNOBJDIR!=	cd ${KERNSRCDIR}/${KERNARCHDIR}/compile && ${PRINTOBJDIR}
+.endif

sys/arch/acorn26/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2002/03/24 15:46:41 bjh21 Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/06 17:40:19 lukem Exp $
 
 # Makefile for acorn26 tags file and boot blocks
 
@@ -28,6 +28,6 @@ links:
 	    cd $$i && rm -f tags; ln -s ../tags tags; done
 
 
-SUBDIR=	stand include
+SUBDIR=	compile include stand
 
 .include <bsd.subdir.mk>

sys/arch/acorn26/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:20 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/acorn32/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2001/10/06 22:04:11 bjh21 Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/06 17:40:20 lukem Exp $
 
 # Makefile for acorn32 tags file and boot blocks
 
@@ -24,6 +24,6 @@ links:
 	    cd $$i && rm -f tags; ln -s ../tags tags; done
 
 
-SUBDIR=	include
+SUBDIR=	compile include # stand
 
 .include <bsd.subdir.mk>

sys/arch/acorn32/compile/.keep_me

@@ -1,3 +0,0 @@
-$NetBSD: .keep_me,v 1.1 2001/10/07 12:20:55 bjh21 Exp $
-
-This normally empty directory needs to be kept in the distribution.

sys/arch/acorn32/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:20 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/algor/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2001/05/28 16:22:13 thorpej Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/06 17:40:21 lukem Exp $
 
 # Makefile for algor tags file and boot blocks
 
@@ -27,6 +27,6 @@ links:
 	    cd $$i && rm -f tags; ln -s ../tags tags; done
 
 
-SUBDIR=	include
+SUBDIR=	compile include
 
 .include <bsd.subdir.mk>

sys/arch/algor/compile/.keep_me

@@ -1,3 +0,0 @@
-$NetBSD: .keep_me,v 1.1 2001/05/28 16:22:16 thorpej Exp $
-
-This normally empty directory needs to be kept in the distribution.

sys/arch/algor/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:21 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/alpha/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1998/06/12 23:22:32 cgd Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/06 17:40:21 lukem Exp $
 
 # Makefile for alpha tags file and boot blocks
 
@@ -24,6 +24,6 @@ links:
 	    cd $$i && rm -f tags; ln -s ../tags tags; done
 
 
-SUBDIR=	include stand
+SUBDIR=	compile include stand
 
 .include <bsd.subdir.mk>

sys/arch/alpha/compile/.keep_me

@@ -1,3 +0,0 @@
-$NetBSD: .keep_me,v 1.1 1995/02/13 23:07:19 cgd Exp $
-
-This normally empty directory needs to be kept in the distribution.

sys/arch/alpha/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:22 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/amiga/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 1998/06/12 23:22:32 cgd Exp $
+#	$NetBSD: Makefile,v 1.16 2003/01/06 17:40:22 lukem Exp $
 
 # Makefile for amiga tags file and boot blocks
 
@@ -27,6 +27,6 @@ links:
 	    cd $$i && rm -f tags; ln -s ../tags tags; done
 
 
-SUBDIR=	include stand
+SUBDIR=	compile include stand
 
 .include <bsd.subdir.mk>

sys/arch/amiga/compile/.keep_me

@@ -1,3 +0,0 @@
-$NetBSD: .keep_me,v 1.2 1994/10/26 02:02:20 cgd Exp $
-
-This normally empty directory needs to be kept in the distribution.

sys/arch/amiga/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:22 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/amigappc/Makefile

@@ -1,5 +1,5 @@
-#	$NetBSD: Makefile,v 1.1 2002/04/03 14:37:54 bjh21 Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/06 17:40:22 lukem Exp $
 
-SUBDIR=	include
+SUBDIR=	compile include
 
 .include <bsd.subdir.mk>

sys/arch/amigappc/compile/.keep_me

@@ -1,3 +0,0 @@
-$NetBSD: .keep_me,v 1.1 2001/11/29 20:07:52 atatat Exp $
-
-This normally empty directory needs to be kept in the distribution.

sys/arch/amigappc/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:23 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/arc/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2000/12/24 09:25:24 ur Exp $
+#	$NetBSD: Makefile,v 1.8 2003/01/06 17:40:23 lukem Exp $
 #	$OpenBSD: Makefile,v 1.5 1997/05/19 10:34:53 pefo Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/16/93
 
@@ -30,6 +30,6 @@ links:
 	    cd $$i && rm -f tags; ln -s ../tags tags; done
 
 
-SUBDIR=	include stand
+SUBDIR=	compile include stand
 
 .include <bsd.subdir.mk>

sys/arch/arc/compile/.keep_me

@@ -1 +0,0 @@
-This file must remain so that 'cvs checkout' makes the compile directory.

sys/arch/arc/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:23 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/atari/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 1998/09/02 10:59:14 leo Exp $
+#	$NetBSD: Makefile,v 1.6 2003/01/06 17:40:23 lukem Exp $
 
 # Makefile for atari tags file and boot blocks
 
@@ -27,6 +27,6 @@ links:
 	    cd $$i && rm -f tags; ln -s ../tags tags; done
 
 
-SUBDIR= dev include stand
+SUBDIR=	compile dev include stand
 
 .include <bsd.subdir.mk>

sys/arch/atari/compile/.keep_me

@@ -1,3 +0,0 @@
-	$NetBSD: .keep_me,v 1.1.1.1 1995/03/26 07:12:17 leo Exp $
-
-This normally empty directory needs to be kept in the distribution.

sys/arch/atari/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:24 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/bebox/Makefile

@@ -1,5 +1,5 @@
-#	$NetBSD: Makefile,v 1.4 1998/09/01 08:43:48 sakamoto Exp $
+#	$NetBSD: Makefile,v 1.5 2003/01/06 17:40:24 lukem Exp $
 
-SUBDIR=	include stand
+SUBDIR=	compile include stand
 
 .include <bsd.subdir.mk>

sys/arch/bebox/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:25 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/cats/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2001/06/12 08:32:46 chris Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/06 17:40:25 lukem Exp $
 
 # Makefile for cats tags file and boot blocks
 
@@ -24,6 +24,6 @@ links:
 	    cd $$i && rm -f tags; ln -s ../tags tags; done
 
 
-SUBDIR=	include
+SUBDIR=	compile include
 
 .include <bsd.subdir.mk>

sys/arch/cats/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:25 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/cesfic/Makefile

@@ -1,5 +1,5 @@
-#	$NetBSD: Makefile,v 1.1 2001/05/14 18:22:58 drochner Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/06 17:40:25 lukem Exp $
 
-SUBDIR= include
+SUBDIR=	compile include
 
 .include <bsd.subdir.mk>

sys/arch/cesfic/compile/.keep_me

@@ -1,3 +0,0 @@
-$NetBSD: .keep_me,v 1.1 2001/05/14 18:23:05 drochner Exp $
-
-This normally empty directory needs to be kept in the distribution.

sys/arch/cesfic/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:26 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/cobalt/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2000/06/28 09:47:55 soren Exp $
+#	$NetBSD: Makefile,v 1.4 2003/01/06 17:40:26 lukem Exp $
 
 # Makefile for cobalt tags file
 
@@ -26,6 +26,6 @@ links:
 	-for i in ${DCOBALT}; do \
 	    cd $$i && rm -f tags; ln -s ../tags tags; done
 
-SUBDIR=	include stand
+SUBDIR=	compile include stand
 
 .include <bsd.subdir.mk>

sys/arch/cobalt/compile/.keep_me

@@ -1,3 +0,0 @@
-$NetBSD: .keep_me,v 1.1 2000/03/19 23:07:44 soren Exp $
-
-This normally empty directory needs to be kept in the distribution.

sys/arch/cobalt/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:26 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/dreamcast/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2000/12/11 18:19:12 marcus Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/06 17:40:27 lukem Exp $
 
 # Makefile for dreamcast tags file and boot blocks
 
@@ -25,6 +25,6 @@ links:
 	    (cd $$i && rm -f tags; ln -s ../tags tags); done
 
 
-SUBDIR=	include # stand
+SUBDIR=	compile include	# stand
 
 .include <bsd.subdir.mk>

sys/arch/dreamcast/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:27 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/evbarm/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2001/11/09 23:36:52 thorpej Exp $
+#	$NetBSD: Makefile,v 1.3 2003/01/06 17:40:27 lukem Exp $
 
 # Makefile for evbarm tags file and boot blocks
 
@@ -26,6 +26,6 @@ links:
 	    cd $$i && rm -f tags; ln -s ../tags tags; done
 
 
-SUBDIR=	include
+SUBDIR=	compile include
 
 .include <bsd.subdir.mk>

sys/arch/evbarm/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:28 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/evbmips/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2002/03/07 14:43:56 simonb Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/06 17:40:28 lukem Exp $
 
 # Makefile for evbmips tags file and boot blocks
 
@@ -28,6 +28,6 @@ links:
 	    cd $$i && rm -f tags; ln -s ../tags tags; done
 
 
-SUBDIR=	include
+SUBDIR=	compile include
 
 .include <bsd.subdir.mk>

sys/arch/evbmips/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:28 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/evbppc/Makefile

@@ -1,9 +1,7 @@
-#	$NetBSD: Makefile,v 1.1 2002/12/09 12:15:48 scw Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/06 17:40:28 lukem Exp $
 
 ETAGS?= etags
 
-SUBDIR=	include
-
 # XXX Fix this to deal with multiple "evbppc" ports.
 SEVBPPC=	evbppc/*.[ch] include/*.h
 AEVBPPC=
@@ -30,4 +28,7 @@ TAGS: ${SEVBPPC} ${COMM} ${SPPC} ${COMM} ${ASPARC64}
 		"--regex=/^ENTRY(\(.*\)):/\1/" "--regex=/^ASENTRY(\(.*\)):/\1/" \
 		${APPC} ${AEVBPPC}
 
+
+SUBDIR=	compile include
+
 .include <bsd.subdir.mk>

sys/arch/evbppc/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:29 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/evbsh3/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 1999/09/13 10:30:21 itojun Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/06 17:40:29 lukem Exp $
 
 # Makefile for evbsh3 tags file and boot blocks
 
@@ -25,6 +25,6 @@ links:
 	    (cd $$i && rm -f tags; ln -s ../tags tags); done
 
 
-SUBDIR=	include # stand
+SUBDIR=	compile include # stand
 
 .include <bsd.subdir.mk>

sys/arch/evbsh3/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:30 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/evbsh5/Makefile

@@ -1,5 +1,5 @@
-#	$NetBSD: Makefile,v 1.1 2002/07/10 08:56:11 scw Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/06 17:40:30 lukem Exp $
 
-SUBDIR= include
+SUBDIR=	compile include
 
 .include <bsd.subdir.mk>

sys/arch/evbsh5/compile/.keep_me

@@ -1 +0,0 @@
-This normally empty directory needs to be kept in the distribution.

sys/arch/evbsh5/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:31 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/hp300/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 1998/06/12 23:22:35 cgd Exp $
+#	$NetBSD: Makefile,v 1.11 2003/01/06 17:40:31 lukem Exp $
 
 # Makefile for hp300 tags file and boot blocks
 
@@ -27,6 +27,6 @@ links:
 	    cd $$i && rm -f tags; ln -s ../tags tags; done
 
 
-SUBDIR= include stand
+SUBDIR=	compile include stand
 
 .include <bsd.subdir.mk>

sys/arch/hp300/compile/.keep_me

@@ -1,3 +0,0 @@
-$NetBSD: .keep_me,v 1.2 1994/10/26 07:23:03 cgd Exp $
-
-This normally empty directory needs to be kept in the distribution.

sys/arch/hp300/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:31 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/hp700/Makefile

@@ -1,5 +1,5 @@
-#	$NetBSD: Makefile,v 1.1 2002/06/06 19:48:01 fredette Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/06 17:40:32 lukem Exp $
 
-SUBDIR=	include stand
+SUBDIR=	compile include stand
 
 .include <bsd.subdir.mk>

sys/arch/hp700/compile/.keep_me

@@ -1,3 +0,0 @@
-$NetBSD: .keep_me,v 1.1 2002/06/06 19:48:02 fredette Exp $
-
-This normally empty directory needs to be kept in the distribution.

sys/arch/hp700/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:32 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/hpcarm/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2001/02/23 03:48:06 ichiro Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/06 17:40:33 lukem Exp $
 
 # Makefile for hpcarm tags file and boot blocks
 
@@ -25,6 +25,6 @@ links:
 	    cd $$i && rm -f tags; ln -s ../tags tags; done
 
 
-SUBDIR=	include
+SUBDIR=	compile include
 
 .include <bsd.subdir.mk>

sys/arch/hpcarm/compile/.keep_me

@@ -1,3 +0,0 @@
-$NetBSD: .keep_me,v 1.1 2001/02/23 03:48:07 ichiro Exp $
-
-This file must remain so that 'cvs checkout' makes the compile directory.

sys/arch/hpcarm/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:33 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/hpcmips/Makefile

@@ -1,5 +1,5 @@
-#	$NetBSD: Makefile,v 1.3 2001/02/23 14:08:55 uch Exp $
+#	$NetBSD: Makefile,v 1.4 2003/01/06 17:40:33 lukem Exp $
 
-SUBDIR=	include
+SUBDIR=	compile include # stand
 
 .include <bsd.kinc.mk>

sys/arch/hpcmips/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:34 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/hpcsh/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2001/01/17 05:21:48 itojun Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/06 17:40:34 lukem Exp $
 
 # Makefile for hpcsh tags file and boot blocks
 
@@ -25,6 +25,6 @@ links:
 	    (cd $$i && rm -f tags; ln -s ../tags tags); done
 
 
-SUBDIR=	include # stand
+SUBDIR=	compile include # stand
 
 .include <bsd.subdir.mk>

sys/arch/hpcsh/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:34 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/i386/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19 2001/04/03 17:12:23 jhawk Exp $
+#	$NetBSD: Makefile,v 1.20 2003/01/06 17:40:35 lukem Exp $
 
 # Makefile for i386 tags file and boot blocks
 
@@ -26,6 +26,6 @@ links:
 	    (cd $$i && rm -f tags; ln -s ../tags tags); done
 
 
-SUBDIR=	include stand
+SUBDIR=	compile include stand
 
 .include <bsd.subdir.mk>

sys/arch/i386/compile/.keep_me

@@ -1,3 +0,0 @@
-$NetBSD: .keep_me,v 1.2 1994/10/27 04:14:44 cgd Exp $
-
-This normally empty directory needs to be kept in the distribution.

sys/arch/i386/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:35 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/luna68k/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2000/01/05 08:48:53 nisimura Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/06 17:40:35 lukem Exp $
 
 # Makefile for luna68k tags file
 
@@ -26,6 +26,6 @@ links:
 	-for i in ${DLUNA68K}; do \
 	    cd $$i && rm -f tags; ln -s ../tags tags; done
 
-SUBDIR=	include
+SUBDIR=	compile include
 
 .include <bsd.subdir.mk>

sys/arch/luna68k/compile/.keep_me

@@ -1,3 +0,0 @@
-$NetBSD: .keep_me,v 1.1 2000/01/17 00:55:37 nisimura Exp $
-
-This normally empty directory needs to be kept in the distribution.

sys/arch/luna68k/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:36 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/mac68k/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2001/04/03 17:12:23 jhawk Exp $
+#	$NetBSD: Makefile,v 1.8 2003/01/06 17:40:36 lukem Exp $
 
 # Makefile for mac68k tags file and boot blocks
 
@@ -28,6 +28,6 @@ links:
 	    (cd $$i && rm -f tags; ln -s ../tags tags); done
 
 
-SUBDIR=	include
+SUBDIR=	compile include
 
 .include <bsd.subdir.mk>

sys/arch/mac68k/compile/.keep_me

@@ -1,3 +0,0 @@
-$NetBSD: .keep_me,v 1.2 1994/10/26 08:45:50 cgd Exp $
-
-This normally empty directory needs to be kept in the distribution.

sys/arch/mac68k/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:37 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/macppc/Makefile

@@ -1,5 +1,5 @@
-#	$NetBSD: Makefile,v 1.2 1998/06/12 23:22:39 cgd Exp $
+#	$NetBSD: Makefile,v 1.3 2003/01/06 17:40:37 lukem Exp $
 
-SUBDIR=	include stand
+SUBDIR=	compile include stand
 
 .include <bsd.subdir.mk>

sys/arch/macppc/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:38 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/mipsco/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2000/09/26 11:45:06 wdk Exp $
+#	$NetBSD: Makefile,v 1.4 2003/01/06 17:40:38 lukem Exp $
 
 # Makefile for mipsco tags file
 
@@ -26,6 +26,6 @@ links:
 	-for i in ${DMIPSCO}; do \
 	    cd $$i && rm -f tags; ln -s ../tags tags; done
 
-SUBDIR=	include stand
+SUBDIR=	compile include stand
 
 .include <bsd.subdir.mk>

sys/arch/mipsco/compile/.keep_me

@@ -1,3 +0,0 @@
-$NetBSD: .keep_me,v 1.1 2000/08/12 22:57:57 wdk Exp $
-
-This normally empty directory needs to be kept in the distribution.

sys/arch/mipsco/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:38 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/mmeye/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 1999/09/13 10:30:47 itojun Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/06 17:40:39 lukem Exp $
 
 # Makefile for mmeye tags file and boot blocks
 
@@ -25,6 +25,6 @@ links:
 	    (cd $$i && rm -f tags; ln -s ../tags tags); done
 
 
-SUBDIR=	include stand
+SUBDIR=	compile include stand
 
 .include <bsd.subdir.mk>

sys/arch/mmeye/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:39 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/mvme68k/Makefile

@@ -1,5 +1,5 @@
-#	$NetBSD: Makefile,v 1.2 1998/06/12 23:22:40 cgd Exp $
+#	$NetBSD: Makefile,v 1.3 2003/01/06 17:40:39 lukem Exp $
 
-SUBDIR=	include stand
+SUBDIR=	compile include stand
 
 .include <bsd.subdir.mk>

sys/arch/mvme68k/compile/.keep_me

@@ -1 +0,0 @@
-This normally empty directory needs to be kept in the distribution.

sys/arch/mvme68k/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:40 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/mvmeppc/Makefile

@@ -1,5 +1,5 @@
-#	$NetBSD: Makefile,v 1.1 2002/02/28 21:54:42 scw Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/06 17:40:40 lukem Exp $
 
-SUBDIR=	include stand
+SUBDIR=	compile include stand
 
 .include <bsd.subdir.mk>

sys/arch/mvmeppc/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:40 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/netwinder/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2001/06/11 17:46:23 matt Exp $
+#	$NetBSD: Makefile,v 1.2 2003/01/06 17:40:40 lukem Exp $
 
 # Makefile for netwinder tags file and boot blocks
 
@@ -24,6 +24,6 @@ links:
 	    cd $$i && rm -f tags; ln -s ../tags tags; done
 
 
-SUBDIR=	include
+SUBDIR=	compile include
 
 .include <bsd.subdir.mk>

sys/arch/netwinder/compile/.keep_me

@@ -1,3 +0,0 @@
-$NetBSD: .keep_me,v 1.1 2001/05/22 22:48:09 matt Exp $
-
-This normally empty directory needs to be kept in the distribution.

sys/arch/netwinder/compile/Makefile

@@ -0,0 +1,3 @@
+#	$NetBSD: Makefile,v 1.1 2003/01/06 17:40:41 lukem Exp $
+
+.include <bsd.prog.mk>

sys/arch/news68k/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2000/10/05 18:21:10 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.3 2003/01/06 17:40:41 lukem Exp $
 
 # Makefile for news68k tags file
 
@@ -26,6 +26,6 @@ links:
 	-for i in ${DNEWS68K}; do \
 	    cd $$i && rm -f tags; ln -s ../tags tags; done
 
-SUBDIR=	include stand
+SUBDIR=	compile include stand
 
 .include <bsd.subdir.mk>

sys/arch/news68k/compile/.keep_me

@@ -1,3 +0,0 @@
-$NetBSD: .keep_me,v 1.1 1999/12/09 14:53:02 tsutsui Exp $
-
-This normally empty directory needs to be kept in the distribution.