Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- in <bsd.files.mk>, don't clear FILES after using it, as that prevents

Browse Source 
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
This commit is contained in:
lukem 2002-04-24 08:18:45 +00:00
parent c0cb853db0
commit 2c1cfc8e8c
23 changed files with 42 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/defaults/Makefile
View File

@ -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 FILES= daily.conf monthly.conf rc.conf security.conf weekly.conf
FILESDIR= /etc/defaults FILESDIR= /etc/defaults
FILESMODE= ${NONBINMODE} FILESMODE= ${NONBINMODE}
NOPROG= noprog
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
etc/mtree/Makefile
View File

@ -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 FILESDIR= /etc/mtree
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
etc/rc.d/Makefile
View File

@ -1,6 +1,4 @@
# $NetBSD: Makefile,v 1.27 2002/02/11 14:00:35 lukem Exp $ # $NetBSD: Makefile,v 1.28 2002/04/24 08:18:47 lukem Exp $
NOPROG= noprog
.include <bsd.own.mk> .include <bsd.own.mk>

5
gnu/usr.bin/texinfo/Makefile
View File

@ -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> .include <bsd.own.mk>
@ -29,7 +29,6 @@ INFOFLAGS= -I${DIST}/texinfo/doc
.PATH: ${DIST}/texinfo ${DIST}/texinfo/doc ${DIST}/texinfo/po .PATH: ${DIST}/texinfo ${DIST}/texinfo/doc ${DIST}/texinfo/po
.include <bsd.man.mk>
.include <bsd.info.mk> .include <bsd.info.mk>
.include <bsd.files.mk> .include <bsd.prog.mk>
.include <bsd.subdir.mk> .include <bsd.subdir.mk>

4
gnu/usr.sbin/sendmail/cf/Makefile
View File

@ -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 # install these sources in /usr/share/sendmail
.include <bsd.own.mk> .include <bsd.own.mk>
@ -15,5 +15,5 @@ SUBDIR= domain feature hack m4 mailer ostype sh siteconfig
all: all:
.include <bsd.files.mk> .include <bsd.prog.mk>
.include <bsd.subdir.mk> .include <bsd.subdir.mk>

3
gnu/usr.sbin/sendmail/cf/cf/Makefile
View File

@ -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 # install these sources in /usr/share/sendmail/cf
DIST= ${.CURDIR}/../../../../dist DIST= ${.CURDIR}/../../../../dist
@ -122,4 +122,3 @@ M4FILES= ${CFDIR}/domain/Berkeley.EDU.m4 \
${ALL}: ${M4FILES} ${ALL}: ${M4FILES}
.include <bsd.prog.mk> .include <bsd.prog.mk>
.include <bsd.files.mk>

5
gnu/usr.sbin/sendmail/cf/domain/Makefile
View File

@ -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 # install these sources in /usr/share/sendmail/domain
DIST= ${.CURDIR}/../../../../dist DIST= ${.CURDIR}/../../../../dist
@ -11,5 +11,4 @@ FILES= Berkeley.EDU.m4 CS.Berkeley.EDU.m4 EECS.Berkeley.EDU.m4 \
all: all:
.include <bsd.own.mk> .include <bsd.prog.mk>
.include <bsd.files.mk>

5
gnu/usr.sbin/sendmail/cf/feature/Makefile
View File

@ -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 # install these sources in /usr/share/sendmail/feature
DIST= ${.CURDIR}/../../../../dist DIST= ${.CURDIR}/../../../../dist
@ -22,5 +22,4 @@ FILES= accept_unqualified_senders.m4 accept_unresolvable_domains.m4 \
all: all:
.include <bsd.own.mk> .include <bsd.prog.mk>
.include <bsd.files.mk>

5
gnu/usr.sbin/sendmail/cf/hack/Makefile
View File

@ -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 # install these sources in /usr/share/sendmail/hack
DIST= ${.CURDIR}/../../../../dist DIST= ${.CURDIR}/../../../../dist
@ -9,5 +9,4 @@ FILES= cssubdomain.m4
all: all:
.include <bsd.own.mk> .include <bsd.prog.mk>
.include <bsd.files.mk>

