diff options
| author | christos <christos@NetBSD.org> | 2018-05-01 19:59:42 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2018-05-01 19:59:42 +0000 |
| commit | 5bb8c2d9894a22ccf58102268cf087fc645eceff (patch) | |
| tree | 7ca4fe1960ecd2385889fab28b7a099024d82bae /tools | |
| parent | c30f364e31d830b5b9a9bee3463c5e85fbbc9d03 (diff) | |
Create a new bsd.hostinit.mk file and put the build definitions for all host
programs there; make all Makefiles that use bsd.hostprog.mk include it.
Namely turn off MKREPRO and don't make lint, man pages, info files etc.
Remove the Makefile.inc files that contained these same settings, and
remove the settings from Makefile.host
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.host | 9 | ||||
| -rw-r--r-- | tools/Makefile.inc | 6 | ||||
| -rw-r--r-- | tools/binstall/Makefile | 4 | ||||
| -rw-r--r-- | tools/binutils/Makefile | 4 | ||||
| -rw-r--r-- | tools/compat/Makefile | 4 | ||||
| -rw-r--r-- | tools/ctfconvert/Makefile | 4 | ||||
| -rw-r--r-- | tools/ctfmerge/Makefile | 4 | ||||
| -rw-r--r-- | tools/cvslatest/Makefile | 4 | ||||
| -rw-r--r-- | tools/dbsym/Makefile | 4 | ||||
| -rw-r--r-- | tools/dtc/Makefile | 4 | ||||
| -rw-r--r-- | tools/gcc/Makefile | 4 | ||||
| -rw-r--r-- | tools/gdb/Makefile | 4 | ||||
| -rw-r--r-- | tools/genassym/Makefile | 4 | ||||
| -rw-r--r-- | tools/gettext/Makefile | 4 | ||||
| -rw-r--r-- | tools/host-mkdep/Makefile | 5 | ||||
| -rw-r--r-- | tools/libctf/Makefile | 4 | ||||
| -rw-r--r-- | tools/libdwarf/Makefile | 4 | ||||
| -rw-r--r-- | tools/libelf/Makefile | 4 | ||||
| -rw-r--r-- | tools/libfdt/Makefile | 4 | ||||
| -rw-r--r-- | tools/llvm-lib/Makefile | 4 | ||||
| -rw-r--r-- | tools/llvm/Makefile | 4 | ||||
| -rw-r--r-- | tools/lorder/Makefile | 4 | ||||
| -rw-r--r-- | tools/mandoc/Makefile | 4 | ||||
| -rw-r--r-- | tools/mdsetimage/Makefile | 4 |
24 files changed, 47 insertions, 57 deletions
diff --git a/tools/Makefile.host b/tools/Makefile.host index 5dee2e9f67c..f110bcaab15 100644 --- a/tools/Makefile.host +++ b/tools/Makefile.host @@ -1,11 +1,6 @@ -# $NetBSD: Makefile.host,v 1.32 2018/05/01 00:04:34 christos Exp $ +# $NetBSD: Makefile.host,v 1.33 2018/05/01 19:59:46 christos Exp $ -NOINFO= # defined -NOLINT= # defined -NOMAN= # defined -MKREPRO=no # Native toolchain might be unable to do it - -.include <bsd.own.mk> +.include <bsd.hostinit.mk> .ifndef NOCOMPATLIB # Use TOOLDIR copy of libnbcompat and associated *.h files diff --git a/tools/Makefile.inc b/tools/Makefile.inc deleted file mode 100644 index 61335a4558f..00000000000 --- a/tools/Makefile.inc +++ /dev/null @@ -1,6 +0,0 @@ -# $NetBSD: Makefile.inc,v 1.15 2018/05/01 12:38:39 christos Exp $ - -NOINFO= # defined -NOLINT= # defined -NOMAN= # defined -MKREPRO=no # Native toolchain might be unable to do it diff --git a/tools/binstall/Makefile b/tools/binstall/Makefile index 6b92c41c74e..674443c2237 100644 --- a/tools/binstall/Makefile +++ b/tools/binstall/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.13 2018/05/01 12:38:39 christos Exp $ +# $NetBSD: Makefile,v 1.14 2018/05/01 19:59:46 christos Exp $ -.include <bsd.init.mk> +.include <bsd.hostinit.mk> HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-install HOST_SRCDIR= usr.bin/xinstall diff --git a/tools/binutils/Makefile b/tools/binutils/Makefile index 838e1febffb..26bf1975aad 100644 --- a/tools/binutils/Makefile +++ b/tools/binutils/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.27 2018/05/01 00:04:34 christos Exp $ +# $NetBSD: Makefile,v 1.28 2018/05/01 19:59:46 christos Exp $ -.include <bsd.init.mk> +.include <bsd.hostinit.mk> MODULE= binutils diff --git a/tools/compat/Makefile b/tools/compat/Makefile index a9b00a7ff63..76b863f5e65 100644 --- a/tools/compat/Makefile +++ b/tools/compat/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.82 2018/05/01 00:04:35 christos Exp $ +# $NetBSD: Makefile,v 1.83 2018/05/01 19:59:46 christos Exp $ HOSTLIB= nbcompat -.include <bsd.init.mk> +.include <bsd.hostinit.mk> SRCS= atoll.c basename.c cdbr.c cdbw.c dirname.c \ dprintf.c fgetln.c flock.c fparseln.c fpurge.c \ diff --git a/tools/ctfconvert/Makefile b/tools/ctfconvert/Makefile index 680f85f95eb..348e3a11767 100644 --- a/tools/ctfconvert/Makefile +++ b/tools/ctfconvert/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2018/05/01 12:38:39 christos Exp $ +# $NetBSD: Makefile,v 1.9 2018/05/01 19:59:46 christos Exp $ -.include <bsd.init.mk> +.include <bsd.hostinit.mk> HOSTPROGNAME= ${_TOOL_PREFIX}ctfconvert HOST_SRCDIR= external/cddl/osnet/usr.bin/ctfconvert diff --git a/tools/ctfmerge/Makefile b/tools/ctfmerge/Makefile index f47275a2bd1..61d560872e9 100644 --- a/tools/ctfmerge/Makefile +++ b/tools/ctfmerge/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2018/05/01 12:38:39 christos Exp $ +# $NetBSD: Makefile,v 1.10 2018/05/01 19:59:46 christos Exp $ -.include <bsd.init.mk> +.include <bsd.hostinit.mk> HOSTPROGNAME= ${_TOOL_PREFIX}ctfmerge HOST_SRCDIR= external/cddl/osnet/usr.bin/ctfmerge diff --git a/tools/cvslatest/Makefile b/tools/cvslatest/Makefile index 3888b74dc3f..dbb694ae32b 100644 --- a/tools/cvslatest/Makefile +++ b/tools/cvslatest/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2018/05/01 12:38:39 christos Exp $ +# $NetBSD: Makefile,v 1.4 2018/05/01 19:59:46 christos Exp $ -.include <bsd.init.mk> +.include <bsd.hostinit.mk> HOSTPROGNAME= ${_TOOL_PREFIX}cvslatest HOST_SRCDIR= usr.bin/cvslatest diff --git a/tools/dbsym/Makefile b/tools/dbsym/Makefile index bfccdcce247..dde25dd972b 100644 --- a/tools/dbsym/Makefile +++ b/tools/dbsym/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.14 2018/05/01 12:38:39 christos Exp $ +# $NetBSD: Makefile,v 1.15 2018/05/01 19:59:46 christos Exp $ -.include <bsd.init.mk> +.include <bsd.hostinit.mk> HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-dbsym diff --git a/tools/dtc/Makefile b/tools/dtc/Makefile index badac7f437e..fef7f91234c 100644 --- a/tools/dtc/Makefile +++ b/tools/dtc/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2018/05/01 12:38:39 christos Exp $ +# $NetBSD: Makefile,v 1.5 2018/05/01 19:59:46 christos Exp $ -.include <bsd.init.mk> +.include <bsd.hostinit.mk> LIBFDT_DIR= ${.CURDIR}/../../sys/external/bsd/libfdt/dist HOST_CPPFLAGS+= -I${LIBFDT_DIR} diff --git a/tools/gcc/Makefile b/tools/gcc/Makefile index e23cbe0a06e..db41325dae1 100644 --- a/tools/gcc/Makefile +++ b/tools/gcc/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.85 2018/05/01 00:04:35 christos Exp $ +# $NetBSD: Makefile,v 1.86 2018/05/01 19:59:46 christos Exp $ -.include <bsd.init.mk> +.include <bsd.hostinit.mk> GCC_LANGUAGES=c c++ objc MODULE= gcc4 diff --git a/tools/gdb/Makefile b/tools/gdb/Makefile index f6985736ad4..39ec4475dc7 100644 --- a/tools/gdb/Makefile +++ b/tools/gdb/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.35 2018/05/01 00:04:35 christos Exp $ +# $NetBSD: Makefile,v 1.36 2018/05/01 19:59:46 christos Exp $ -.include <bsd.init.mk> +.include <bsd.hostinit.mk> MODULE= gdb GDBDIR= ${.CURDIR}/../../external/gpl3/${EXTERNAL_GDB_SUBDIR} diff --git a/tools/genassym/Makefile b/tools/genassym/Makefile index e15e0145c3d..e597c522b69 100644 --- a/tools/genassym/Makefile +++ b/tools/genassym/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2018/05/01 00:04:35 christos Exp $ +# $NetBSD: Makefile,v 1.8 2018/05/01 19:59:46 christos Exp $ -.include <bsd.init.mk> +.include <bsd.hostinit.mk> .PATH.sh: ${.CURDIR}/../../usr.bin/genassym diff --git a/tools/gettext/Makefile b/tools/gettext/Makefile index b8bd2d805fd..9aa0fe21ed7 100644 --- a/tools/gettext/Makefile +++ b/tools/gettext/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2018/05/01 00:04:35 christos Exp $ +# $NetBSD: Makefile,v 1.8 2018/05/01 19:59:47 christos Exp $ -.include <bsd.init.mk> +.include <bsd.hostinit.mk> MODULE= gettext diff --git a/tools/host-mkdep/Makefile b/tools/host-mkdep/Makefile index 867bee93f4c..ece14f4cdb5 100644 --- a/tools/host-mkdep/Makefile +++ b/tools/host-mkdep/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.12 2012/12/02 12:44:06 apb Exp $ +# $NetBSD: Makefile,v 1.13 2018/05/01 19:59:47 christos Exp $ + +.include <bsd.hostinit.mk> HOSTPROG= host-mkdep HOSTPROGNAME= ${_TOOL_PREFIX}host-mkdep HOST_BINDIR= ${TOOLDIR}/bin -NOMAN= # defined SRCS= # empty CLEANFILES+= config.cache config.log config.status host-mkdep diff --git a/tools/libctf/Makefile b/tools/libctf/Makefile index 46ab26aa44f..77e54f335f1 100644 --- a/tools/libctf/Makefile +++ b/tools/libctf/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2018/05/01 00:04:36 christos Exp $ +# $NetBSD: Makefile,v 1.8 2018/05/01 19:59:47 christos Exp $ HOSTLIB= ctf -.include <bsd.init.mk> +.include <bsd.hostinit.mk> SRCS= ctf_create.c \ ctf_decl.c \ diff --git a/tools/libdwarf/Makefile b/tools/libdwarf/Makefile index 913ea8cca49..867be291c37 100644 --- a/tools/libdwarf/Makefile +++ b/tools/libdwarf/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2018/05/01 00:04:36 christos Exp $ +# $NetBSD: Makefile,v 1.9 2018/05/01 19:59:47 christos Exp $ HOSTLIB=dwarf -.include <bsd.init.mk> +.include <bsd.hostinit.mk> SRCS= \ dwarf_abbrev.c \ diff --git a/tools/libelf/Makefile b/tools/libelf/Makefile index ea9643f2a0d..01210f7fab4 100644 --- a/tools/libelf/Makefile +++ b/tools/libelf/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2018/05/01 00:04:36 christos Exp $ +# $NetBSD: Makefile,v 1.10 2018/05/01 19:59:47 christos Exp $ HOSTLIB= elf -.include <bsd.init.mk> +.include <bsd.hostinit.mk> SRCS= elf_begin.c \ elf_cntl.c \ diff --git a/tools/libfdt/Makefile b/tools/libfdt/Makefile index 53a412854cd..3017a809b95 100644 --- a/tools/libfdt/Makefile +++ b/tools/libfdt/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2018/05/01 00:04:36 christos Exp $ +# $NetBSD: Makefile,v 1.4 2018/05/01 19:59:47 christos Exp $ HOSTLIB= fdt -.include <bsd.init.mk> +.include <bsd.hostinit.mk> LIBFDT_DIR= ${.CURDIR}/../../sys/external/bsd/libfdt/dist diff --git a/tools/llvm-lib/Makefile b/tools/llvm-lib/Makefile index 87cf56754d8..c08bf396dae 100644 --- a/tools/llvm-lib/Makefile +++ b/tools/llvm-lib/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2011/07/05 17:15:51 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2018/05/01 19:59:47 christos Exp $ -.include <bsd.init.mk> +.include <bsd.hostinit.mk> NO_LLVM_DEVELOPER= yes diff --git a/tools/llvm/Makefile b/tools/llvm/Makefile index 37f5d312f41..8f85311e408 100644 --- a/tools/llvm/Makefile +++ b/tools/llvm/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.21 2017/01/11 12:08:34 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2018/05/01 19:59:47 christos Exp $ -.include <bsd.init.mk> +.include <bsd.hostinit.mk> # # Do *not* set HOSTPROG or HOSTLIB at this point otherwise diff --git a/tools/lorder/Makefile b/tools/lorder/Makefile index 11b3adc70af..f3c599e129c 100644 --- a/tools/lorder/Makefile +++ b/tools/lorder/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.13 2018/05/01 00:04:36 christos Exp $ +# $NetBSD: Makefile,v 1.14 2018/05/01 19:59:47 christos Exp $ -.include <bsd.init.mk> +.include <bsd.hostinit.mk> .-include "${TOOLDIR}/share/compat/defs.mk" diff --git a/tools/mandoc/Makefile b/tools/mandoc/Makefile index a09a5ecf931..952822cf1f2 100644 --- a/tools/mandoc/Makefile +++ b/tools/mandoc/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2018/05/01 12:38:40 christos Exp $ +# $NetBSD: Makefile,v 1.13 2018/05/01 19:59:47 christos Exp $ HOSTPROGNAME= ${_TOOL_PREFIX}mandoc HOST_SRCDIR= external/bsd/mdocml/bin/mandoc -.include <bsd.init.mk> +.include <bsd.hostinit.mk> NETBSD_MINOR!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh -n NETBSD_OSNAME= "NetBSD ${NETBSD_MINOR}" diff --git a/tools/mdsetimage/Makefile b/tools/mdsetimage/Makefile index 2ee2d359869..da9fb6fb03f 100644 --- a/tools/mdsetimage/Makefile +++ b/tools/mdsetimage/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.16 2018/05/01 12:38:40 christos Exp $ +# $NetBSD: Makefile,v 1.17 2018/05/01 19:59:47 christos Exp $ -.include <bsd.init.mk> +.include <bsd.hostinit.mk> HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-mdsetimage |
