Rework installboot and use a single directory with a single makefile. The

directory per machine model is arguably cleaner, however it does not play
well with distrib/special and instbin.

Discussed with deraadt@

35 files changed, 112 insertions, 116 deletions

diff --git a/usr.sbin/installboot/Makefile b/usr.sbin/installboot/Makefile
index 5cf07fc7d27..e821528b4dd 100644
--- a/usr.sbin/installboot/Makefile
+++ b/usr.sbin/installboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.10 2014/01/18 02:47:27 jsing Exp $
+#	$OpenBSD: Makefile,v 1.11 2014/01/19 02:58:50 jsing Exp $
 
 PROG=		installboot
 SRCS=		installboot.c util.c
@@ -10,7 +10,106 @@ DPADD=		${LIBUTIL}
 
 LDSTATIC=	-static
 
-.include "${.CURDIR}/${MACHINE}/Makefile.inc"
+.if ${MACHINE} == "alpha"
+SRCS += stubs.c
+.endif
+
+.if ${MACHINE} == "amd64"
+CFLAGS += -DSOFTRAID
+SRCS += i386_installboot.c
+SRCS += i386_nlist.c
+SRCS += i386_softraid.c
+.endif
+
+.if ${MACHINE} == "armish"
+SRCS += stubs.c
+.endif
+
+.if ${MACHINE} == "armv7"
+SRCS += stubs.c
+.endif
+
+.if ${MACHINE} == "aviion"
+SRCS += stubs.c
+.endif
+
+.if ${MACHINE} == "hp300"
+CFLAGS += -DBOOTSTRAP
+SRCS += hp300_installboot.c
+.endif
+
+.if ${MACHINE} == "hppa"
+CFLAGS += -DBOOTSTRAP
+SRCS += hppa_installboot.c
+.endif
+
+.if ${MACHINE} == "hppa64"
+CFLAGS += -DBOOTSTRAP
+SRCS += hppa64_installboot.c
+.endif
+
+.if ${MACHINE} == "i386"
+CFLAGS += -DSOFTRAID
+SRCS += i386_installboot.c
+SRCS += i386_nlist.c
+SRCS += i386_softraid.c
+.endif
+
+.if ${MACHINE} == "landisk"
+CFLAGS += -DBOOTSTRAP
+SRCS += landisk_installboot.c
+.endif
+
+.if ${MACHINE} == "loongson"
+SRCS += stubs.c
+.endif
+
+.if ${MACHINE} == "luna88k"
+SRCS += stubs.c
+.endif
+
+.if ${MACHINE} == "macppc"
+SRCS += stubs.c
+.endif
+
+.if ${MACHINE} == "mvme68k"
+SRCS += stubs.c
+.endif
+
+.if ${MACHINE} == "mvme88k"
+SRCS += stubs.c
+.endif
+
+.if ${MACHINE} == "octeon"
+SRCS += stubs.c
+.endif
+
+.if ${MACHINE} == "sgi"
+SRCS += stubs.c
+.endif
+
+.if ${MACHINE} == "socppc"
+SRCS += stubs.c
+.endif
+
+.if ${MACHINE} == "sparc"
+SRCS += stubs.c
+.endif
+
+.if ${MACHINE} == "sparc64"
+CFLAGS += -DSOFTRAID
+SRCS += sparc64_installboot.c
+SRCS += sparc64_softraid.c
+.endif
+
+.if ${MACHINE} == "vax"
+CFLAGS += -DBOOTSTRAP
+SRCS += vax_installboot.c
+.endif
+
+.if ${MACHINE} == "zaurus"
+SRCS += stubs.c
+.endif
 
 .if !empty(CFLAGS:M-DBOOTSTRAP)
 SRCS += bootstrap.c
