Add makefs to host tools

Change-Id: I217c0b6f1a78622636d541fa80b93b6d148e3681

diff --git a/tools/Makefile b/tools/Makefile
index 8ec84dc3bfbca5086192cb9e357207a79e3875bb..2a970b80af743597a41bdf99cecb1c0c3e66f9ca 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -117,7 +117,7 @@ SUBDIR += .WAIT texinfo \
        ${DTRACE_BITS} \
                 cat cksum \
                file \
-               .WAIT \
+               makefs .WAIT \
                .WAIT \
                .WAIT \
                .WAIT \

diff --git a/tools/Makefile.nbincludes b/tools/Makefile.nbincludes
index 40aedc5b5e588de0079a9a6500f697e16c7914ae..8a2d490df122e12079b52b899ed05ba407b61fe6 100644 (file)
--- a/tools/Makefile.nbincludes
+++ b/tools/Makefile.nbincludes
@@ -24,7 +24,9 @@ _UFS_INCS!=   cd ${_UFSDIR} && find ffs ufs -name '*.h'
 _ARCH_INCS!=   ${TOOL_SED} -e 's/^\#.*//' ${.CURDIR}/../headerlist
 .endif
 
+.if !defined(__MINIX)
 _ARCH_INCS+=   ews4800mips/include/pdinfo.h ews4800mips/include/vtoc.h
+.endif # !defined(__MINIX)
 
 _INCS=         disktab.h
 _SYSINCS=      bootblock.h \

diff --git a/tools/headerlist b/tools/headerlist
index ae0742633e3932719d0014146b288f49c92b01c4..e4cf67f5188c9f8e609b77d4829ebfb6ff3009aa 100644 (file)
--- a/tools/headerlist
+++ b/tools/headerlist
@@ -1,140 +1,11 @@
-# $NetBSD: headerlist,v 1.8 2013/07/18 22:08:59 matt Exp $
+# $NetBSD$
 #
 # do not edit; this file was automatically generated by:
-#      NetBSD: mkheaderlist.sh,v 1.1 2007/08/07 12:38:23 yamt Exp 
+#      NetBSD: mkheaderlist.sh,v 1.2 2011/02/05 13:30:26 yamt Exp 
 
-./acorn26/include/disklabel.h
-./acorn26/include/elf_machdep.h
-./acorn32/include/disklabel.h
-./acorn32/include/elf_machdep.h
-./algor/include/disklabel.h
-./algor/include/elf_machdep.h
-./alpha/include/disklabel.h
-./alpha/include/elf_machdep.h
-./amd64/include/disklabel.h
-./amd64/include/elf_machdep.h
-./amiga/include/disklabel.h
-./amiga/include/elf_machdep.h
-./amigappc/include/disklabel.h
-./amigappc/include/elf_machdep.h
-./arc/include/disklabel.h
-./arc/include/elf_machdep.h
-./arm/include/disklabel.h
-./arm/include/elf_machdep.h
-./atari/include/disklabel.h
-./atari/include/elf_machdep.h
-./mips/include/elf_machdep.h
-./bebox/include/disklabel.h
-./bebox/include/elf_machdep.h
-./cats/include/disklabel.h
-./cats/include/elf_machdep.h
-./cesfic/include/disklabel.h
-./cesfic/include/elf_machdep.h
-./cobalt/include/disklabel.h
-./cobalt/include/elf_machdep.h
-./emips/include/disklabel.h
-./emips/include/elf_machdep.h
-./dreamcast/include/disklabel.h
-./dreamcast/include/elf_machdep.h
-./epoc32/include/disklabel.h
-./epoc32/include/elf_machdep.h
-./evbarm/include/disklabel.h
-./evbarm/include/elf_machdep.h
-./evbcf/include/disklabel.h
-./evbcf/include/elf_machdep.h
-./evbmips/include/disklabel.h
-./evbmips/include/elf_machdep.h
-./evbppc/include/disklabel.h
-./evbppc/include/elf_machdep.h
-./evbsh3/include/disklabel.h
-./evbsh3/include/elf_machdep.h
-./ews4800mips/include/disklabel.h
-./ews4800mips/include/elf_machdep.h
-./hp300/include/disklabel.h
-./hp300/include/elf_machdep.h
-./hp700/include/disklabel.h
-./hp700/include/elf_machdep.h
-./hpc/stand/hpcboot/arm/elf_machdep.h
-./hpc/stand/hpcboot/sh3/elf_machdep.h
-./hpc/stand/hpcboot/mips/elf_machdep.h
-./hpc/stand/include/machine/disklabel.h
-./hpc/stand/include/machine/elf_machdep.h
-./hpcarm/include/disklabel.h
-./hpcarm/include/elf_machdep.h
-./hpcmips/include/disklabel.h
-./hpcmips/include/elf_machdep.h
-./hpcmips/stand/include/machine/disklabel.h
-./hpcmips/stand/include/machine/elf_machdep.h
-./hpcmips/stand/include/mips/elf_machdep.h
-./hpcsh/include/disklabel.h
-./hpcsh/include/elf_machdep.h
-./hppa/include/elf_machdep.h
-./i386/include/disklabel.h
 ./i386/include/elf_machdep.h
