redo the way MAKEDEV files are generated

get it in, deraadt@

src/etc/MAKEDEV.mi

@@ -1,7 +1,7 @@
 define(COMM,`#')dnl
 include(MAKEDEV.sub)dnl
 dnl
-vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.77 2005/10/06 06:43:19 otto Exp $-})dnl
+vers(a, {-$OpenBSD: MAKEDEV.mi,v 1.78 2008/06/14 23:09:05 todd Exp $-})dnl
 dnl
 divert(1)dnl
 {-#-}
@@ -53,7 +53,7 @@ std)
 dnl
 divert(1)dnl
 define(__mddivert,7)dnl
-include(etc.MACHINE/MAKEDEV.md)dnl
+include(MAKEDEV.md)dnl
 dnl
 dnl
 divert(0)dnl

src/etc/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.265 2008/06/08 03:03:37 jdixon Exp $
+#	$OpenBSD: Makefile,v 1.266 2008/06/14 23:09:05 todd Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -288,53 +288,6 @@ snap_pre:
 
 .endif	# DESTDIR check
 
-MAKEDEVARCHS+= alpha
-MAKEDEVARCHS+= amd64
-MAKEDEVARCHS+= armish
-MAKEDEVARCHS+= hp300
-MAKEDEVARCHS+= hppa
-MAKEDEVARCHS+= hppa64
-MAKEDEVARCHS+= i386
-MAKEDEVARCHS+= landisk
-MAKEDEVARCHS+= luna88k
-MAKEDEVARCHS+= mac68k
-MAKEDEVARCHS+= macppc
-MAKEDEVARCHS+= mvme68k
-MAKEDEVARCHS+= mvme88k
-#MAKEDEVARCHS+= mvmeppc
-MAKEDEVARCHS+= sgi
-MAKEDEVARCHS+= socppc
-MAKEDEVARCHS+= sparc
-MAKEDEVARCHS+= sparc64
-MAKEDEVARCHS+= vax
-MAKEDEVARCHS+= zaurus
-
-clean:
-	rm -f etc.${MACHINE}/MAKEDEV
-
-cleandir:
-	cd ${.CURDIR}; for m in ${MAKEDEVARCHS}; do \
-	    ${MAKE} MACHINE=$$m clean; done
-
-MAKEDEVSRC=	MAKEDEV.mi MAKEDEV.sub MAKEDEV.common
-MAKEDEVDOC=	MAKEDEV.man MAKEDEV.mansub MAKEDEV.common
-m4: etc.${M}/MAKEDEV
-man: ${.CURDIR}/../share/man/man8/man.${M}/MAKEDEV.8
-
-etc.${M}/MAKEDEV: ${MAKEDEVSRC} etc.${M}/MAKEDEV.md
-	@echo "==> etc.${M}/MAKEDEV"
-	m4 -DMACHINE=${M} MAKEDEV.mi > etc.${M}/.MAKEDEV.tmp && \
-	    mv etc.${M}/.MAKEDEV.tmp etc.${M}/MAKEDEV || \
-	    rm etc.${M}/.MAKEDEV.tmp
-
-${.CURDIR}/../share/man/man8/man.${M}/MAKEDEV.8: ${MAKEDEVDOC} etc.${M}/MAKEDEV.md
-	m4 -DMACHINE=${M} MAKEDEV.man > \
-	    ${.CURDIR}/../share/man/man8/man8.${M}/MAKEDEV.8
-
-allarchs: ${MAKEDEVSRC} ${MAKEDEVDOC}
-	cd ${.CURDIR}; for m in ${MAKEDEVARCHS}; do \
-	    ${MAKE} M=$$m m4 man; done
-
 distrib:
 	cd ${.CURDIR}/../distrib && \
 	    ${MAKE} && exec ${SUDO} ${MAKE} install
@@ -352,4 +305,27 @@ update-moduli:
 
 .PHONY: distribution-etc-root-var distribution distrib-dirs \
 	release allarchs snap_md m4 snap_pre
+
+SUBDIR+= etc.alpha
+SUBDIR+= etc.amd64
+SUBDIR+= etc.armish
+SUBDIR+= etc.aviion
+SUBDIR+= etc.hp300
+SUBDIR+= etc.hppa
+SUBDIR+= etc.hppa64
+SUBDIR+= etc.i386
+SUBDIR+= etc.landisk
+SUBDIR+= etc.luna88k
+SUBDIR+= etc.mac68k
+SUBDIR+= etc.macppc
+SUBDIR+= etc.mvme68k
+SUBDIR+= etc.mvme88k
+SUBDIR+= etc.sgi
+SUBDIR+= etc.socppc
+SUBDIR+= etc.sparc
+SUBDIR+= etc.sparc64
+SUBDIR+= etc.vax
+SUBDIR+= etc.zaurus
+
+.include <bsd.subdir.mk>
 .include <bsd.prog.mk>

src/etc/Makefile.inc

@@ -0,0 +1,13 @@
+#	$OpenBSD: Makefile.inc,v 1.1 2008/06/14 23:09:05 todd Exp $
+
+MAKEDEVSRC=	${.CURDIR}/../MAKEDEV.mi
+MAKEDEVSRC+=	${.CURDIR}/../MAKEDEV.sub
+MAKEDEVSRC+=	${.CURDIR}/../MAKEDEV.common
+MAKEDEVSRC+=	MAKEDEV.md
+
+MAKEDEV: ${MAKEDEVSRC}
+	@echo m4 -I.. ../MAKEDEV.mi '>' MAKEDEV
+	@m4 -I${.CURDIR}/.. \
+		${.CURDIR}/../MAKEDEV.mi > .MAKEDEV.tmp && \
+		mv .MAKEDEV.tmp MAKEDEV || \
+		rm .MAKEDEV.tmp

src/etc/etc.alpha/MAKEDEV.md

@@ -1,5 +1,6 @@
+define(MACHINE,alpha)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.37 2008/06/13 21:07:27 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.38 2008/06/14 23:09:05 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>

src/etc/etc.alpha/Makefile

@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:05 todd Exp $
+
+NOOBJ=
+
+all: MAKEDEV
+
+.include <bsd.prog.mk>

src/etc/etc.amd64/MAKEDEV.md

@@ -1,5 +1,6 @@
+define(MACHINE,amd64)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.28 2008/06/13 21:07:27 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.29 2008/06/14 23:09:05 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>

src/etc/etc.amd64/Makefile

@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:05 todd Exp $
+
+NOOBJ=
+
+all: MAKEDEV
+
+.include <bsd.prog.mk>

src/etc/etc.armish/MAKEDEV.md

@@ -1,5 +1,6 @@
+define(MACHINE,armish)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.8 2008/06/13 21:07:27 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.9 2008/06/14 23:09:05 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>

src/etc/etc.armish/Makefile

@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:05 todd Exp $
+
+NOOBJ=
+
+all: MAKEDEV
+
+.include <bsd.prog.mk>

src/etc/etc.aviion/MAKEDEV.md

@@ -1,5 +1,6 @@
+define(MACHINE,aviion)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.5 2008/06/13 21:07:28 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.6 2008/06/14 23:09:05 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>

src/etc/etc.aviion/Makefile

@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:05 todd Exp $
+
+NOOBJ=
+
+all: MAKEDEV
+
+.include <bsd.prog.mk>

src/etc/etc.hp300/MAKEDEV.md

@@ -1,5 +1,6 @@
+define(MACHINE,hp300)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.32 2008/06/13 21:07:28 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.33 2008/06/14 23:09:05 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>

src/etc/etc.hp300/Makefile

@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:05 todd Exp $
+
+NOOBJ=
+
+all: MAKEDEV
+
+.include <bsd.prog.mk>

src/etc/etc.hppa/MAKEDEV.md

@@ -1,5 +1,6 @@
+define(MACHINE,hppa)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.33 2008/06/13 21:07:28 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.34 2008/06/14 23:09:05 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>

src/etc/etc.hppa/Makefile

@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:05 todd Exp $
+
+NOOBJ=
+
+all: MAKEDEV
+
+.include <bsd.prog.mk>

src/etc/etc.hppa64/MAKEDEV.md

@@ -1,5 +1,6 @@
+define(MACHINE,hppa64)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.10 2008/06/13 21:07:28 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.11 2008/06/14 23:09:06 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>

src/etc/etc.hppa64/Makefile

@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
+
+NOOBJ=
+
+all: MAKEDEV
+
+.include <bsd.prog.mk>

src/etc/etc.i386/MAKEDEV.md

@@ -1,5 +1,6 @@
+define(MACHINE,i386)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.45 2008/06/14 22:06:47 mbalmer Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.46 2008/06/14 23:09:06 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>

src/etc/etc.i386/Makefile

@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
+
+NOOBJ=
+
+all: MAKEDEV
+
+.include <bsd.prog.mk>

src/etc/etc.landisk/MAKEDEV.md

@@ -1,5 +1,6 @@
+define(MACHINE,landisk)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.10 2008/06/13 21:07:28 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.11 2008/06/14 23:09:06 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>

src/etc/etc.landisk/Makefile

@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
+
+NOOBJ=
+
+all: MAKEDEV
+
+.include <bsd.prog.mk>

src/etc/etc.luna88k/MAKEDEV.md

@@ -1,5 +1,6 @@
+define(MACHINE,luna88k)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.8 2008/06/13 21:07:28 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.9 2008/06/14 23:09:06 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>

src/etc/etc.luna88k/Makefile

@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
+
+NOOBJ=
+
+all: MAKEDEV
+
+.include <bsd.prog.mk>

src/etc/etc.mac68k/MAKEDEV.md

@@ -1,5 +1,6 @@
+define(MACHINE,mac68k)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.26 2008/06/13 21:07:28 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.27 2008/06/14 23:09:06 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>

src/etc/etc.mac68k/Makefile

@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
+
+NOOBJ=
+
+all: MAKEDEV
+
+.include <bsd.prog.mk>

src/etc/etc.macppc/MAKEDEV.md

@@ -1,5 +1,6 @@
+define(MACHINE,macppc)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.34 2008/06/13 21:07:28 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.35 2008/06/14 23:09:06 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>

src/etc/etc.macppc/Makefile

@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
+
+NOOBJ=
+
+all: MAKEDEV
+
+.include <bsd.prog.mk>

src/etc/etc.mvme68k/MAKEDEV.md

@@ -1,5 +1,6 @@
+define(MACHINE,mvme68k)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.20 2008/06/13 21:07:28 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.21 2008/06/14 23:09:06 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>

src/etc/etc.mvme68k/Makefile

@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
+
+NOOBJ=
+
+all: MAKEDEV
+
+.include <bsd.prog.mk>

src/etc/etc.mvme88k/MAKEDEV.md

@@ -1,5 +1,6 @@
+define(MACHINE,mvme88k)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.20 2008/06/13 21:07:28 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.21 2008/06/14 23:09:06 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>

src/etc/etc.mvme88k/Makefile

@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
+
+NOOBJ=
+
+all: MAKEDEV
+
+.include <bsd.prog.mk>

src/etc/etc.mvmeppc/MAKEDEV.md

@@ -1,5 +1,6 @@
+define(MACHINE,macppc)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.26 2008/06/13 21:07:28 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.27 2008/06/14 23:09:06 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>

src/etc/etc.sgi/MAKEDEV.md

@@ -1,5 +1,6 @@
+define(MACHINE,sgi)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.17 2008/06/13 21:07:28 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.18 2008/06/14 23:09:06 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>

src/etc/etc.sgi/Makefile

@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
+
+NOOBJ=
+
+all: MAKEDEV
+
+.include <bsd.prog.mk>

src/etc/etc.socppc/MAKEDEV.md

@@ -1,5 +1,6 @@
+define(MACHINE,socppc)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.2 2008/06/12 20:39:29 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.3 2008/06/14 23:09:06 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>

src/etc/etc.socppc/Makefile

@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
+
+NOOBJ=
+
+all: MAKEDEV
+
+.include <bsd.prog.mk>

src/etc/etc.sparc/MAKEDEV.md

@@ -1,5 +1,6 @@
+define(MACHINE,sparc)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.36 2008/06/13 21:07:28 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.37 2008/06/14 23:09:06 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>

src/etc/etc.sparc/Makefile

@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
+
+NOOBJ=
+
+all: MAKEDEV
+
+.include <bsd.prog.mk>

src/etc/etc.sparc64/MAKEDEV.md

@@ -1,5 +1,6 @@
+define(MACHINE,sparc64)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.47 2008/06/13 21:07:28 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.48 2008/06/14 23:09:06 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>

src/etc/etc.sparc64/Makefile

@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
+
+NOOBJ=
+
+all: MAKEDEV
+
+.include <bsd.prog.mk>

src/etc/etc.vax/MAKEDEV.md

@@ -1,5 +1,6 @@
+define(MACHINE,vax)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.33 2008/06/13 21:07:28 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.34 2008/06/14 23:09:06 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2006 Todd T. Fries <todd@OpenBSD.org>

src/etc/etc.vax/Makefile

@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
+
+NOOBJ=
+
+all: MAKEDEV
+
+.include <bsd.prog.mk>

src/etc/etc.zaurus/MAKEDEV.md

@@ -1,5 +1,6 @@
+define(MACHINE,zaurus)dnl
 vers(__file__,
-	{-$OpenBSD: MAKEDEV.md,v 1.15 2008/06/13 21:07:28 todd Exp $-},
+	{-$OpenBSD: MAKEDEV.md,v 1.16 2008/06/14 23:09:06 todd Exp $-},
 etc.MACHINE)dnl
 dnl
 dnl Copyright (c) 2001-2004 Todd T. Fries <todd@OpenBSD.org>

src/etc/etc.zaurus/Makefile

@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2008/06/14 23:09:06 todd Exp $
+
+NOOBJ=
+
+all: MAKEDEV
+
+.include <bsd.prog.mk>