From 60a2ce010afe8dd2e9acd17960eb359f4420479e Mon Sep 17 00:00:00 2001
From: Evgeniy Ivanov <lolkaantimat@gmail.com>
Date: Wed, 25 Jan 2012 23:32:10 +0400
Subject: [PATCH] Integrate new boot stuff into build scheme.

- Build sys with everything else.
- Gitignore files built by new boot stuff.
---
 Makefile                                            |  5 +++++
 sys/Makefile                                        | 10 ++++++++++
 sys/arch/i386/stand/boot/biosboot/Makefile          |  1 +
 sys/arch/i386/stand/bootxx/bootxx_ext2fs/Makefile   |  1 +
 sys/arch/i386/stand/bootxx/bootxx_minixfs3/Makefile |  1 +
 usr.sbin/Makefile                                   |  2 +-
 6 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 sys/Makefile

diff --git a/Makefile b/Makefile
index 916c3c356..b86bdb745 100644
--- a/Makefile
+++ b/Makefile
@@ -67,6 +67,7 @@ commands: includes libraries
 
 dep-all:
 	$(MAKE) CC=cc -C boot dependall
+	$(MAKE) CC=clang -C sys dependall
 	$(MAKE) -C commands dependall
 	$(MAKE) -C bin dependall
 	$(MAKE) -C sbin dependall
@@ -85,6 +86,7 @@ etcforce:
 
 all:
 	$(MAKE) CC=cc -C boot all
+	$(MAKE) CC=clang -C sys all
 	$(MAKE) -C commands all
 	$(MAKE) -C bin all
 	$(MAKE) -C sbin all
@@ -95,6 +97,7 @@ all:
 
 install:
 	$(MAKE) CC=cc -C boot install
+	$(MAKE) CC=clang -C sys install
 	$(MAKE) -C libexec install
 	$(MAKE) -C man install makedb
 	$(MAKE) -C commands install
@@ -108,6 +111,7 @@ install:
 
 clean: mkfiles
 	$(MAKE) -C boot clean
+	$(MAKE) -C sys clean
 	$(MAKE) -C commands clean
 	$(MAKE) -C bin clean
 	$(MAKE) -C sbin clean
@@ -121,6 +125,7 @@ clean: mkfiles
 cleandepend: mkfiles
 	$(MAKE) -C lib cleandepend_all
 	$(MAKE) -C boot cleandepend
+	$(MAKE) -C sys cleandepend
 	$(MAKE) -C commands cleandepend
 	$(MAKE) -C bin cleandepend
 	$(MAKE) -C sbin cleandepend
diff --git a/sys/Makefile b/sys/Makefile
new file mode 100644
index 000000000..3bee04ec7
--- /dev/null
+++ b/sys/Makefile
@@ -0,0 +1,10 @@
+# Makefile for the boot stuff.
+
+.include <bsd.own.mk>
+
+SUBDIR= arch/i386/stand/mbr
+SUBDIR+= arch/i386/stand/bootxx
+SUBDIR+= arch/i386/stand/boot
+SUBDIR+= arch/i386/stand/cdboot
+
+.include <bsd.subdir.mk>
diff --git a/sys/arch/i386/stand/boot/biosboot/Makefile b/sys/arch/i386/stand/boot/biosboot/Makefile
index 843d4b9f0..2d3c99888 100644
--- a/sys/arch/i386/stand/boot/biosboot/Makefile
+++ b/sys/arch/i386/stand/boot/biosboot/Makefile
@@ -1,5 +1,6 @@
 # $NetBSD: Makefile,v 1.3 2005/12/11 12:17:48 christos Exp $
 
 PROG=	boot_monitor
+CLEANFILES= lib
 
 .include <../Makefile.boot>
diff --git a/sys/arch/i386/stand/bootxx/bootxx_ext2fs/Makefile b/sys/arch/i386/stand/bootxx/bootxx_ext2fs/Makefile
index 6486276ac..6110228d9 100644
--- a/sys/arch/i386/stand/bootxx/bootxx_ext2fs/Makefile
+++ b/sys/arch/i386/stand/bootxx/bootxx_ext2fs/Makefile
@@ -1,5 +1,6 @@
 # $NetBSD: Makefile,v 1.1 2010/09/11 13:06:37 tsutsui Exp $
 
 FS=ext2fs
+CLEANFILES= lib
 
 .include <../Makefile.bootxx>
diff --git a/sys/arch/i386/stand/bootxx/bootxx_minixfs3/Makefile b/sys/arch/i386/stand/bootxx/bootxx_minixfs3/Makefile
index 4519c4c51..6efd05e92 100644
--- a/sys/arch/i386/stand/bootxx/bootxx_minixfs3/Makefile
+++ b/sys/arch/i386/stand/bootxx/bootxx_minixfs3/Makefile
@@ -2,6 +2,7 @@
 
 PROG=bootxx_minixfs3
 FS=minixfs3
+CLEANFILES= lib
 
 MINIX3_FIRST_SUBP_OFFSET=32
 
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 369a3b78c..b805b1b8e 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -3,6 +3,6 @@
 .include <bsd.own.mk>
 
 # NetBSD imports
-SUBDIR= pwd_mkdb user vipw zic
+SUBDIR= installboot pwd_mkdb user vipw zic
 
 .include <bsd.subdir.mk>