From c0d10d8e3a0b443950ae8253ff9fd09822abef47 Mon Sep 17 00:00:00 2001 From: christos Date: Tue, 1 May 2018 12:38:39 +0000 Subject: [PATCH] Centralize NOMAN handling. --- tools/Makefile.inc | 5 ++++- tools/binstall/Makefile | 3 +-- tools/ctfconvert/Makefile | 4 +--- tools/ctfmerge/Makefile | 4 +--- tools/cvslatest/Makefile | 4 +--- tools/dbsym/Makefile | 4 +--- tools/disklabel/Makefile | 4 +--- tools/dtc/Makefile | 4 +--- tools/elftosb/Makefile | 5 +---- tools/gpt/Makefile | 3 +-- tools/m68k-elf2aout/Makefile | 4 +--- tools/makekeys/Makefile | 13 +------------ tools/mandoc/Makefile | 4 +--- tools/mdsetimage/Makefile | 4 +--- 14 files changed, 17 insertions(+), 48 deletions(-) diff --git a/tools/Makefile.inc b/tools/Makefile.inc index 7b701cc192a2..61335a4558f4 100644 --- a/tools/Makefile.inc +++ b/tools/Makefile.inc @@ -1,3 +1,6 @@ -# $NetBSD: Makefile.inc,v 1.14 2018/05/01 00:04:34 christos Exp $ +# $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 6b91c01d776e..6b92c41c74e8 100644 --- a/tools/binstall/Makefile +++ b/tools/binstall/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.12 2018/05/01 00:04:34 christos Exp $ +# $NetBSD: Makefile,v 1.13 2018/05/01 12:38:39 christos Exp $ -NOMAN= .include HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-install diff --git a/tools/ctfconvert/Makefile b/tools/ctfconvert/Makefile index a23bed6e60cf..680f85f95eb1 100644 --- a/tools/ctfconvert/Makefile +++ b/tools/ctfconvert/Makefile @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2018/05/01 00:04:35 christos Exp $ - -NOMAN= # defined +# $NetBSD: Makefile,v 1.8 2018/05/01 12:38:39 christos Exp $ .include diff --git a/tools/ctfmerge/Makefile b/tools/ctfmerge/Makefile index ff37a85fe389..f47275a2bd19 100644 --- a/tools/ctfmerge/Makefile +++ b/tools/ctfmerge/Makefile @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2018/05/01 00:04:35 christos Exp $ - -NOMAN= # defined +# $NetBSD: Makefile,v 1.9 2018/05/01 12:38:39 christos Exp $ .include diff --git a/tools/cvslatest/Makefile b/tools/cvslatest/Makefile index 02c2caae2ce3..3888b74dc3fb 100644 --- a/tools/cvslatest/Makefile +++ b/tools/cvslatest/Makefile @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2018/05/01 00:04:35 christos Exp $ - -NOMAN= # defined +# $NetBSD: Makefile,v 1.3 2018/05/01 12:38:39 christos Exp $ .include diff --git a/tools/dbsym/Makefile b/tools/dbsym/Makefile index f7c486554c47..bfccdcce247b 100644 --- a/tools/dbsym/Makefile +++ b/tools/dbsym/Makefile @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2018/05/01 00:04:35 christos Exp $ - -NOMAN= # defined +# $NetBSD: Makefile,v 1.14 2018/05/01 12:38:39 christos Exp $ .include diff --git a/tools/disklabel/Makefile b/tools/disklabel/Makefile index 01ba268f9281..ab1665ed8cd8 100644 --- a/tools/disklabel/Makefile +++ b/tools/disklabel/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.6 2013/05/03 16:05:12 matt Exp $ +# $NetBSD: Makefile,v 1.7 2018/05/01 12:38:39 christos Exp $ HOSTPROGNAME= nbdisklabel HOST_SRCDIR= sbin/disklabel HOST_SRCS= disklabel.c -NOMAN= # defined - .include "${.CURDIR}/../Makefile.nbincludes" .include "${.CURDIR}/../Makefile.host" diff --git a/tools/dtc/Makefile b/tools/dtc/Makefile index 593ce5883560..badac7f437e3 100644 --- a/tools/dtc/Makefile +++ b/tools/dtc/Makefile @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2018/05/01 00:04:35 christos Exp $ - -NOMAN= # defined +# $NetBSD: Makefile,v 1.4 2018/05/01 12:38:39 christos Exp $ .include diff --git a/tools/elftosb/Makefile b/tools/elftosb/Makefile index aca09880b729..52c7716cd868 100644 --- a/tools/elftosb/Makefile +++ b/tools/elftosb/Makefile @@ -1,11 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2012/11/15 19:49:17 jkunz Exp $ +# $NetBSD: Makefile,v 1.2 2018/05/01 12:38:39 christos Exp $ HOSTPROGNAME= ${_TOOL_PREFIX}elftosb HOSTPROG_CXX= ${_TOOL_PREFIX}elftosb HOST_SRCDIR= external/bsd/elftosb/usr.sbin/elftosb -NOMAN= # defined - - .include "${.CURDIR}/../Makefile.host" diff --git a/tools/gpt/Makefile b/tools/gpt/Makefile index 960898c71584..c47bdb708513 100644 --- a/tools/gpt/Makefile +++ b/tools/gpt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2014/09/30 18:00:28 christos Exp $ +# $NetBSD: Makefile,v 1.4 2018/05/01 12:38:39 christos Exp $ HOSTPROGNAME= nbgpt HOST_SRCDIR= sbin/gpt @@ -6,7 +6,6 @@ HOST_CPPFLAGS+= -I${.CURDIR} HOST_SRCS+= opendisk.c dehumanize_number.c -NOMAN= # defined .PATH.c: ${.CURDIR}/../../lib/libutil ${.CURDIR}/../../lib/libc/gen .include "${.CURDIR}/../Makefile.nbincludes" diff --git a/tools/m68k-elf2aout/Makefile b/tools/m68k-elf2aout/Makefile index 66a8dd20c210..4c6f03662015 100644 --- a/tools/m68k-elf2aout/Makefile +++ b/tools/m68k-elf2aout/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2011/07/16 15:52:02 tsutsui Exp $ +# $NetBSD: Makefile,v 1.2 2018/05/01 12:38:40 christos Exp $ HOSTPROGNAME= ${_TOOL_PREFIX}m68k-elf2aout HOST_SRCDIR= usr.bin/elf2aout HOST_CPPFLAGS= -I${.CURDIR} -NOMAN= # defined - .include .if ${TARGET_ENDIANNESS} == "1234" diff --git a/tools/makekeys/Makefile b/tools/makekeys/Makefile index 7c393575114a..d4bab27bf836 100644 --- a/tools/makekeys/Makefile +++ b/tools/makekeys/Makefile @@ -1,17 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2018/05/01 00:04:36 christos Exp $ - -#NOMAN= - -#.include +# $NetBSD: Makefile,v 1.3 2018/05/01 12:38:40 christos Exp $ HOSTPROG= ${_TOOL_PREFIX}makekeys HOST_SRCDIR= external/mit/xorg/tools/makekeys -#.PATH: ${X11SRCDIR.X11}/src/util - -#HOST_CPPFLAGS+= -I${DESTDIR}${X11INCDIR} - -#SRCS= makekeys.c - .include "${.CURDIR}/../Makefile.host" -#.include diff --git a/tools/mandoc/Makefile b/tools/mandoc/Makefile index 382f99162f1c..a09a5ecf9314 100644 --- a/tools/mandoc/Makefile +++ b/tools/mandoc/Makefile @@ -1,10 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2018/05/01 00:04:36 christos Exp $ +# $NetBSD: Makefile,v 1.12 2018/05/01 12:38:40 christos Exp $ HOSTPROGNAME= ${_TOOL_PREFIX}mandoc HOST_SRCDIR= external/bsd/mdocml/bin/mandoc -NOMAN= # defined - .include NETBSD_MINOR!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh -n diff --git a/tools/mdsetimage/Makefile b/tools/mdsetimage/Makefile index 001ac1a7583e..2ee2d359869b 100644 --- a/tools/mdsetimage/Makefile +++ b/tools/mdsetimage/Makefile @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2018/05/01 00:04:36 christos Exp $ - -NOMAN= # defined +# $NetBSD: Makefile,v 1.16 2018/05/01 12:38:40 christos Exp $ .include