[src/trunk]: src - in <bsd.files.mk>, don't clear FILES after using it, as th...

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

details:   https://anonhg.NetBSD.org/src/rev/6aebc3147cf3
branches:  trunk
changeset: 526049:6aebc3147cf3
user:      lukem <lukem%NetBSD.org@localhost>
date:      Wed Apr 24 08:18:45 2002 +0000

description:
- in <bsd.files.mk>, don't clear FILES after using it, as that prevents
        make -V FILES
  from being useful (and given that every other variable can be
  extracted using make -V, the behaviour was unusually inconsistent
  given that the original reason for clearing it doesn't seem to be
  relevant anymore)
- use <bsd.prog.mk> instead of directly including <bsd.files.mk>
  (and possibly <bsd.man.mk> or <bsd.own.mk>)
- remove obsolete NOPROG

diffstat:

 etc/defaults/Makefile                        |  4 +---
 etc/mtree/Makefile                           |  4 ++--
 etc/rc.d/Makefile                            |  4 +---
 gnu/usr.bin/texinfo/Makefile                 |  5 ++---
 gnu/usr.sbin/sendmail/cf/Makefile            |  4 ++--
 gnu/usr.sbin/sendmail/cf/cf/Makefile         |  3 +--
 gnu/usr.sbin/sendmail/cf/domain/Makefile     |  5 ++---
 gnu/usr.sbin/sendmail/cf/feature/Makefile    |  5 ++---
 gnu/usr.sbin/sendmail/cf/hack/Makefile       |  5 ++---
 gnu/usr.sbin/sendmail/cf/m4/Makefile         |  5 ++---
 gnu/usr.sbin/sendmail/cf/mailer/Makefile     |  5 ++---
 gnu/usr.sbin/sendmail/cf/ostype/Makefile     |  5 ++---
 gnu/usr.sbin/sendmail/cf/sh/Makefile         |  5 ++---
 gnu/usr.sbin/sendmail/cf/siteconfig/Makefile |  5 ++---
 lib/libkrb5/Makefile                         |  8 +++-----
 libexec/ld.aout_so/Makefile                  |  4 +---
 sbin/mount_portal/examples/Makefile          |  3 +--
 share/mk/bsd.files.mk                        |  7 +------
 sys/arch/atari/stand/keymaps/Makefile.inc    |  4 ++--
 sys/arch/vax/stand/pcs/Makefile              |  8 +++-----
 usr.bin/openssl/Makefile                     |  8 +++-----
 usr.sbin/dhcp/server/Makefile                |  3 +--
 usr.sbin/ipf/rules/Makefile                  |  5 ++---
 23 files changed, 42 insertions(+), 72 deletions(-)

diffs (truncated from 384 to 300 lines):

diff -r 03d5673ee015 -r 6aebc3147cf3 etc/defaults/Makefile
--- a/etc/defaults/Makefile     Wed Apr 24 08:00:55 2002 +0000
+++ b/etc/defaults/Makefile     Wed Apr 24 08:18:45 2002 +0000
@@ -1,9 +1,7 @@
-#      $NetBSD: Makefile,v 1.1 2000/10/01 05:46:03 lukem Exp $
+#      $NetBSD: Makefile,v 1.2 2002/04/24 08:18:45 lukem Exp $
 
 FILES=         daily.conf monthly.conf rc.conf security.conf weekly.conf
 FILESDIR=      /etc/defaults
 FILESMODE=     ${NONBINMODE}
 
-NOPROG= noprog
-
 .include <bsd.prog.mk>
diff -r 03d5673ee015 -r 6aebc3147cf3 etc/mtree/Makefile
--- a/etc/mtree/Makefile        Wed Apr 24 08:00:55 2002 +0000
+++ b/etc/mtree/Makefile        Wed Apr 24 08:18:45 2002 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: Makefile,v 1.3 1998/09/04 10:29:12 agc Exp $
+#      $NetBSD: Makefile,v 1.4 2002/04/24 08:18:46 lukem Exp $
 
-FILES= NetBSD.dist special
+FILES=         NetBSD.dist special
 FILESDIR=      /etc/mtree
 
 .include <bsd.prog.mk>
diff -r 03d5673ee015 -r 6aebc3147cf3 etc/rc.d/Makefile
--- a/etc/rc.d/Makefile Wed Apr 24 08:00:55 2002 +0000
+++ b/etc/rc.d/Makefile Wed Apr 24 08:18:45 2002 +0000
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2002/02/11 14:00:35 lukem Exp $
-
-NOPROG= noprog
+# $NetBSD: Makefile,v 1.28 2002/04/24 08:18:47 lukem Exp $
 
 .include <bsd.own.mk>
 
