diff --git a/crypto/external/bsd/heimdal/lib/libasn1/asn1_compile/Makefile b/crypto/external/bsd/heimdal/lib/libasn1/asn1_compile/Makefile index 7ed2f9a36601..b42ea2b09032 100644 --- a/crypto/external/bsd/heimdal/lib/libasn1/asn1_compile/Makefile +++ b/crypto/external/bsd/heimdal/lib/libasn1/asn1_compile/Makefile @@ -1,9 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2011/04/15 19:41:11 elric Exp $ +# $NetBSD: Makefile,v 1.3 2018/05/01 19:59:42 christos Exp $ -NOLINT= # defined -NOMAN= # defined - -.include +.include .include <${.CURDIR}/../../../Makefile.inc> .PATH: ${HEIMDIST}/lib/asn1 \ diff --git a/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile b/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile index bf1e029b87d5..5e1e669f75f9 100644 --- a/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile +++ b/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2017/01/30 02:38:50 jakllsch Exp $ +# $NetBSD: Makefile,v 1.5 2018/05/01 19:59:42 christos Exp $ -NOMAN= # defined - -.include +.include .include <${.CURDIR}/../../../Makefile.inc> .PATH: ${HEIMDIST}/lib/com_err \ diff --git a/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile b/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile index 9107949be735..a3e0ee7d2606 100644 --- a/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile +++ b/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2017/01/30 02:38:50 jakllsch Exp $ +# $NetBSD: Makefile,v 1.5 2018/05/01 19:59:43 christos Exp $ -NOMAN= # defined - -.include +.include .include <${.CURDIR}/../../../Makefile.inc> .PATH: ${HEIMDIST}/lib/sl ${HEIMDIST}/lib/roken ${HEIMDIST}/lib/vers diff --git a/distrib/amiga/stand/Makefile b/distrib/amiga/stand/Makefile index 07e1854b51d7..568aa8e216aa 100644 --- a/distrib/amiga/stand/Makefile +++ b/distrib/amiga/stand/Makefile @@ -1,6 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2015/11/11 16:13:55 phx Exp $ +# $NetBSD: Makefile,v 1.5 2018/05/01 19:59:43 christos Exp $ # +#include + MISC_FILES= runbootblock.README UUDECODE_FILES= device-streams.tar.gz \ loadbsd rdbinfo runbootblock xstreamtodev diff --git a/distrib/cdrom/macppc_installboot/Makefile b/distrib/cdrom/macppc_installboot/Makefile index 36809d332ef2..dcc9df2aa9c5 100644 --- a/distrib/cdrom/macppc_installboot/Makefile +++ b/distrib/cdrom/macppc_installboot/Makefile @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2016/03/09 15:44:49 christos Exp $ +# $NetBSD: Makefile,v 1.11 2018/05/01 19:59:43 christos Exp $ -NOMAN= # defined - -.include +.include HOSTPROG= macppc_installboot SRCS= installboot.c cd9660.c cd9660_util.c diff --git a/distrib/cdrom/macppc_mkboothfs/Makefile b/distrib/cdrom/macppc_mkboothfs/Makefile index 4e1d29b46954..303208cbfb2d 100644 --- a/distrib/cdrom/macppc_mkboothfs/Makefile +++ b/distrib/cdrom/macppc_mkboothfs/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.5 2012/12/02 12:55:27 apb Exp $ +# $NetBSD: Makefile,v 1.6 2018/05/01 19:59:43 christos Exp $ HOSTPROG= macppc_mkboothfs SRCS= mkboothfs.c -NOMAN= # defined CLEANFILES+= boothfs -.include +.include .ifndef NOCOMPATLIB .-include "${TOOLDIR}/share/compat/defs.mk" diff --git a/external/bsd/nvi/catalog/Makefile b/external/bsd/nvi/catalog/Makefile index fe02ce3a03e7..854fa0f0397f 100644 --- a/external/bsd/nvi/catalog/Makefile +++ b/external/bsd/nvi/catalog/Makefile @@ -1,10 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2013/11/22 16:11:08 christos Exp $ +# $NetBSD: Makefile,v 1.3 2018/05/01 19:59:43 christos Exp $ # # @(#)Makefile 8.29 (Berkeley) 10/19/96 -NOMAN= # defined - -.include "../Makefile.inc" +.include .PATH: ${DIST}/catalog diff --git a/external/bsd/openldap/Makefile b/external/bsd/openldap/Makefile index c54bddfeca0d..2551a8b9bfdd 100644 --- a/external/bsd/openldap/Makefile +++ b/external/bsd/openldap/Makefile @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2008/07/23 00:21:19 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2018/05/01 19:59:43 christos Exp $ .include "openldap.mk" +.include + SUBDIR= include SUBDIR+= lib .WAIT diff --git a/external/bsd/pcc/libexec/mkext/Makefile b/external/bsd/pcc/libexec/mkext/Makefile index 15f13f46e90f..dc10b524d839 100644 --- a/external/bsd/pcc/libexec/mkext/Makefile +++ b/external/bsd/pcc/libexec/mkext/Makefile @@ -1,16 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2011/04/29 08:33:02 plunky Exp $ +# $NetBSD: Makefile,v 1.3 2018/05/01 19:59:43 christos Exp $ # # this is really part of ccom, but HOSTPROG and PROG don't mix # -.include +.include .PATH: ${PCC_DIST}/mip \ ${PCC_DIST}/arch/${TARGMACH} HOSTPROG= mkext -MAN= SRCS= mkext.c table.c common.c HOST_CPPFLAGS+= -DMKEXT diff --git a/external/gpl2/texinfo/makedoc/Makefile b/external/gpl2/texinfo/makedoc/Makefile index 0f163aaa08b0..767da7260431 100644 --- a/external/gpl2/texinfo/makedoc/Makefile +++ b/external/gpl2/texinfo/makedoc/Makefile @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2016/01/14 00:34:53 christos Exp $ +# $NetBSD: Makefile,v 1.2 2018/05/01 19:59:43 christos Exp $ -NOMAN= -MAKEDOC= -.include +.include HOSTPROG= makedoc SRCS= makedoc.c xexit.c xmalloc.c xstrdup.c diff --git a/external/mit/xorg/tools/Makefile.inc b/external/mit/xorg/tools/Makefile.inc deleted file mode 100644 index d7f7c8e7b667..000000000000 --- a/external/mit/xorg/tools/Makefile.inc +++ /dev/null @@ -1,6 +0,0 @@ -# $NetBSD: Makefile.inc,v 1.1 2018/05/01 17:42:00 christos Exp $ - -NOINFO= # defined -NOLINT= # defined -NOMAN= # defined -MKREPRO=no # Native toolchain might be unable to do it diff --git a/external/mit/xorg/tools/bdftopcf/Makefile b/external/mit/xorg/tools/bdftopcf/Makefile index 52989ecf86f8..fb2b1e54a33e 100644 --- a/external/mit/xorg/tools/bdftopcf/Makefile +++ b/external/mit/xorg/tools/bdftopcf/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2018/05/01 17:42:00 christos Exp $ +# $NetBSD: Makefile,v 1.9 2018/05/01 19:59:43 christos Exp $ -.include +.include HOSTPROG= bdftopcf .PATH: ${X11SRCDIR.bdftopcf} diff --git a/external/mit/xorg/tools/fc-cache/Makefile b/external/mit/xorg/tools/fc-cache/Makefile index 0066eb27881b..28ef50ecf117 100644 --- a/external/mit/xorg/tools/fc-cache/Makefile +++ b/external/mit/xorg/tools/fc-cache/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2018/05/01 17:42:01 christos Exp $ +# $NetBSD: Makefile,v 1.13 2018/05/01 19:59:43 christos Exp $ -.include +.include HOSTPROG= fc-cache diff --git a/external/mit/xorg/tools/makekeys/Makefile b/external/mit/xorg/tools/makekeys/Makefile index 3990a3e2134b..b2b5592434d8 100644 --- a/external/mit/xorg/tools/makekeys/Makefile +++ b/external/mit/xorg/tools/makekeys/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2018/05/01 17:42:01 christos Exp $ +# $NetBSD: Makefile,v 1.7 2018/05/01 19:59:44 christos Exp $ -.include +.include .PATH: ${X11SRCDIR.X11}/src/util diff --git a/external/mit/xorg/tools/makestrs/Makefile b/external/mit/xorg/tools/makestrs/Makefile index 6f0b2c099868..3b36dacb2d17 100644 --- a/external/mit/xorg/tools/makestrs/Makefile +++ b/external/mit/xorg/tools/makestrs/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2018/05/01 17:42:01 christos Exp $ +# $NetBSD: Makefile,v 1.6 2018/05/01 19:59:44 christos Exp $ -.include +.include .PATH: ${X11SRCDIR.Xt}/util diff --git a/external/mit/xorg/tools/mkfontscale/Makefile b/external/mit/xorg/tools/mkfontscale/Makefile index b348cb5fb40f..267fcef127fa 100644 --- a/external/mit/xorg/tools/mkfontscale/Makefile +++ b/external/mit/xorg/tools/mkfontscale/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2018/05/01 17:42:01 christos Exp $ +# $NetBSD: Makefile,v 1.10 2018/05/01 19:59:44 christos Exp $ -.include +.include HOSTPROG= mkfontscale diff --git a/external/mit/xorg/tools/ucs2any/Makefile b/external/mit/xorg/tools/ucs2any/Makefile index 6a3e61df94f0..1959979a788c 100644 --- a/external/mit/xorg/tools/ucs2any/Makefile +++ b/external/mit/xorg/tools/ucs2any/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2018/05/01 17:42:01 christos Exp $ +# $NetBSD: Makefile,v 1.4 2018/05/01 19:59:44 christos Exp $ -.include +.include HOSTPROG= ucs2any .PATH: ${X11SRCDIR.font-util} diff --git a/games/boggle/mkdict/Makefile b/games/boggle/mkdict/Makefile index 2966798443a7..95a906eea741 100644 --- a/games/boggle/mkdict/Makefile +++ b/games/boggle/mkdict/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2002/09/18 06:16:40 lukem Exp $ +# $NetBSD: Makefile,v 1.13 2018/05/01 19:59:44 christos Exp $ # @(#)Makefile 8.1 (Berkeley) 6/11/93 -NOMAN= # defined +.include HOSTPROG= mkdict HOST_CPPFLAGS+= -I${.CURDIR}/../boggle diff --git a/games/boggle/mkindex/Makefile b/games/boggle/mkindex/Makefile index cc5bdbd7b5c1..8926c1a09b48 100644 --- a/games/boggle/mkindex/Makefile +++ b/games/boggle/mkindex/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2002/09/18 06:16:40 lukem Exp $ +# $NetBSD: Makefile,v 1.11 2018/05/01 19:59:44 christos Exp $ # @(#)Makefile 8.1 (Berkeley) 6/11/93 -NOMAN= # defined +.include HOSTPROG= mkindex HOST_CPPFLAGS+= -I${.CURDIR}/../boggle diff --git a/share/mk/bsd.hostinit.mk b/share/mk/bsd.hostinit.mk new file mode 100644 index 000000000000..8428c0c8651c --- /dev/null +++ b/share/mk/bsd.hostinit.mk @@ -0,0 +1,13 @@ +# $NetBSD: bsd.hostinit.mk,v 1.1 2018/05/01 19:59:44 christos Exp $ + +.if !defined(_BSD_HOSTINIT_MK_) +_BSD_HOSTINIT_MK_=1 + +NOINFO= # defined +NOLINT= # defined +NOMAN= # defined +MKREPRO=no # Native toolchain might be unable to do it + +.include + +.endif # !defined(_BSD_HOSTINIT_MK_) diff --git a/sys/arch/amiga/stand/loadkmap/din/Makefile b/sys/arch/amiga/stand/loadkmap/din/Makefile index 35668d80d587..8a5fce1caa02 100644 --- a/sys/arch/amiga/stand/loadkmap/din/Makefile +++ b/sys/arch/amiga/stand/loadkmap/din/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2001/12/12 01:49:35 tv Exp $ +# $NetBSD: Makefile,v 1.8 2018/05/01 19:59:44 christos Exp $ + +.include HOSTPROG= din-kbdmap NOMAN= # defined diff --git a/sys/arch/amiga/stand/loadkmap/es/Makefile b/sys/arch/amiga/stand/loadkmap/es/Makefile index 90136576b0f7..818b6518d71b 100644 --- a/sys/arch/amiga/stand/loadkmap/es/Makefile +++ b/sys/arch/amiga/stand/loadkmap/es/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2001/12/12 01:49:35 tv Exp $ +# $NetBSD: Makefile,v 1.5 2018/05/01 19:59:44 christos Exp $ + +.include HOSTPROG= es-kbdmap NOMAN= # defined diff --git a/sys/arch/amiga/stand/loadkmap/fr/Makefile b/sys/arch/amiga/stand/loadkmap/fr/Makefile index 7dc9b67e6de2..78e18da1954c 100644 --- a/sys/arch/amiga/stand/loadkmap/fr/Makefile +++ b/sys/arch/amiga/stand/loadkmap/fr/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2001/12/12 01:49:36 tv Exp $ +# $NetBSD: Makefile,v 1.5 2018/05/01 19:59:44 christos Exp $ + +.include HOSTPROG= fr-kbdmap NOMAN= # defined diff --git a/sys/arch/amiga/stand/loadkmap/pl_din/Makefile b/sys/arch/amiga/stand/loadkmap/pl_din/Makefile index fb31165003a3..32292adda350 100644 --- a/sys/arch/amiga/stand/loadkmap/pl_din/Makefile +++ b/sys/arch/amiga/stand/loadkmap/pl_din/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2002/04/05 00:55:06 heinz Exp $ +# $NetBSD: Makefile,v 1.2 2018/05/01 19:59:44 christos Exp $ + +.include HOSTPROG= pl_din-kbdmap NOMAN= # defined diff --git a/sys/arch/amiga/stand/loadkmap/pl_us/Makefile b/sys/arch/amiga/stand/loadkmap/pl_us/Makefile index 0b67fc52acaf..d039dcdd73c3 100644 --- a/sys/arch/amiga/stand/loadkmap/pl_us/Makefile +++ b/sys/arch/amiga/stand/loadkmap/pl_us/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2002/04/05 00:55:07 heinz Exp $ +# $NetBSD: Makefile,v 1.2 2018/05/01 19:59:44 christos Exp $ + +.include HOSTPROG= pl_us-kbdmap NOMAN= # defined diff --git a/sys/arch/amiga/stand/loadkmap/sw/Makefile b/sys/arch/amiga/stand/loadkmap/sw/Makefile index ada3bc930301..c43ea43396a6 100644 --- a/sys/arch/amiga/stand/loadkmap/sw/Makefile +++ b/sys/arch/amiga/stand/loadkmap/sw/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2001/12/12 01:49:36 tv Exp $ +# $NetBSD: Makefile,v 1.9 2018/05/01 19:59:45 christos Exp $ + +.include HOSTPROG= sw-kbdmap NOMAN= # defined diff --git a/sys/arch/amiga/stand/loadkmap/us/Makefile b/sys/arch/amiga/stand/loadkmap/us/Makefile index 40b973e46546..f7a5ab9ecb42 100644 --- a/sys/arch/amiga/stand/loadkmap/us/Makefile +++ b/sys/arch/amiga/stand/loadkmap/us/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2001/12/12 01:49:36 tv Exp $ +# $NetBSD: Makefile,v 1.8 2018/05/01 19:59:45 christos Exp $ + +.include HOSTPROG= us-kbdmap NOMAN= # defined diff --git a/sys/arch/atari/stand/keymaps/de/Makefile b/sys/arch/atari/stand/keymaps/de/Makefile index fbeec4e9ac7a..b7fcf34190aa 100644 --- a/sys/arch/atari/stand/keymaps/de/Makefile +++ b/sys/arch/atari/stand/keymaps/de/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2002/04/15 17:27:34 bjh21 Exp $ +# $NetBSD: Makefile,v 1.3 2018/05/01 19:59:45 christos Exp $ + +.include HOSTPROG=de-kbdmap MAP=de.map diff --git a/sys/arch/atari/stand/keymaps/fr/Makefile b/sys/arch/atari/stand/keymaps/fr/Makefile index c143ab426517..1cc4d3f6f8f9 100644 --- a/sys/arch/atari/stand/keymaps/fr/Makefile +++ b/sys/arch/atari/stand/keymaps/fr/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2002/04/15 17:27:34 bjh21 Exp $ +# $NetBSD: Makefile,v 1.3 2018/05/01 19:59:45 christos Exp $ + +.include HOSTPROG=fr-kbdmap MAP=fr.map diff --git a/sys/arch/atari/stand/keymaps/uk/Makefile b/sys/arch/atari/stand/keymaps/uk/Makefile index d6b8bd930586..58947caca672 100644 --- a/sys/arch/atari/stand/keymaps/uk/Makefile +++ b/sys/arch/atari/stand/keymaps/uk/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2002/04/15 17:27:34 bjh21 Exp $ +# $NetBSD: Makefile,v 1.3 2018/05/01 19:59:45 christos Exp $ + +.include HOSTPROG=uk-kbdmap MAP=uk.map diff --git a/sys/arch/atari/stand/keymaps/us/Makefile b/sys/arch/atari/stand/keymaps/us/Makefile index d9d50bebc2e1..9db4bb7bb50f 100644 --- a/sys/arch/atari/stand/keymaps/us/Makefile +++ b/sys/arch/atari/stand/keymaps/us/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2002/04/15 17:27:34 bjh21 Exp $ +# $NetBSD: Makefile,v 1.3 2018/05/01 19:59:45 christos Exp $ + +.include HOSTPROG=us-kbdmap MAP=us.map diff --git a/sys/arch/i386/stand/genprom/Makefile b/sys/arch/i386/stand/genprom/Makefile index d7d5dddb8cbc..cfc1e03587ab 100644 --- a/sys/arch/i386/stand/genprom/Makefile +++ b/sys/arch/i386/stand/genprom/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2002/02/17 20:03:10 thorpej Exp $ +# $NetBSD: Makefile,v 1.7 2018/05/01 19:59:45 christos Exp $ + +.include HOSTPROG= genprom NOMAN= # defined diff --git a/sys/arch/i386/stand/misc/Makefile b/sys/arch/i386/stand/misc/Makefile index 72c48f65e755..d292be98e8b2 100644 --- a/sys/arch/i386/stand/misc/Makefile +++ b/sys/arch/i386/stand/misc/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2010/10/27 18:29:46 martin Exp $ +# $NetBSD: Makefile,v 1.8 2018/05/01 19:59:45 christos Exp $ + +.include MISC_FILES= rawrite.c UUDECODE_FILES= pfdisk.doc pfdisk.exe pfdisktc.zip \ diff --git a/sys/arch/macppc/stand/fixcoff/Makefile b/sys/arch/macppc/stand/fixcoff/Makefile index 0f419e110987..2a3fa14eecf6 100644 --- a/sys/arch/macppc/stand/fixcoff/Makefile +++ b/sys/arch/macppc/stand/fixcoff/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.9 2006/09/16 00:57:49 uwe Exp $ - -NOMAN= # defined -.include +# $NetBSD: Makefile,v 1.10 2018/05/01 19:59:45 christos Exp $ .if ${USETOOLS} == "yes" +.include PROG= fixcoff .include .else +.include HOSTPROG= fixcoff .include .endif diff --git a/sys/arch/mvme68k/stand/wrtvid/Makefile b/sys/arch/mvme68k/stand/wrtvid/Makefile index c672ee3da211..00c7a4e92380 100644 --- a/sys/arch/mvme68k/stand/wrtvid/Makefile +++ b/sys/arch/mvme68k/stand/wrtvid/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.11 2002/01/23 21:06:28 scw Exp $ +# $NetBSD: Makefile,v 1.12 2018/05/01 19:59:45 christos Exp $ S=${.CURDIR}/../../../../ +.include + HOSTPROG= wrtvid -NOMAN= # only needed during build proginstall:: diff --git a/sys/arch/x68k/stand/aout2hux/Makefile b/sys/arch/x68k/stand/aout2hux/Makefile index da916818d909..dc8d1172f221 100644 --- a/sys/arch/x68k/stand/aout2hux/Makefile +++ b/sys/arch/x68k/stand/aout2hux/Makefile @@ -1,4 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2001/12/12 01:49:55 tv Exp $ +# $NetBSD: Makefile,v 1.5 2018/05/01 19:59:45 christos Exp $ + +.include HOSTPROG= aout2hux NOMAN= # defined diff --git a/tools/Makefile.host b/tools/Makefile.host index 5dee2e9f67c1..f110bcaab156 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 +.include .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 61335a4558f4..000000000000 --- 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 6b92c41c74e8..674443c2237a 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 +.include HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-install HOST_SRCDIR= usr.bin/xinstall diff --git a/tools/binutils/Makefile b/tools/binutils/Makefile index 838e1febffb9..26bf1975aad7 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 +.include MODULE= binutils diff --git a/tools/compat/Makefile b/tools/compat/Makefile index a9b00a7ff638..76b863f5e659 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 +.include 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 680f85f95eb1..348e3a117672 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 +.include HOSTPROGNAME= ${_TOOL_PREFIX}ctfconvert HOST_SRCDIR= external/cddl/osnet/usr.bin/ctfconvert diff --git a/tools/ctfmerge/Makefile b/tools/ctfmerge/Makefile index f47275a2bd19..61d560872e9f 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 +.include HOSTPROGNAME= ${_TOOL_PREFIX}ctfmerge HOST_SRCDIR= external/cddl/osnet/usr.bin/ctfmerge diff --git a/tools/cvslatest/Makefile b/tools/cvslatest/Makefile index 3888b74dc3fb..dbb694ae32b3 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 +.include HOSTPROGNAME= ${_TOOL_PREFIX}cvslatest HOST_SRCDIR= usr.bin/cvslatest diff --git a/tools/dbsym/Makefile b/tools/dbsym/Makefile index bfccdcce247b..dde25dd972b5 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 +.include HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-dbsym diff --git a/tools/dtc/Makefile b/tools/dtc/Makefile index badac7f437e3..fef7f91234ca 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 +.include LIBFDT_DIR= ${.CURDIR}/../../sys/external/bsd/libfdt/dist HOST_CPPFLAGS+= -I${LIBFDT_DIR} diff --git a/tools/gcc/Makefile b/tools/gcc/Makefile index e23cbe0a06e9..db41325dae16 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 +.include GCC_LANGUAGES=c c++ objc MODULE= gcc4 diff --git a/tools/gdb/Makefile b/tools/gdb/Makefile index f6985736ad4c..39ec4475dc7a 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 +.include MODULE= gdb GDBDIR= ${.CURDIR}/../../external/gpl3/${EXTERNAL_GDB_SUBDIR} diff --git a/tools/genassym/Makefile b/tools/genassym/Makefile index e15e0145c3d7..e597c522b692 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 +.include .PATH.sh: ${.CURDIR}/../../usr.bin/genassym diff --git a/tools/gettext/Makefile b/tools/gettext/Makefile index b8bd2d805fda..9aa0fe21ed7a 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 +.include MODULE= gettext diff --git a/tools/host-mkdep/Makefile b/tools/host-mkdep/Makefile index 867bee93f4c3..ece14f4cdb58 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 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 46ab26aa44fc..77e54f335f1c 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 +.include SRCS= ctf_create.c \ ctf_decl.c \ diff --git a/tools/libdwarf/Makefile b/tools/libdwarf/Makefile index 913ea8cca493..867be291c371 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 +.include SRCS= \ dwarf_abbrev.c \ diff --git a/tools/libelf/Makefile b/tools/libelf/Makefile index ea9643f2a0d1..01210f7fab47 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 +.include SRCS= elf_begin.c \ elf_cntl.c \ diff --git a/tools/libfdt/Makefile b/tools/libfdt/Makefile index 53a412854cdb..3017a809b95f 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 +.include LIBFDT_DIR= ${.CURDIR}/../../sys/external/bsd/libfdt/dist diff --git a/tools/llvm-lib/Makefile b/tools/llvm-lib/Makefile index 87cf56754d8e..c08bf396dae8 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 +.include NO_LLVM_DEVELOPER= yes diff --git a/tools/llvm/Makefile b/tools/llvm/Makefile index 37f5d312f41a..8f85311e408a 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 +.include # # Do *not* set HOSTPROG or HOSTLIB at this point otherwise diff --git a/tools/lorder/Makefile b/tools/lorder/Makefile index 11b3adc70af5..f3c599e129cb 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 +.include .-include "${TOOLDIR}/share/compat/defs.mk" diff --git a/tools/mandoc/Makefile b/tools/mandoc/Makefile index a09a5ecf9314..952822cf1f2f 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 +.include 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 2ee2d359869b..da9fb6fb03f9 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 +.include HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-mdsetimage diff --git a/usr.sbin/bta2dpd/cosdata-gen/Makefile b/usr.sbin/bta2dpd/cosdata-gen/Makefile index 695d8bc53b57..9c946f8aa124 100644 --- a/usr.sbin/bta2dpd/cosdata-gen/Makefile +++ b/usr.sbin/bta2dpd/cosdata-gen/Makefile @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2017/01/28 16:55:54 nat Exp $ +# $NetBSD: Makefile,v 1.2 2018/05/01 19:59:48 christos Exp $ WARNS?= 6 +.include + HOSTPROG= cosdata MAN= diff --git a/usr.sbin/bta2dpd/sbc_crc-gen/Makefile b/usr.sbin/bta2dpd/sbc_crc-gen/Makefile index 9ef3b6dff7b4..c03d132a8e75 100644 --- a/usr.sbin/bta2dpd/sbc_crc-gen/Makefile +++ b/usr.sbin/bta2dpd/sbc_crc-gen/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2017/01/28 16:55:54 nat Exp $ +# $NetBSD: Makefile,v 1.2 2018/05/01 19:59:48 christos Exp $ WARNS?= 6 +.include + HOSTPROG= sbc_crc -MAN= .include