-./ia64/include/disklabel.h
-./ia64/include/elf_machdep.h
-./ibmnws/include/disklabel.h
-./ibmnws/include/elf_machdep.h
-./iyonix/include/disklabel.h
-./iyonix/include/elf_machdep.h
-./landisk/include/disklabel.h
-./landisk/include/elf_machdep.h
-./luna68k/include/disklabel.h
-./luna68k/include/elf_machdep.h
-./m68k/include/elf_machdep.h
-./mac68k/include/disklabel.h
-./mac68k/include/elf_machdep.h
-./macppc/include/disklabel.h
-./macppc/include/elf_machdep.h
-./mipsco/include/disklabel.h
-./mipsco/include/elf_machdep.h
-./mmeye/include/disklabel.h
-./mmeye/include/elf_machdep.h
-./mvme68k/include/disklabel.h
-./mvme68k/include/elf_machdep.h
-./mvmeppc/include/disklabel.h
-./mvmeppc/include/elf_machdep.h
-./netwinder/include/disklabel.h
-./netwinder/include/elf_machdep.h
-./news68k/include/disklabel.h
-./news68k/include/elf_machdep.h
-./newsmips/include/disklabel.h
-./newsmips/include/elf_machdep.h
-./next68k/include/disklabel.h
-./next68k/include/elf_machdep.h
-./ofppc/include/disklabel.h
-./ofppc/include/elf_machdep.h
-./pmax/include/disklabel.h
-./pmax/include/elf_machdep.h
-./powerpc/include/elf_machdep.h
-./prep/include/disklabel.h
-./prep/include/elf_machdep.h
-./rs6000/include/disklabel.h
-./rs6000/include/elf_machdep.h
-./sandpoint/include/disklabel.h
-./sandpoint/include/elf_machdep.h
-./sbmips/include/disklabel.h
-./sbmips/include/elf_machdep.h
-./sgimips/include/disklabel.h
-./sgimips/include/elf_machdep.h
-./sh3/include/disklabel.h
-./sh3/include/elf_machdep.h
-./shark/include/disklabel.h
-./shark/include/elf_machdep.h
-./sparc/include/disklabel.h
-./sparc/include/elf_machdep.h
-./sparc64/include/disklabel.h
-./sparc64/include/elf_machdep.h
-./sun2/include/disklabel.h
-./sun2/include/elf_machdep.h
-./sun3/include/disklabel.h
-./sun3/include/elf_machdep.h
-./sun68k/include/disklabel.h
-./usermode/include/disklabel.h
-./usermode/include/elf_machdep.h
-./vax/include/disklabel.h
-./vax/include/elf_machdep.h
-./x68k/include/disklabel.h
-./x68k/include/elf_machdep.h
-./zaurus/include/disklabel.h
-./zaurus/include/elf_machdep.h
+./i386/include/disklabel.h
+./evbarm/include/elf_machdep.h
+./evbarm/include/disklabel.h
+./arm/include/elf_machdep.h
+./arm/include/disklabel.h

diff --git a/tools/makefs/Makefile b/tools/makefs/Makefile
new file mode 100644 (file)
index 0000000..f791955
--- /dev/null
+++ b/tools/makefs/Makefile
@@ -0,0 +1,9 @@
+#      $NetBSD: Makefile,v 1.9 2011/03/07 13:28:06 he Exp $
+
+HOSTPROGNAME=  ${_TOOL_PREFIX}makefs
+HOST_SRCDIR=   usr.sbin/makefs
+
+HOST_CPPFLAGS+=        -I. -I${TOOLDIR}/include/nbinclude
+
+.include "${.CURDIR}/../Makefile.nbincludes"
+.include "${.CURDIR}/../Makefile.host"