diff -r 03d5673ee015 -r 6aebc3147cf3 gnu/usr.bin/texinfo/Makefile
--- a/gnu/usr.bin/texinfo/Makefile      Wed Apr 24 08:00:55 2002 +0000
+++ b/gnu/usr.bin/texinfo/Makefile      Wed Apr 24 08:18:45 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2001/09/02 23:00:30 wiz Exp $
+#      $NetBSD: Makefile,v 1.11 2002/04/24 08:18:47 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -29,7 +29,6 @@
 
 .PATH: ${DIST}/texinfo ${DIST}/texinfo/doc ${DIST}/texinfo/po
 
-.include <bsd.man.mk>
 .include <bsd.info.mk>
-.include <bsd.files.mk>
+.include <bsd.prog.mk>
 .include <bsd.subdir.mk>
diff -r 03d5673ee015 -r 6aebc3147cf3 gnu/usr.sbin/sendmail/cf/Makefile
--- a/gnu/usr.sbin/sendmail/cf/Makefile Wed Apr 24 08:00:55 2002 +0000
+++ b/gnu/usr.sbin/sendmail/cf/Makefile Wed Apr 24 08:18:45 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2000/03/15 16:25:58 tron Exp $
+#      $NetBSD: Makefile,v 1.4 2002/04/24 08:18:47 lukem Exp $
 #      install these sources in /usr/share/sendmail
 
 .include <bsd.own.mk>
@@ -15,5 +15,5 @@
 
 all:
 
-.include <bsd.files.mk>
+.include <bsd.prog.mk>
 .include <bsd.subdir.mk>
diff -r 03d5673ee015 -r 6aebc3147cf3 gnu/usr.sbin/sendmail/cf/cf/Makefile
--- a/gnu/usr.sbin/sendmail/cf/cf/Makefile      Wed Apr 24 08:00:55 2002 +0000
+++ b/gnu/usr.sbin/sendmail/cf/cf/Makefile      Wed Apr 24 08:18:45 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.17 2002/02/09 09:21:47 lukem Exp $
+#      $NetBSD: Makefile,v 1.18 2002/04/24 08:18:48 lukem Exp $
 #      install these sources in /usr/share/sendmail/cf
 
 DIST=          ${.CURDIR}/../../../../dist
@@ -122,4 +122,3 @@
 ${ALL}: ${M4FILES}
 
 .include <bsd.prog.mk>
-.include <bsd.files.mk>
diff -r 03d5673ee015 -r 6aebc3147cf3 gnu/usr.sbin/sendmail/cf/domain/Makefile
--- a/gnu/usr.sbin/sendmail/cf/domain/Makefile  Wed Apr 24 08:00:55 2002 +0000
+++ b/gnu/usr.sbin/sendmail/cf/domain/Makefile  Wed Apr 24 08:18:45 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2000/02/08 13:45:37 tron Exp $
+#      $NetBSD: Makefile,v 1.2 2002/04/24 08:18:48 lukem Exp $
 #      install these sources in /usr/share/sendmail/domain
 
 DIST=          ${.CURDIR}/../../../../dist
@@ -11,5 +11,4 @@
 
 all:
 
-.include <bsd.own.mk>
-.include <bsd.files.mk>
+.include <bsd.prog.mk>
diff -r 03d5673ee015 -r 6aebc3147cf3 gnu/usr.sbin/sendmail/cf/feature/Makefile
--- a/gnu/usr.sbin/sendmail/cf/feature/Makefile Wed Apr 24 08:00:55 2002 +0000
+++ b/gnu/usr.sbin/sendmail/cf/feature/Makefile Wed Apr 24 08:18:45 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2000/05/04 00:52:58 itojun Exp $
+#      $NetBSD: Makefile,v 1.3 2002/04/24 08:18:48 lukem Exp $
 #      install these sources in /usr/share/sendmail/feature
 
 DIST=          ${.CURDIR}/../../../../dist
@@ -22,5 +22,4 @@
 
 all:
 