5
gnu/usr.sbin/sendmail/cf/m4/Makefile
View File

@ -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 # install these sources in /usr/share/sendmail/m4
DIST= ${.CURDIR}/../../../../dist DIST= ${.CURDIR}/../../../../dist
@ -9,5 +9,4 @@ FILES= cf.m4 cfhead.m4 proto.m4 version.m4
all: all:
.include <bsd.own.mk> .include <bsd.prog.mk>
.include <bsd.files.mk>

5
gnu/usr.sbin/sendmail/cf/mailer/Makefile
View File

@ -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 # install these sources in /usr/share/sendmail/mailer
DIST= ${.CURDIR}/../../../../dist DIST= ${.CURDIR}/../../../../dist
@ -10,5 +10,4 @@ FILES= cyrus.m4 fax.m4 local.m4 mail11.m4 phquery.m4 pop.m4 \
all: all:
.include <bsd.own.mk> .include <bsd.prog.mk>
.include <bsd.files.mk>

5
gnu/usr.sbin/sendmail/cf/ostype/Makefile
View File

@ -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 # install these sources in /usr/share/sendmail/ostype
DIST= ${.CURDIR}/../../../../dist DIST= ${.CURDIR}/../../../../dist
@ -19,5 +19,4 @@ FILES= aix2.m4 aix3.m4 aix4.m4 aix5.m4 altos.m4 amdahl-uts.m4 \
all: all:
.include <bsd.own.mk> .include <bsd.prog.mk>
.include <bsd.files.mk>

5
gnu/usr.sbin/sendmail/cf/sh/Makefile
View File

@ -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 # install these sources in /usr/share/sendmail/sh
DIST= ${.CURDIR}/../../../../dist DIST= ${.CURDIR}/../../../../dist
@ -9,5 +9,4 @@ FILES= makeinfo.sh
all: all:
.include <bsd.own.mk> .include <bsd.prog.mk>
.include <bsd.files.mk>

5
gnu/usr.sbin/sendmail/cf/siteconfig/Makefile
View File

@ -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 # install these sources in /usr/share/sendmail/siteconfig
DIST= ${.CURDIR}/../../../../dist DIST= ${.CURDIR}/../../../../dist
@ -9,5 +9,4 @@ FILES= uucp.cogsci.m4 uucp.old.arpa.m4 uucp.ucbarpa.m4 uucp.ucbvax.m4
all: all:
.include <bsd.own.mk> .include <bsd.prog.mk>
.include <bsd.files.mk>

8
lib/libkrb5/Makefile
View File

@ -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 NOLINT= # defined
@ -268,12 +268,10 @@ INFOFLAGS= -I${DIST}/heimdal/doc
fi fi
.endif .endif
.include <bsd.lib.mk>
.include <bsd.info.mk>
.if ${MKSHARE} != "no" .if ${MKSHARE} != "no"
FILES= ${DIST}/heimdal/krb5.conf FILES= ${DIST}/heimdal/krb5.conf
FILESDIR= /usr/share/examples/kerberos FILESDIR= /usr/share/examples/kerberos
.endif .endif
.include <bsd.files.mk> .include <bsd.lib.mk>
.include <bsd.info.mk>

4
libexec/ld.aout_so/Makefile
View File

@ -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> .include <bsd.own.mk>
.if (${OBJECT_FMT} == "a.out") .if (${OBJECT_FMT} == "a.out")
@ -46,8 +46,6 @@ UUDECODE?= uudecode
ld.so: ${.CURDIR}/ld.so.${MACHINE_ARCH}.uue ld.so: ${.CURDIR}/ld.so.${MACHINE_ARCH}.uue
${UUDECODE} ${.ALLSRC} ${UUDECODE} ${.ALLSRC}
.include <bsd.files.mk>
.endif .endif
MAN= ld.aout_so.1 MAN= ld.aout_so.1

3
sbin/mount_portal/examples/Makefile
View File

@ -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> .include <bsd.own.mk>
@ -17,4 +17,3 @@ SCRIPTS= sysctlfs.sh.sh cvs.sh.sh
.endif .endif
.include <bsd.prog.mk> .include <bsd.prog.mk>
.include <bsd.files.mk>