diff --git a/usr.sbin/installboot/alpha/Makefile.inc b/usr.sbin/installboot/alpha/Makefile.inc
deleted file mode 100644
index 06d9b79bafd..00000000000
--- a/usr.sbin/installboot/alpha/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2014/01/18 01:44:56 jsing Exp $	
-
-SRCS+=	stubs.c
diff --git a/usr.sbin/installboot/amd64/Makefile.inc b/usr.sbin/installboot/amd64/Makefile.inc
deleted file mode 100644
index a2e7c8a0d75..00000000000
--- a/usr.sbin/installboot/amd64/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.3 2013/12/28 11:00:33 jsing Exp $
-
-CPPFLAGS += -I${.CURDIR}/amd64
-CFLAGS += -DSOFTRAID
-
-.PATH:  ${.CURDIR}/i386
-SRCS += i386_installboot.c
-SRCS += i386_nlist.c
-SRCS += i386_softraid.c
diff --git a/usr.sbin/installboot/armish/Makefile.inc b/usr.sbin/installboot/armish/Makefile.inc
deleted file mode 100644
index 06d9b79bafd..00000000000
--- a/usr.sbin/installboot/armish/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2014/01/18 01:44:56 jsing Exp $	
-
-SRCS+=	stubs.c
diff --git a/usr.sbin/installboot/armv7/Makefile.inc b/usr.sbin/installboot/armv7/Makefile.inc
deleted file mode 100644
index 06d9b79bafd..00000000000
--- a/usr.sbin/installboot/armv7/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2014/01/18 01:44:56 jsing Exp $	
-
-SRCS+=	stubs.c
diff --git a/usr.sbin/installboot/aviion/Makefile.inc b/usr.sbin/installboot/aviion/Makefile.inc
deleted file mode 100644
index 06d9b79bafd..00000000000
--- a/usr.sbin/installboot/aviion/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2014/01/18 01:44:56 jsing Exp $	
-
-SRCS+=	stubs.c
diff --git a/usr.sbin/installboot/hp300/Makefile.inc b/usr.sbin/installboot/hp300/Makefile.inc
deleted file mode 100644
index 6d3868e9698..00000000000
--- a/usr.sbin/installboot/hp300/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2013/12/28 13:58:15 jsing Exp $
-
-CPPFLAGS += -I${.CURDIR}/hp300
-CFLAGS += -DBOOTSTRAP
-
-.PATH:  ${.CURDIR}/hp300
-SRCS += hp300_installboot.c
diff --git a/usr.sbin/installboot/hp300/hp300_installboot.c b/usr.sbin/installboot/hp300_installboot.c
index 667e711f1ce..05858612a88 100644
--- a/usr.sbin/installboot/hp300/hp300_installboot.c
+++ b/usr.sbin/installboot/hp300_installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hp300_installboot.c,v 1.1 2013/12/28 13:58:15 jsing Exp $	*/
+/*	$OpenBSD: hp300_installboot.c,v 1.1 2014/01/19 02:58:50 jsing Exp $	*/
 
 /*
  * Copyright (c) 2013 Joel Sing <jsing@openbsd.org>
diff --git a/usr.sbin/installboot/hppa/Makefile.inc b/usr.sbin/installboot/hppa/Makefile.inc
deleted file mode 100644
index b5c651dec6b..00000000000
--- a/usr.sbin/installboot/hppa/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.2 2013/12/28 11:00:33 jsing Exp $
-
-CPPFLAGS += -I${.CURDIR}/hppa
-CFLAGS += -DBOOTSTRAP
-
-.PATH:  ${.CURDIR}/hppa
-SRCS += hppa_installboot.c
diff --git a/usr.sbin/installboot/hppa64/Makefile.inc b/usr.sbin/installboot/hppa64/Makefile.inc
deleted file mode 100644
index 229d2e9d92d..00000000000
--- a/usr.sbin/installboot/hppa64/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2013/12/28 13:58:15 jsing Exp $
-
-CPPFLAGS += -I${.CURDIR}/hppa64
-CFLAGS += -DBOOTSTRAP
-
-.PATH:  ${.CURDIR}/hppa64
-SRCS += hppa64_installboot.c
diff --git a/usr.sbin/installboot/hppa64/hppa64_installboot.c b/usr.sbin/installboot/hppa64_installboot.c
index d5e0af4a087..88daf94d901 100644
--- a/usr.sbin/installboot/hppa64/hppa64_installboot.c
+++ b/usr.sbin/installboot/hppa64_installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hppa64_installboot.c,v 1.1 2013/12/28 13:58:15 jsing Exp $	*/
+/*	$OpenBSD: hppa64_installboot.c,v 1.1 2014/01/19 02:58:50 jsing Exp $	*/
 
 /*
  * Copyright (c) 2013 Joel Sing <jsing@openbsd.org>
diff --git a/usr.sbin/installboot/hppa/hppa_installboot.c b/usr.sbin/installboot/hppa_installboot.c
index 9bbdd38d90c..27af0fa0cbd 100644
--- a/usr.sbin/installboot/hppa/hppa_installboot.c
+++ b/usr.sbin/installboot/hppa_installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hppa_installboot.c,v 1.2 2013/12/28 13:58:15 jsing Exp $	*/
+/*	$OpenBSD: hppa_installboot.c,v 1.1 2014/01/19 02:58:50 jsing Exp $	*/
 
 /*
  * Copyright (c) 2013 Joel Sing <jsing@openbsd.org>
diff --git a/usr.sbin/installboot/i386/Makefile.inc b/usr.sbin/installboot/i386/Makefile.inc
deleted file mode 100644
index 7aa4eb07213..00000000000
--- a/usr.sbin/installboot/i386/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.3 2013/12/28 11:00:33 jsing Exp $
-
-CPPFLAGS += -I${.CURDIR}/i386
-CFLAGS += -DSOFTRAID
-
-.PATH:  ${.CURDIR}/i386
-SRCS += i386_installboot.c
-SRCS += i386_nlist.c
-SRCS += i386_softraid.c
diff --git a/usr.sbin/installboot/i386/i386_installboot.c b/usr.sbin/installboot/i386_installboot.c
index c7c8311ee35..2a0d188cd29 100644
--- a/usr.sbin/installboot/i386/i386_installboot.c
+++ b/usr.sbin/installboot/i386_installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i386_installboot.c,v 1.5 2014/01/18 03:07:05 jsing Exp $	*/
+/*	$OpenBSD: i386_installboot.c,v 1.1 2014/01/19 02:58:50 jsing Exp $	*/
 /*	$NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */
 
 /*
diff --git a/usr.sbin/installboot/i386/i386_installboot.h b/usr.sbin/installboot/i386_installboot.h
index f42ff8f27c2..f42ff8f27c2 100644
--- a/usr.sbin/installboot/i386/i386_installboot.h
+++ b/usr.sbin/installboot/i386_installboot.h
diff --git a/usr.sbin/installboot/i386/i386_nlist.c b/usr.sbin/installboot/i386_nlist.c
index af6b1440713..92a5e670d2d 100644
--- a/usr.sbin/installboot/i386/i386_nlist.c
+++ b/usr.sbin/installboot/i386_nlist.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i386_nlist.c,v 1.2 2013/12/27 15:02:49 jsing Exp $	*/
+/*	$OpenBSD: i386_nlist.c,v 1.1 2014/01/19 02:58:50 jsing Exp $	*/
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
diff --git a/usr.sbin/installboot/i386/i386_softraid.c b/usr.sbin/installboot/i386_softraid.c
index 98f5209490d..c2409744fda 100644
--- a/usr.sbin/installboot/i386/i386_softraid.c
+++ b/usr.sbin/installboot/i386_softraid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i386_softraid.c,v 1.2 2013/12/28 11:26:57 jsing Exp $	*/
+/*	$OpenBSD: i386_softraid.c,v 1.1 2014/01/19 02:58:50 jsing Exp $	*/
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
  *