-.include <bsd.own.mk>
-.include <bsd.files.mk>
+.include <bsd.prog.mk>
diff -r 03d5673ee015 -r 6aebc3147cf3 gnu/usr.sbin/sendmail/cf/hack/Makefile
--- a/gnu/usr.sbin/sendmail/cf/hack/Makefile    Wed Apr 24 08:00:55 2002 +0000
+++ b/gnu/usr.sbin/sendmail/cf/hack/Makefile    Wed Apr 24 08:18:45 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2000/02/08 13:45:38 tron Exp $
+#      $NetBSD: Makefile,v 1.2 2002/04/24 08:18:49 lukem Exp $
 #      install these sources in /usr/share/sendmail/hack
 
 DIST=          ${.CURDIR}/../../../../dist
@@ -9,5 +9,4 @@
 
 all:
 
-.include <bsd.own.mk>
-.include <bsd.files.mk>
+.include <bsd.prog.mk>
diff -r 03d5673ee015 -r 6aebc3147cf3 gnu/usr.sbin/sendmail/cf/m4/Makefile
--- a/gnu/usr.sbin/sendmail/cf/m4/Makefile      Wed Apr 24 08:00:55 2002 +0000
+++ b/gnu/usr.sbin/sendmail/cf/m4/Makefile      Wed Apr 24 08:18:45 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2000/05/03 10:50:56 itojun Exp $
+#      $NetBSD: Makefile,v 1.3 2002/04/24 08:18:49 lukem Exp $
 #      install these sources in /usr/share/sendmail/m4
 
 DIST=          ${.CURDIR}/../../../../dist
@@ -9,5 +9,4 @@
 
 all:
 
-.include <bsd.own.mk>
-.include <bsd.files.mk>
+.include <bsd.prog.mk>
diff -r 03d5673ee015 -r 6aebc3147cf3 gnu/usr.sbin/sendmail/cf/mailer/Makefile
--- a/gnu/usr.sbin/sendmail/cf/mailer/Makefile  Wed Apr 24 08:00:55 2002 +0000
+++ b/gnu/usr.sbin/sendmail/cf/mailer/Makefile  Wed Apr 24 08:18:45 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2000/05/04 00:52:58 itojun Exp $
+#      $NetBSD: Makefile,v 1.3 2002/04/24 08:18:49 lukem Exp $
 #      install these sources in /usr/share/sendmail/mailer
 
 DIST=          ${.CURDIR}/../../../../dist
@@ -10,5 +10,4 @@
 
 all:
 
-.include <bsd.own.mk>
-.include <bsd.files.mk>
+.include <bsd.prog.mk>
diff -r 03d5673ee015 -r 6aebc3147cf3 gnu/usr.sbin/sendmail/cf/ostype/Makefile
--- a/gnu/usr.sbin/sendmail/cf/ostype/Makefile  Wed Apr 24 08:00:55 2002 +0000
+++ b/gnu/usr.sbin/sendmail/cf/ostype/Makefile  Wed Apr 24 08:18:45 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2001/10/19 02:53:02 tv Exp $
+#      $NetBSD: Makefile,v 1.8 2002/04/24 08:18:50 lukem Exp $
 #      install these sources in /usr/share/sendmail/ostype
 
 DIST=          ${.CURDIR}/../../../../dist
@@ -19,5 +19,4 @@
 
 all:
 
-.include <bsd.own.mk>
-.include <bsd.files.mk>
+.include <bsd.prog.mk>
diff -r 03d5673ee015 -r 6aebc3147cf3 gnu/usr.sbin/sendmail/cf/sh/Makefile
--- a/gnu/usr.sbin/sendmail/cf/sh/Makefile      Wed Apr 24 08:00:55 2002 +0000
+++ b/gnu/usr.sbin/sendmail/cf/sh/Makefile      Wed Apr 24 08:18:45 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2000/02/08 13:45:36 tron Exp $
+#      $NetBSD: Makefile,v 1.2 2002/04/24 08:18:50 lukem Exp $
 #      install these sources in /usr/share/sendmail/sh
 
 DIST=          ${.CURDIR}/../../../../dist
@@ -9,5 +9,4 @@
 
 all:
 
-.include <bsd.own.mk>
-.include <bsd.files.mk>
+.include <bsd.prog.mk>
diff -r 03d5673ee015 -r 6aebc3147cf3 gnu/usr.sbin/sendmail/cf/siteconfig/Makefile
--- a/gnu/usr.sbin/sendmail/cf/siteconfig/Makefile      Wed Apr 24 08:00:55 2002 +0000
+++ b/gnu/usr.sbin/sendmail/cf/siteconfig/Makefile      Wed Apr 24 08:18:45 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2000/02/08 13:45:40 tron Exp $
+#      $NetBSD: Makefile,v 1.2 2002/04/24 08:18:51 lukem Exp $
 #      install these sources in /usr/share/sendmail/siteconfig
 
 DIST=          ${.CURDIR}/../../../../dist
