diff --git a/etc/defaults/Makefile b/etc/defaults/Makefile index ef4344234c08..240530d37124 100644 --- a/etc/defaults/Makefile +++ b/etc/defaults/Makefile @@ -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 diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile index c8f868bf15c7..ce475d51886d 100644 --- a/etc/mtree/Makefile +++ b/etc/mtree/Makefile @@ -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 diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 2a6be49a8853..d10aaf4f0a83 100755 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -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 diff --git a/gnu/usr.bin/texinfo/Makefile b/gnu/usr.bin/texinfo/Makefile index 1824c51e2af6..de770c10bd99 100644 --- a/gnu/usr.bin/texinfo/Makefile +++ b/gnu/usr.bin/texinfo/Makefile @@ -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 @@ -29,7 +29,6 @@ INFOFLAGS= -I${DIST}/texinfo/doc .PATH: ${DIST}/texinfo ${DIST}/texinfo/doc ${DIST}/texinfo/po -.include .include -.include +.include .include diff --git a/gnu/usr.sbin/sendmail/cf/Makefile b/gnu/usr.sbin/sendmail/cf/Makefile index c02ce14440c7..af48e4049480 100644 --- a/gnu/usr.sbin/sendmail/cf/Makefile +++ b/gnu/usr.sbin/sendmail/cf/Makefile @@ -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 @@ -15,5 +15,5 @@ SUBDIR= domain feature hack m4 mailer ostype sh siteconfig all: -.include +.include .include diff --git a/gnu/usr.sbin/sendmail/cf/cf/Makefile b/gnu/usr.sbin/sendmail/cf/cf/Makefile index 92a150c0455e..49184386d3a6 100644 --- a/gnu/usr.sbin/sendmail/cf/cf/Makefile +++ b/gnu/usr.sbin/sendmail/cf/cf/Makefile @@ -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 @@ M4FILES= ${CFDIR}/domain/Berkeley.EDU.m4 \ ${ALL}: ${M4FILES} .include -.include diff --git a/gnu/usr.sbin/sendmail/cf/domain/Makefile b/gnu/usr.sbin/sendmail/cf/domain/Makefile index 3cfb92f7b56f..a0297fc35a2a 100644 --- a/gnu/usr.sbin/sendmail/cf/domain/Makefile +++ b/gnu/usr.sbin/sendmail/cf/domain/Makefile @@ -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 @@ FILES= Berkeley.EDU.m4 CS.Berkeley.EDU.m4 EECS.Berkeley.EDU.m4 \ all: -.include -.include +.include diff --git a/gnu/usr.sbin/sendmail/cf/feature/Makefile b/gnu/usr.sbin/sendmail/cf/feature/Makefile index ac8ef6fa4d93..392dea7687f5 100644 --- a/gnu/usr.sbin/sendmail/cf/feature/Makefile +++ b/gnu/usr.sbin/sendmail/cf/feature/Makefile @@ -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 @@ FILES= accept_unqualified_senders.m4 accept_unresolvable_domains.m4 \ all: -.include -.include +.include diff --git a/gnu/usr.sbin/sendmail/cf/hack/Makefile b/gnu/usr.sbin/sendmail/cf/hack/Makefile index ef143d2413d2..c68c8cff8fae 100644 --- a/gnu/usr.sbin/sendmail/cf/hack/Makefile +++ b/gnu/usr.sbin/sendmail/cf/hack/Makefile @@ -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 @@ FILES= cssubdomain.m4 all: -.include -.include +.include diff --git a/gnu/usr.sbin/sendmail/cf/m4/Makefile b/gnu/usr.sbin/sendmail/cf/m4/Makefile index d8b44f39c5ea..595b763f514a 100644 --- a/gnu/usr.sbin/sendmail/cf/m4/Makefile +++ b/gnu/usr.sbin/sendmail/cf/m4/Makefile @@ -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 @@ FILES= cf.m4 cfhead.m4 proto.m4 version.m4 all: -.include -.include +.include diff --git a/gnu/usr.sbin/sendmail/cf/mailer/Makefile b/gnu/usr.sbin/sendmail/cf/mailer/Makefile index 6bb1c86feec3..54ddd5548242 100644 --- a/gnu/usr.sbin/sendmail/cf/mailer/Makefile +++ b/gnu/usr.sbin/sendmail/cf/mailer/Makefile @@ -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 @@ FILES= cyrus.m4 fax.m4 local.m4 mail11.m4 phquery.m4 pop.m4 \ all: -.include -.include +.include diff --git a/gnu/usr.sbin/sendmail/cf/ostype/Makefile b/gnu/usr.sbin/sendmail/cf/ostype/Makefile index 119229c92851..3a828b2182c9 100644 --- a/gnu/usr.sbin/sendmail/cf/ostype/Makefile +++ b/gnu/usr.sbin/sendmail/cf/ostype/Makefile @@ -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 @@ FILES= aix2.m4 aix3.m4 aix4.m4 aix5.m4 altos.m4 amdahl-uts.m4 \ all: -.include -.include +.include diff --git a/gnu/usr.sbin/sendmail/cf/sh/Makefile b/gnu/usr.sbin/sendmail/cf/sh/Makefile index 617cb6929214..4e3c5340285a 100644 --- a/gnu/usr.sbin/sendmail/cf/sh/Makefile +++ b/gnu/usr.sbin/sendmail/cf/sh/Makefile @@ -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 @@ FILES= makeinfo.sh all: -.include -.include +.include diff --git a/gnu/usr.sbin/sendmail/cf/siteconfig/Makefile b/gnu/usr.sbin/sendmail/cf/siteconfig/Makefile index 2528ff5fe1f2..7dba82ad65b4 100644 --- a/gnu/usr.sbin/sendmail/cf/siteconfig/Makefile +++ b/gnu/usr.sbin/sendmail/cf/siteconfig/Makefile @@ -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 @@ FILES= uucp.cogsci.m4 uucp.old.arpa.m4 uucp.ucbarpa.m4 uucp.ucbvax.m4 all: -.include -.include +.include diff --git a/lib/libkrb5/Makefile b/lib/libkrb5/Makefile index 3da14c3c9a9a..79575b0116cf 100644 --- a/lib/libkrb5/Makefile +++ b/lib/libkrb5/Makefile @@ -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 @@ INFOFLAGS= -I${DIST}/heimdal/doc fi .endif -.include -.include - .if ${MKSHARE} != "no" FILES= ${DIST}/heimdal/krb5.conf FILESDIR= /usr/share/examples/kerberos .endif -.include +.include +.include diff --git a/libexec/ld.aout_so/Makefile b/libexec/ld.aout_so/Makefile index fb56d7d13c54..e93bd1fea7e4 100644 --- a/libexec/ld.aout_so/Makefile +++ b/libexec/ld.aout_so/Makefile @@ -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 .if (${OBJECT_FMT} == "a.out") @@ -46,8 +46,6 @@ UUDECODE?= uudecode ld.so: ${.CURDIR}/ld.so.${MACHINE_ARCH}.uue ${UUDECODE} ${.ALLSRC} -.include - .endif MAN= ld.aout_so.1 diff --git a/sbin/mount_portal/examples/Makefile b/sbin/mount_portal/examples/Makefile index 69fe859fbd5b..d7a67852adc2 100644 --- a/sbin/mount_portal/examples/Makefile +++ b/sbin/mount_portal/examples/Makefile @@ -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 @@ -17,4 +17,3 @@ SCRIPTS= sysctlfs.sh.sh cvs.sh.sh .endif .include -.include diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk index 12801ec05d3d..ff046db516ce 100644 --- a/share/mk/bsd.files.mk +++ b/share/mk/bsd.files.mk @@ -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 @@ filesinstall:: ${_F} .undef _FDIR .undef _FNAME .undef _F - -FILES:= # reset to empty diff --git a/sys/arch/atari/stand/keymaps/Makefile.inc b/sys/arch/atari/stand/keymaps/Makefile.inc index ae44ac7c6043..13ecc4548f6b 100644 --- a/sys/arch/atari/stand/keymaps/Makefile.inc +++ b/sys/arch/atari/stand/keymaps/Makefile.inc @@ -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 @@ CLEANFILES+=${MAP} FILES=${MAP} FILESDIR=/usr/share/keymaps/atari -.include +.include diff --git a/sys/arch/vax/stand/pcs/Makefile b/sys/arch/vax/stand/pcs/Makefile index ab3fd4782006..bb6cfd75f49c 100644 --- a/sys/arch/vax/stand/pcs/Makefile +++ b/sys/arch/vax/stand/pcs/Makefile @@ -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 @@ -14,8 +16,4 @@ UUDECODE?= uudecode pcs750.bin: ${.CURDIR}/pcs750.bin.uue ${UUDECODE} ${.ALLSRC} -.include - -NOMAN= - .include diff --git a/usr.bin/openssl/Makefile b/usr.bin/openssl/Makefile index dfbd8d777f82..7ad63083532a 100644 --- a/usr.bin/openssl/Makefile +++ b/usr.bin/openssl/Makefile @@ -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 .include # 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 # @@ -123,11 +123,9 @@ CRYPTODIST= ${.CURDIR}/../../crypto/dist ssleay.o: ssleay.c ${CC} ${CFLAGS} -UMONOLITH -o ${.TARGET} -c ${.IMPSRC} -.include - .if ${MKSHARE} != "no" FILES= CA.sh CA.pl der_chop openssl.cnf FILESDIR=/usr/share/examples/openssl .endif -.include +.include diff --git a/usr.sbin/dhcp/server/Makefile b/usr.sbin/dhcp/server/Makefile index 16abcea47af6..3f9b681e08f8 100644 --- a/usr.sbin/dhcp/server/Makefile +++ b/usr.sbin/dhcp/server/Makefile @@ -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 @@ -16,4 +16,3 @@ FILES= dhcpd.conf .endif .include -.include diff --git a/usr.sbin/ipf/rules/Makefile b/usr.sbin/ipf/rules/Makefile index 83500958808a..878ddbe57f44 100644 --- a/usr.sbin/ipf/rules/Makefile +++ b/usr.sbin/ipf/rules/Makefile @@ -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 @@ -14,5 +14,4 @@ FILES= BASIC.NAT BASIC_1.FW BASIC_2.FW example.1 example.2 example.3 \ .endif .PATH: ${.CURDIR}/../../../dist/ipf/rules -.include -.include +.include