diff --git a/usr.sbin/installboot/landisk/Makefile.inc b/usr.sbin/installboot/landisk/Makefile.inc
deleted file mode 100644
index a2e2938c47a..00000000000
--- a/usr.sbin/installboot/landisk/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2013/12/28 13:58:15 jsing Exp $
-
-CPPFLAGS += -I${.CURDIR}/landisk
-CFLAGS += -DBOOTSTRAP
-
-.PATH:  ${.CURDIR}/landisk
-SRCS += landisk_installboot.c
diff --git a/usr.sbin/installboot/landisk/landisk_installboot.c b/usr.sbin/installboot/landisk_installboot.c
index 0862e750a4e..2f3fde47327 100644
--- a/usr.sbin/installboot/landisk/landisk_installboot.c
+++ b/usr.sbin/installboot/landisk_installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: landisk_installboot.c,v 1.1 2013/12/28 13:58:15 jsing Exp $	*/
+/*	$OpenBSD: landisk_installboot.c,v 1.1 2014/01/19 02:58:50 jsing Exp $	*/
 
 /*
  * Copyright (c) 2013 Joel Sing <jsing@openbsd.org>
diff --git a/usr.sbin/installboot/loongson/Makefile.inc b/usr.sbin/installboot/loongson/Makefile.inc
deleted file mode 100644
index 06d9b79bafd..00000000000
--- a/usr.sbin/installboot/loongson/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2014/01/18 01:44:56 jsing Exp $	
-
-SRCS+=	stubs.c
diff --git a/usr.sbin/installboot/luna88k/Makefile.inc b/usr.sbin/installboot/luna88k/Makefile.inc
deleted file mode 100644
index 06d9b79bafd..00000000000
--- a/usr.sbin/installboot/luna88k/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2014/01/18 01:44:56 jsing Exp $	
-
-SRCS+=	stubs.c
diff --git a/usr.sbin/installboot/macppc/Makefile.inc b/usr.sbin/installboot/macppc/Makefile.inc
deleted file mode 100644
index 5f62d19d7ce..00000000000
--- a/usr.sbin/installboot/macppc/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2014/01/18 02:31:18 jsing Exp $	
-
-SRCS+=	stubs.c
diff --git a/usr.sbin/installboot/mvme68k/Makefile.inc b/usr.sbin/installboot/mvme68k/Makefile.inc
deleted file mode 100644
index 06d9b79bafd..00000000000
--- a/usr.sbin/installboot/mvme68k/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2014/01/18 01:44:56 jsing Exp $	
-
-SRCS+=	stubs.c
diff --git a/usr.sbin/installboot/mvme88k/Makefile.inc b/usr.sbin/installboot/mvme88k/Makefile.inc
deleted file mode 100644
index 06d9b79bafd..00000000000
--- a/usr.sbin/installboot/mvme88k/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2014/01/18 01:44:56 jsing Exp $	
-
-SRCS+=	stubs.c
diff --git a/usr.sbin/installboot/octeon/Makefile.inc b/usr.sbin/installboot/octeon/Makefile.inc
deleted file mode 100644
index 2ccda28fb7a..00000000000
--- a/usr.sbin/installboot/octeon/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2014/01/18 01:44:57 jsing Exp $	
-
-SRCS+=	stubs.c
diff --git a/usr.sbin/installboot/sgi/Makefile.inc b/usr.sbin/installboot/sgi/Makefile.inc
deleted file mode 100644
index 2ccda28fb7a..00000000000
--- a/usr.sbin/installboot/sgi/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2014/01/18 01:44:57 jsing Exp $	
-
-SRCS+=	stubs.c
diff --git a/usr.sbin/installboot/socppc/Makefile.inc b/usr.sbin/installboot/socppc/Makefile.inc
deleted file mode 100644
index 2ccda28fb7a..00000000000
--- a/usr.sbin/installboot/socppc/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2014/01/18 01:44:57 jsing Exp $	
-
-SRCS+=	stubs.c
diff --git a/usr.sbin/installboot/sparc/Makefile.inc b/usr.sbin/installboot/sparc/Makefile.inc
deleted file mode 100644
index 2ccda28fb7a..00000000000
--- a/usr.sbin/installboot/sparc/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2014/01/18 01:44:57 jsing Exp $	
-
-SRCS+=	stubs.c
diff --git a/usr.sbin/installboot/sparc64/Makefile.inc b/usr.sbin/installboot/sparc64/Makefile.inc
deleted file mode 100644
index 36106e281d0..00000000000
--- a/usr.sbin/installboot/sparc64/Makefile.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2013/12/28 14:45:57 jsing Exp $
-
-CPPFLAGS += -I${.CURDIR}/sparc64
-CFLAGS += -DSOFTRAID
-
-.PATH:  ${.CURDIR}/sparc64
-SRCS += sparc64_installboot.c
-SRCS += sparc64_softraid.c
diff --git a/usr.sbin/installboot/sparc64/sparc64_installboot.c b/usr.sbin/installboot/sparc64_installboot.c
index 391c7801be1..1a82392affb 100644
--- a/usr.sbin/installboot/sparc64/sparc64_installboot.c
+++ b/usr.sbin/installboot/sparc64_installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sparc64_installboot.c,v 1.4 2014/01/18 03:07:05 jsing Exp $	*/
+/*	$OpenBSD: sparc64_installboot.c,v 1.1 2014/01/19 02:58:50 jsing Exp $	*/
 
 /*
  * Copyright (c) 2012, 2013 Joel Sing <jsing@openbsd.org>
diff --git a/usr.sbin/installboot/sparc64/sparc64_installboot.h b/usr.sbin/installboot/sparc64_installboot.h
index 0f0b5b278f8..e37ee1a33a7 100644
--- a/usr.sbin/installboot/sparc64/sparc64_installboot.h
+++ b/usr.sbin/installboot/sparc64_installboot.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sparc64_installboot.h,v 1.1 2013/12/28 14:45:57 jsing Exp $	*/
+/*	$OpenBSD: sparc64_installboot.h,v 1.1 2014/01/19 02:58:50 jsing Exp $	*/
 
 /*
  * Copyright (c) 2013 Joel Sing <jsing@openbsd.org>
diff --git a/usr.sbin/installboot/sparc64/sparc64_softraid.c b/usr.sbin/installboot/sparc64_softraid.c
index 1884c4c23b0..659d82f699c 100644
--- a/usr.sbin/installboot/sparc64/sparc64_softraid.c
+++ b/usr.sbin/installboot/sparc64_softraid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sparc64_softraid.c,v 1.2 2013/12/28 15:05:34 jsing Exp $	*/
+/*	$OpenBSD: sparc64_softraid.c,v 1.1 2014/01/19 02:58:50 jsing Exp $	*/
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
  *