@@ -9,5 +9,4 @@
 
 all:
 
-.include <bsd.own.mk>
-.include <bsd.files.mk>
+.include <bsd.prog.mk>
diff -r 03d5673ee015 -r 6aebc3147cf3 lib/libkrb5/Makefile
--- a/lib/libkrb5/Makefile      Wed Apr 24 08:00:55 2002 +0000
+++ b/lib/libkrb5/Makefile      Wed Apr 24 08:18:45 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/12/12 00:51:04 tv Exp $
+# $NetBSD: Makefile,v 1.21 2002/04/24 08:18:51 lukem Exp $
 
 NOLINT=                # defined
 
@@ -268,12 +268,10 @@
        fi
 .endif
 
-.include <bsd.lib.mk>
-.include <bsd.info.mk>
-
 .if ${MKSHARE} != "no"
 FILES=         ${DIST}/heimdal/krb5.conf
 FILESDIR=      /usr/share/examples/kerberos
 .endif
 
-.include <bsd.files.mk>
+.include <bsd.lib.mk>
+.include <bsd.info.mk>
diff -r 03d5673ee015 -r 6aebc3147cf3 libexec/ld.aout_so/Makefile
--- a/libexec/ld.aout_so/Makefile       Wed Apr 24 08:00:55 2002 +0000
+++ b/libexec/ld.aout_so/Makefile       Wed Apr 24 08:18:45 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.37 2002/03/29 09:48:49 matt Exp $
+#      $NetBSD: Makefile,v 1.38 2002/04/24 08:18:51 lukem Exp $
 
 .include <bsd.own.mk>
 .if (${OBJECT_FMT} == "a.out")
@@ -46,8 +46,6 @@
 ld.so: ${.CURDIR}/ld.so.${MACHINE_ARCH}.uue
        ${UUDECODE} ${.ALLSRC}
 
-.include <bsd.files.mk>
-
 .endif
 
 MAN= ld.aout_so.1
diff -r 03d5673ee015 -r 6aebc3147cf3 sbin/mount_portal/examples/Makefile
--- a/sbin/mount_portal/examples/Makefile       Wed Apr 24 08:00:55 2002 +0000
+++ b/sbin/mount_portal/examples/Makefile       Wed Apr 24 08:18:45 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/12/11 15:39:10 bgrayson Exp $
+# $NetBSD: Makefile,v 1.5 2002/04/24 08:18:52 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -17,4 +17,3 @@
 .endif
 
 .include <bsd.prog.mk>
-.include <bsd.files.mk>
diff -r 03d5673ee015 -r 6aebc3147cf3 share/mk/bsd.files.mk
--- a/share/mk/bsd.files.mk     Wed Apr 24 08:00:55 2002 +0000
+++ b/share/mk/bsd.files.mk     Wed Apr 24 08:18:45 2002 +0000
@@ -1,9 +1,6 @@
-#      $NetBSD: bsd.files.mk,v 1.18 2002/02/11 21:14:58 mycroft Exp $
+#      $NetBSD: bsd.files.mk,v 1.19 2002/04/24 08:18:52 lukem Exp $
 
 .if !target(__fileinstall)
-# This file can be included multiple times.  It clears the definition of
-# FILES at the end so that this is possible.
-
 ##### Basic targets
 .PHONY:                filesinstall
 realinstall:   filesinstall
@@ -50,5 +47,3 @@
 .undef _FDIR
 .undef _FNAME
 .undef _F
-
-FILES:=                # reset to empty
diff -r 03d5673ee015 -r 6aebc3147cf3 sys/arch/atari/stand/keymaps/Makefile.inc
--- a/sys/arch/atari/stand/keymaps/Makefile.inc Wed Apr 24 08:00:55 2002 +0000
+++ b/sys/arch/atari/stand/keymaps/Makefile.inc Wed Apr 24 08:18:45 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2002/04/15 17:27:33 bjh21 Exp $
+# $NetBSD: Makefile.inc,v 1.6 2002/04/24 08:18:53 lukem Exp $
 
 realall: ${MAP}
 
@@ -9,4 +9,4 @@
 FILES=${MAP}