7
share/mk/bsd.files.mk
View File

@ -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) .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 ##### Basic targets
.PHONY: filesinstall .PHONY: filesinstall
realinstall: filesinstall realinstall: filesinstall
@ -50,5 +47,3 @@ filesinstall:: ${_F}
.undef _FDIR .undef _FDIR
.undef _FNAME .undef _FNAME
.undef _F .undef _F
FILES:= # reset to empty

4
sys/arch/atari/stand/keymaps/Makefile.inc
View File

@ -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} realall: ${MAP}
@ -9,4 +9,4 @@ CLEANFILES+=${MAP}
FILES=${MAP} FILES=${MAP}
FILESDIR=/usr/share/keymaps/atari FILESDIR=/usr/share/keymaps/atari
.include <bsd.files.mk> .include <bsd.prog.mk>

8
sys/arch/vax/stand/pcs/Makefile
View File

@ -1,4 +1,6 @@
# $NetBSD: Makefile,v 1.1 2002/04/09 18:03:07 matt Exp $ # $NetBSD: Makefile,v 1.2 2002/04/24 08:18:53 lukem Exp $
NOMAN=
.include <bsd.own.mk> .include <bsd.own.mk>
@ -14,8 +16,4 @@ UUDECODE?= uudecode
pcs750.bin: ${.CURDIR}/pcs750.bin.uue pcs750.bin: ${.CURDIR}/pcs750.bin.uue
${UUDECODE} ${.ALLSRC} ${UUDECODE} ${.ALLSRC}
.include <bsd.files.mk>
NOMAN=
.include <bsd.prog.mk> .include <bsd.prog.mk>

8
usr.bin/openssl/Makefile
View File

@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.12 2001/12/12 12:24:29 lukem Exp $ # $NetBSD: Makefile,v 1.13 2002/04/24 08:18:54 lukem Exp $
NOMAN= # defined NOMAN= # defined
.include <bsd.own.mk> .include <bsd.own.mk>
# RCSid: # RCSid:
# $Id: Makefile,v 1.12 2001/12/12 12:24:29 lukem Exp $ # $Id: Makefile,v 1.13 2002/04/24 08:18:54 lukem Exp $
# #
# @(#) Copyright (c) 1995 Simon J. Gerraty # @(#) Copyright (c) 1995 Simon J. Gerraty
# #
@ -123,11 +123,9 @@ CRYPTODIST= ${.CURDIR}/../../crypto/dist
ssleay.o: ssleay.c ssleay.o: ssleay.c
${CC} ${CFLAGS} -UMONOLITH -o ${.TARGET} -c ${.IMPSRC} ${CC} ${CFLAGS} -UMONOLITH -o ${.TARGET} -c ${.IMPSRC}
.include <bsd.prog.mk>
.if ${MKSHARE} != "no" .if ${MKSHARE} != "no"
FILES= CA.sh CA.pl der_chop openssl.cnf FILES= CA.sh CA.pl der_chop openssl.cnf
FILESDIR=/usr/share/examples/openssl FILESDIR=/usr/share/examples/openssl
.endif .endif
.include <bsd.files.mk> .include <bsd.prog.mk>

3
usr.sbin/dhcp/server/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.12 2001/08/16 18:29:20 tv Exp $ # $NetBSD: Makefile,v 1.13 2002/04/24 08:18:54 lukem Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -16,4 +16,3 @@ FILES= dhcpd.conf
.endif .endif
.include <bsd.prog.mk> .include <bsd.prog.mk>
.include <bsd.files.mk>

5
usr.sbin/ipf/rules/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2002/01/26 09:30:53 martti Exp $ # $NetBSD: Makefile,v 1.10 2002/04/24 08:18:54 lukem Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -14,5 +14,4 @@ FILES= BASIC.NAT BASIC_1.FW BASIC_2.FW example.1 example.2 example.3 \
.endif .endif
.PATH: ${.CURDIR}/../../../dist/ipf/rules .PATH: ${.CURDIR}/../../../dist/ipf/rules
.include <bsd.man.mk> .include <bsd.prog.mk>
.include <bsd.files.mk>