[src/trunk]: src Now that <bsd.prog.mk> DTRT if HOSTPROG is defined (i.e, it ...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/081f45d1a026
branches:  trunk
changeset: 547420:081f45d1a026
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sun May 18 07:57:31 2003 +0000

description:
Now that <bsd.prog.mk> DTRT if HOSTPROG is defined (i.e, it is a no-op),
there's no need to special-case .include-ing it.

diffstat:

 bin/cat/Makefile                         |  5 +----
 bin/pax/Makefile                         |  4 +---
 gnu/usr.sbin/dbsym/Makefile              |  4 +---
 gnu/usr.sbin/mdsetimage/Makefile         |  4 +---
 libexec/makewhatis/Makefile              |  6 ++----
 sys/arch/prep/stand/mkbootimage/Makefile |  4 +---
 usr.bin/cap_mkdb/Makefile                |  4 +---
 usr.bin/cksum/Makefile                   |  4 +---
 usr.bin/compile_et/Makefile              |  4 +---
 usr.bin/crunch/crunchgen/Makefile        |  4 ++--
 usr.bin/ctags/Makefile                   |  4 +---
 usr.bin/elf2ecoff/Makefile               |  4 +---
 usr.bin/fgen/Makefile                    |  4 +---
 usr.bin/gencat/Makefile                  |  4 +---
 usr.bin/hexdump/Makefile                 |  5 +++--
 usr.bin/lex/Makefile                     |  4 +---
 usr.bin/m4/Makefile                      |  4 +---
 usr.bin/menuc/Makefile                   |  4 ++--
 usr.bin/mkdep/Makefile                   |  4 +---
 usr.bin/mklocale/Makefile                |  4 +---
 usr.bin/mktemp/Makefile                  |  4 +---
 usr.bin/msgc/Makefile                    |  4 ++--
 usr.bin/rpcgen/Makefile                  |  4 +---
 usr.bin/tsort/Makefile                   |  4 +---
 usr.bin/uudecode/Makefile                |  4 +---
 usr.bin/xinstall/Makefile                |  4 +---
 usr.bin/xlint/lint1/Makefile             |  4 ++--
 usr.bin/xlint/lint2/Makefile             |  5 +----
 usr.bin/xlint/xlint/Makefile             |  4 +---
 usr.bin/yacc/Makefile                    |  4 +---
 usr.sbin/config/Makefile                 |  4 +---
 usr.sbin/installboot/Makefile            |  4 +---
 usr.sbin/makefs/Makefile                 |  4 +---
 usr.sbin/mdsetimage/Makefile             |  4 +---
 usr.sbin/mtree/Makefile                  |  4 +---
 usr.sbin/pwd_mkdb/Makefile               |  4 ++--
 usr.sbin/sunlabel/Makefile               |  5 +++--
 usr.sbin/zic/Makefile                    |  4 +---
 38 files changed, 48 insertions(+), 110 deletions(-)

diffs (truncated from 603 to 300 lines):

diff -r 125765910d76 -r 081f45d1a026 bin/cat/Makefile
--- a/bin/cat/Makefile  Sun May 18 07:57:28 2003 +0000
+++ b/bin/cat/Makefile  Sun May 18 07:57:31 2003 +0000
@@ -1,9 +1,6 @@
-#      $NetBSD: Makefile,v 1.11 2002/06/10 18:31:12 mason Exp $
+#      $NetBSD: Makefile,v 1.12 2003/05/18 07:57:31 lukem Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
 PROG=  cat
 
-.ifndef HOSTPROG
 .include <bsd.prog.mk>
-.endif
-
diff -r 125765910d76 -r 081f45d1a026 bin/pax/Makefile
--- a/bin/pax/Makefile  Sun May 18 07:57:28 2003 +0000
+++ b/bin/pax/Makefile  Sun May 18 07:57:31 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.28 2003/05/09 01:09:13 lukem Exp $
+#      $NetBSD: Makefile,v 1.29 2003/05/18 07:57:31 lukem Exp $
 #       @(#)Makefile   8.1 (Berkeley) 5/31/93
 
 # To install on versions prior to BSD 4.4 the following may have to be
@@ -65,6 +65,4 @@
 DPADD+=        ${LIBRMT}
 .endif
 
-.if !defined(HOSTPROG)
 .include <bsd.prog.mk>
-.endif
diff -r 125765910d76 -r 081f45d1a026 gnu/usr.sbin/dbsym/Makefile
--- a/gnu/usr.sbin/dbsym/Makefile       Sun May 18 07:57:28 2003 +0000
+++ b/gnu/usr.sbin/dbsym/Makefile       Sun May 18 07:57:31 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2003/04/11 22:46:03 thorpej Exp $
+#      $NetBSD: Makefile,v 1.10 2003/05/18 07:57:31 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -35,6 +35,4 @@
 .endif # HOSTPROG
 .endif # MKBFD != no
 
-.ifndef HOSTPROG
 .include <bsd.prog.mk>
-.endif # HOSTPROG
diff -r 125765910d76 -r 081f45d1a026 gnu/usr.sbin/mdsetimage/Makefile
--- a/gnu/usr.sbin/mdsetimage/Makefile  Sun May 18 07:57:28 2003 +0000
+++ b/gnu/usr.sbin/mdsetimage/Makefile  Sun May 18 07:57:31 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.13 2003/04/11 22:46:03 thorpej Exp $
+#      $NetBSD: Makefile,v 1.14 2003/05/18 07:57:32 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -35,6 +35,4 @@
 .endif # HOSTPROG
 .endif # MKBFD != no
 
-.ifndef HOSTPROG
 .include <bsd.prog.mk>
-.endif # HOSTPROG
diff -r 125765910d76 -r 081f45d1a026 libexec/makewhatis/Makefile
--- a/libexec/makewhatis/Makefile       Sun May 18 07:57:28 2003 +0000
+++ b/libexec/makewhatis/Makefile       Sun May 18 07:57:31 2003 +0000
@@ -1,8 +1,6 @@
-#      $NetBSD: Makefile,v 1.16 2002/09/18 06:24:35 lukem Exp $
+#      $NetBSD: Makefile,v 1.17 2003/05/18 07:57:32 lukem Exp $
 
-.ifndef HOSTPROG
 .include <bsd.own.mk>
-.endif
 
 PROG=  makewhatis
 SRCS=  makewhatis.c manconf.c
@@ -14,6 +12,6 @@
 .ifndef HOSTPROG
 DPADD= ${LIBZ}
 LDADD= -lz
+.endif
 
 .include <bsd.prog.mk>
-.endif
diff -r 125765910d76 -r 081f45d1a026 sys/arch/prep/stand/mkbootimage/Makefile
--- a/sys/arch/prep/stand/mkbootimage/Makefile  Sun May 18 07:57:28 2003 +0000
+++ b/sys/arch/prep/stand/mkbootimage/Makefile  Sun May 18 07:57:31 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2002/04/25 23:30:26 kleink Exp $
+#      $NetBSD: Makefile,v 1.4 2003/05/18 07:57:32 lukem Exp $
 
 PROG=  mkbootimage
 SRCS=  mkbootimage.c byteorder.c
@@ -10,6 +10,4 @@
 
 CPPFLAGS= -I${LIBSA} -I${.CURDIR}
 
-.ifndef HOSTPROG
 .include <bsd.prog.mk>
-.endif
diff -r 125765910d76 -r 081f45d1a026 usr.bin/cap_mkdb/Makefile
--- a/usr.bin/cap_mkdb/Makefile Sun May 18 07:57:28 2003 +0000
+++ b/usr.bin/cap_mkdb/Makefile Sun May 18 07:57:31 2003 +0000
@@ -1,8 +1,6 @@
-#      $NetBSD: Makefile,v 1.5 2002/01/31 19:23:50 tv Exp $
+#      $NetBSD: Makefile,v 1.6 2003/05/18 07:57:32 lukem Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/6/93
 
 PROG=  cap_mkdb
 
-.ifndef HOSTPROG
 .include <bsd.prog.mk>
-.endif
diff -r 125765910d76 -r 081f45d1a026 usr.bin/cksum/Makefile
--- a/usr.bin/cksum/Makefile    Sun May 18 07:57:28 2003 +0000
+++ b/usr.bin/cksum/Makefile    Sun May 18 07:57:31 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2002/03/31 14:30:20 bjh21 Exp $
+#      $NetBSD: Makefile,v 1.12 2003/05/18 07:57:33 lukem Exp $
 #      @(#)Makefile    8.2 (Berkeley) 4/28/95
 
 PROG=  cksum
@@ -16,6 +16,4 @@
 MLINKS+=cksum.1 sha1.1
 MLINKS+=cksum.1 rmd160.1
 
-.ifndef HOSTPROG
 .include <bsd.prog.mk>
-.endif
diff -r 125765910d76 -r 081f45d1a026 usr.bin/compile_et/Makefile
--- a/usr.bin/compile_et/Makefile       Sun May 18 07:57:28 2003 +0000
+++ b/usr.bin/compile_et/Makefile       Sun May 18 07:57:31 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/10/23 01:25:35 itojun Exp $
+# $NetBSD: Makefile,v 1.14 2003/05/18 07:57:33 lukem Exp $
 
 NOLINT= # defined
 
@@ -32,6 +32,4 @@
 
 CLEANFILES+=   lex.c parse.c parse.h
 
-.ifndef HOSTPROG
 .include <bsd.prog.mk>
-.endif
diff -r 125765910d76 -r 081f45d1a026 usr.bin/crunch/crunchgen/Makefile
--- a/usr.bin/crunch/crunchgen/Makefile Sun May 18 07:57:28 2003 +0000
+++ b/usr.bin/crunch/crunchgen/Makefile Sun May 18 07:57:31 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2002/09/17 23:18:27 thorpej Exp $
+#      $NetBSD: Makefile,v 1.10 2003/05/18 07:57:33 lukem Exp $
 
 PROG=          crunchgen
 SRCS=          crunchgen.c crunched_skel.c
@@ -7,9 +7,9 @@
 crunched_skel.c: mkskel.sh crunched_main.c
        sh ${.ALLSRC} >${.TARGET}
 
-.ifndef HOSTPROG
 .include <bsd.prog.mk>
 
+.ifndef HOSTPROG
 # Native tool -- key only off TOOLCHAIN_MISSING
 .if ${TOOLCHAIN_MISSING} != "yes"
 CPPFLAGS+=     -DNEW_TOOLCHAIN
diff -r 125765910d76 -r 081f45d1a026 usr.bin/ctags/Makefile
--- a/usr.bin/ctags/Makefile    Sun May 18 07:57:28 2003 +0000
+++ b/usr.bin/ctags/Makefile    Sun May 18 07:57:31 2003 +0000
@@ -1,10 +1,8 @@
-#      $NetBSD: Makefile,v 1.5 2002/01/31 19:26:34 tv Exp $
+#      $NetBSD: Makefile,v 1.6 2003/05/18 07:57:33 lukem Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/6/93
 
 PROG=  ctags
 CPPFLAGS+=-I${.CURDIR}
 SRCS=  C.c ctags.c fortran.c lisp.c print.c tree.c yacc.c
 
-.ifndef HOSTPROG
 .include <bsd.prog.mk>
-.endif
diff -r 125765910d76 -r 081f45d1a026 usr.bin/elf2ecoff/Makefile
--- a/usr.bin/elf2ecoff/Makefile        Sun May 18 07:57:28 2003 +0000
+++ b/usr.bin/elf2ecoff/Makefile        Sun May 18 07:57:31 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2002/02/24 01:52:09 thorpej Exp $
+#      $NetBSD: Makefile,v 1.10 2003/05/18 07:57:34 lukem Exp $
 #      from: @(#)Makefile      5.4 (Berkeley) 5/11/90
 
 .include <bsd.own.mk>
@@ -12,6 +12,4 @@
 
 MAN=   elf2ecoff.1
 
-.ifndef HOSTPROG
 .include <bsd.prog.mk>
-.endif
diff -r 125765910d76 -r 081f45d1a026 usr.bin/fgen/Makefile
--- a/usr.bin/fgen/Makefile     Sun May 18 07:57:28 2003 +0000
+++ b/usr.bin/fgen/Makefile     Sun May 18 07:57:31 2003 +0000
@@ -1,10 +1,8 @@
-#      $NetBSD: Makefile,v 1.5 2002/05/28 21:56:06 bjh21 Exp $
+#      $NetBSD: Makefile,v 1.6 2003/05/18 07:57:34 lukem Exp $
 
 CPPFLAGS+= -I${.CURDIR}
 PROG=  fgen
 SRCS=  fgen.l
 MAN=   fgen.1
 
-.ifndef HOSTPROG
 .include <bsd.prog.mk>
-.endif
diff -r 125765910d76 -r 081f45d1a026 usr.bin/gencat/Makefile
--- a/usr.bin/gencat/Makefile   Sun May 18 07:57:28 2003 +0000
+++ b/usr.bin/gencat/Makefile   Sun May 18 07:57:31 2003 +0000
@@ -1,8 +1,6 @@
-#      $NetBSD: Makefile,v 1.6 2001/08/14 10:18:28 tv Exp $
+#      $NetBSD: Makefile,v 1.7 2003/05/18 07:57:34 lukem Exp $
 
 PROG=  gencat
 MAN=   gencat.1
 
-.ifndef HOSTPROG
 .include <bsd.prog.mk>
-.endif
diff -r 125765910d76 -r 081f45d1a026 usr.bin/hexdump/Makefile
--- a/usr.bin/hexdump/Makefile  Sun May 18 07:57:28 2003 +0000
+++ b/usr.bin/hexdump/Makefile  Sun May 18 07:57:31 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2003/03/07 01:14:31 thorpej Exp $
+#      $NetBSD: Makefile,v 1.9 2003/05/18 07:57:34 lukem Exp $
 #      from: @(#)Makefile      8.1 (Berkeley) 6/6/93
 
 PROG=  hexdump
@@ -9,5 +9,6 @@
 
 .ifndef HOSTPROG
 LINKS= ${BINDIR}/hexdump ${BINDIR}/od
+.endif
+
 .include <bsd.prog.mk>
-.endif
diff -r 125765910d76 -r 081f45d1a026 usr.bin/lex/Makefile
--- a/usr.bin/lex/Makefile      Sun May 18 07:57:28 2003 +0000
+++ b/usr.bin/lex/Makefile      Sun May 18 07:57:31 2003 +0000
@@ -1,5 +1,5 @@
 #      from: @(#)Makefile      5.4 (Berkeley) 6/24/90
-#      $NetBSD: Makefile,v 1.24 2002/01/30 21:07:35 tv Exp $
+#      $NetBSD: Makefile,v 1.25 2003/05/18 07:57:34 lukem Exp $
 #
 # By default, flex will be configured to generate 8-bit scanners only if the
 # -8 flag is given.  If you want it to always generate 8-bit scanners, add
@@ -38,6 +38,4 @@
 
 scan.o yylex.o: parse.h
 
-.ifndef HOSTPROG
 .include <bsd.prog.mk>
-.endif
diff -r 125765910d76 -r 081f45d1a026 usr.bin/m4/Makefile
--- a/usr.bin/m4/Makefile       Sun May 18 07:57:28 2003 +0000
+++ b/usr.bin/m4/Makefile       Sun May 18 07:57:31 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2001/11/14 14:22:09 tv Exp $
+#      $NetBSD: Makefile,v 1.12 2003/05/18 07:57:35 lukem Exp $
 #
 #      @(#)Makefile    8.1 (Berkeley) 6/6/93
 
@@ -11,6 +11,4 @@
 
 WARNS=1
 
-.ifndef HOSTPROG
 .include <bsd.prog.mk>
-.endif
diff -r 125765910d76 -r 081f45d1a026 usr.bin/menuc/Makefile
--- a/usr.bin/menuc/Makefile    Sun May 18 07:57:28 2003 +0000
+++ b/usr.bin/menuc/Makefile    Sun May 18 07:57:31 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2002/01/31 22:43:55 tv Exp $
+#      $NetBSD: Makefile,v 1.11 2003/05/18 07:57:35 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -15,6 +15,6 @@
 .ifndef HOSTPROG
 LDADD+=                -ll
 DPADD+=                ${LIBL}
+.endif
 
 .include <bsd.prog.mk>
-.endif
diff -r 125765910d76 -r 081f45d1a026 usr.bin/mkdep/Makefile
--- a/usr.bin/mkdep/Makefile    Sun May 18 07:57:28 2003 +0000
+++ b/usr.bin/mkdep/Makefile    Sun May 18 07:57:31 2003 +0000
@@ -1,10 +1,8 @@
-#      $NetBSD: Makefile,v 1.12 2002/06/14 23:14:18 simonb Exp $
+#      $NetBSD: Makefile,v 1.13 2003/05/18 07:57:35 lukem Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/6/93
 
 MAN=   mkdep.1
 PROG=  mkdep