diff --git a/usr.sbin/installboot/vax/Makefile.inc b/usr.sbin/installboot/vax/Makefile.inc
deleted file mode 100644
index de415e94f9e..00000000000
--- a/usr.sbin/installboot/vax/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2013/12/28 12:03:57 jsing Exp $
-
-CPPFLAGS += -I${.CURDIR}/vax
-CFLAGS += -DBOOTSTRAP
-
-.PATH:  ${.CURDIR}/vax
-SRCS += vax_installboot.c
diff --git a/usr.sbin/installboot/vax/vax_installboot.c b/usr.sbin/installboot/vax_installboot.c
index 9bcd5ad84a1..1266101d45c 100644
--- a/usr.sbin/installboot/vax/vax_installboot.c
+++ b/usr.sbin/installboot/vax_installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vax_installboot.c,v 1.1 2013/12/28 12:03:57 jsing Exp $	*/
+/*	$OpenBSD: vax_installboot.c,v 1.1 2014/01/19 02:58:50 jsing Exp $	*/
 
 /*
  * Copyright (c) 2013 Joel Sing <jsing@openbsd.org>
diff --git a/usr.sbin/installboot/zaurus/Makefile.inc b/usr.sbin/installboot/zaurus/Makefile.inc
deleted file mode 100644
index 2ccda28fb7a..00000000000
--- a/usr.sbin/installboot/zaurus/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2014/01/18 01:44:57 jsing Exp $	
-
-SRCS+=	stubs.c