Integrate new boot stuff into build scheme.

- Build sys with everything else.
- Gitignore files built by new boot stuff.

diff --git a/Makefile b/Makefile
index 916c3c3566feaa82e0bf5d9678d6caee1cf1de0c..b86bdb7457660f88d55a4fa0a66def953d0d45df 100644 (file)
--- 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 (file)
index 0000000..3bee04e
--- /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 843d4b9f0d84858c430d78532600e8c26c0953da..2d3c9988863fb717d990c8a683556f0b14c61ba1 100644 (file)
--- 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 6486276ac88350d8ad658e45688fcc9b1fc43d1a..6110228d963e16925cf8af7cc6e4e156ecb8b24d 100644 (file)
--- 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 4519c4c516f3c885da76e23b8b7f064cc23168ef..6efd05e923b18fd3f40ad789a4154c8d7660c6bb 100644 (file)
--- 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 369a3b78cf190ccc9ddca294f0d41fbccfbc7be7..b805b1b8e28f7ffd81e9df49c63c18118ddb9c3c 100644 (file)
--- 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>