summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter <peter@NetBSD.org>2006-10-08 17:52:28 +0000
committerpeter <peter@NetBSD.org>2006-10-08 17:52:28 +0000
commite263dfd62f94e84e0175a4734669bb46df0461f9 (patch)
treedc74c01f096d91b7386e3104a218bcf4199a137d
parent83704dec18a9004c71f0c48c48be778d7c6bbb53 (diff)
WFORMAT is no more...
-rw-r--r--lib/Makefile.inc3
-rw-r--r--libexec/Makefile.inc3
-rw-r--r--sbin/Makefile.inc3
-rw-r--r--usr.bin/Makefile.inc3
-rw-r--r--usr.bin/error/Makefile4
-rw-r--r--usr.bin/file/Makefile3
-rw-r--r--usr.bin/hexdump/Makefile3
-rw-r--r--usr.bin/id/Makefile3
-rw-r--r--usr.bin/indent/Makefile4
-rw-r--r--usr.bin/jot/Makefile3
-rw-r--r--usr.bin/kdump/Makefile3
-rw-r--r--usr.bin/ktruss/Makefile3
-rw-r--r--usr.bin/lam/Makefile4
-rw-r--r--usr.bin/less/less/Makefile3
-rw-r--r--usr.bin/lex/Makefile3
-rw-r--r--usr.bin/make/Makefile3
-rw-r--r--usr.bin/man/Makefile3
-rw-r--r--usr.bin/nl/Makefile4
-rw-r--r--usr.bin/spell/Makefile.inc3
-rw-r--r--usr.bin/xlint/lint1/Makefile3
-rw-r--r--usr.bin/xlint/lint2/Makefile3
-rw-r--r--usr.sbin/amd/Makefile.inc3
-rw-r--r--usr.sbin/bind/Makefile.inc3
23 files changed, 27 insertions, 46 deletions
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 9fd9964d242..2f7e3da1ace 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -1,4 +1,3 @@
-# $NetBSD: Makefile.inc,v 1.5 2004/08/04 08:04:25 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.6 2006/10/08 17:52:28 peter Exp $
WARNS?= 2
-WFORMAT?= 2
diff --git a/libexec/Makefile.inc b/libexec/Makefile.inc
index 4f659fa16da..2db0bdb010e 100644
--- a/libexec/Makefile.inc
+++ b/libexec/Makefile.inc
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.5 2000/10/10 19:54:37 is Exp $
+# $NetBSD: Makefile.inc,v 1.6 2006/10/08 17:52:28 peter Exp $
# @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
BINDIR?= /usr/libexec
WARNS?= 1
-WFORMAT?= 2
diff --git a/sbin/Makefile.inc b/sbin/Makefile.inc
index 26af3f78417..41c7f26ac8c 100644
--- a/sbin/Makefile.inc
+++ b/sbin/Makefile.inc
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.19 2005/06/27 01:00:04 christos Exp $
+# $NetBSD: Makefile.inc,v 1.20 2006/10/08 17:52:28 peter Exp $
# @(#)Makefile.inc 8.1 (Berkeley) 6/8/93
.include <bsd.own.mk> # for MKDYNAMICROOT definition
WARNS?= 3
BINDIR?= /sbin
-WFORMAT?= 2
.if (${MKDYNAMICROOT} == "no")
LDSTATIC?= -static
diff --git a/usr.bin/Makefile.inc b/usr.bin/Makefile.inc
index 32db4b0879d..31f10b66ab2 100644
--- a/usr.bin/Makefile.inc
+++ b/usr.bin/Makefile.inc
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.7 2000/12/30 14:44:49 sommerfeld Exp $
+# $NetBSD: Makefile.inc,v 1.8 2006/10/08 17:52:29 peter Exp $
# from: @(#)Makefile.inc 8.1 (Berkeley) 6/6/93
WARNS?= 1
-WFORMAT?= 2
BINDIR?=/usr/bin
diff --git a/usr.bin/error/Makefile b/usr.bin/error/Makefile
index e911df1ae40..c19d2661b94 100644
--- a/usr.bin/error/Makefile
+++ b/usr.bin/error/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $NetBSD: Makefile,v 1.4 2000/10/11 14:46:02 is Exp $
+# $NetBSD: Makefile,v 1.5 2006/10/08 17:52:28 peter Exp $
PROG= error
SRCS= main.c input.c pi.c subr.c filter.c touch.c
-WFORMAT=1
+
.include <bsd.prog.mk>
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index 2fc857522ab..88865e49f23 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.51 2006/09/29 20:20:47 apb Exp $
+# $NetBSD: Makefile,v 1.52 2006/10/08 17:52:28 peter Exp $
.include <bsd.own.mk>
DIST= ${NETBSDSRCDIR}/dist/file
.PATH: ${DIST}/src ${DIST}/doc
-WFORMAT= 1
MFILESDIR= /usr/share/misc
MFILES= magic magic.mgc ${DIST}/magic/magic.mime magic.mime.mgc
MAGIC= ${MFILESDIR}/magic
diff --git a/usr.bin/hexdump/Makefile b/usr.bin/hexdump/Makefile
index b9fec9d7336..847e35a9d43 100644
--- a/usr.bin/hexdump/Makefile
+++ b/usr.bin/hexdump/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2006/08/29 17:00:28 christos Exp $
+# $NetBSD: Makefile,v 1.12 2006/10/08 17:52:28 peter Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= hexdump
SRCS= conv.c display.c hexdump.c hexsyntax.c odsyntax.c parse.c
MAN= hexdump.1 od.1
-WFORMAT= 1
WARNS= 2
.ifndef HOSTPROG
diff --git a/usr.bin/id/Makefile b/usr.bin/id/Makefile
index 8919d2d979e..9b3b017fa00 100644
--- a/usr.bin/id/Makefile
+++ b/usr.bin/id/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2004/11/22 17:32:08 peter Exp $
+# $NetBSD: Makefile,v 1.11 2006/10/08 17:52:28 peter Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= id
MAN= id.1 groups.1 whoami.1
LINKS= ${BINDIR}/id ${BINDIR}/groups
LINKS+= ${BINDIR}/id ${BINDIR}/whoami
-WFORMAT=1
WARNS= 3
.include <bsd.prog.mk>
diff --git a/usr.bin/indent/Makefile b/usr.bin/indent/Makefile
index ac5bb577112..0cc9f57de9e 100644
--- a/usr.bin/indent/Makefile
+++ b/usr.bin/indent/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2000/10/11 14:46:04 is Exp $
+# $NetBSD: Makefile,v 1.6 2006/10/08 17:52:28 peter Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= indent
SRCS= indent.c io.c lexi.c parse.c pr_comment.c args.c
-WFORMAT=1
+
.include <bsd.prog.mk>
diff --git a/usr.bin/jot/Makefile b/usr.bin/jot/Makefile
index 09e7ef710a4..aad626cf02d 100644
--- a/usr.bin/jot/Makefile
+++ b/usr.bin/jot/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2006/01/07 07:09:01 garbled Exp $
+# $NetBSD: Makefile,v 1.5 2006/10/08 17:52:28 peter Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= jot
-WFORMAT=1
DPADD= ${LIBMATH}
LDADD= -lm
diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
index 6f6b0a583be..cfe3bd3a80a 100644
--- a/usr.bin/kdump/Makefile
+++ b/usr.bin/kdump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/16 22:00:01 christos Exp $
+# $NetBSD: Makefile,v 1.27 2006/10/08 17:52:28 peter Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk> # for MKDYNAMICROOT & NETBSDSRCDIR
@@ -8,7 +8,6 @@ CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/ktrace -I${NETBSDSRCDIR}/sys
SRCS= kdump.c subr.c setemul.c siginfo.c
.PATH: ${NETBSDSRCDIR}/usr.bin/ktrace
CLEANFILES+=siginfo.c
-WFORMAT=1
WARNS=3
.if (${MKDYNAMICROOT} == "no")
diff --git a/usr.bin/ktruss/Makefile b/usr.bin/ktruss/Makefile
index 401041013dd..f904912a36f 100644
--- a/usr.bin/ktruss/Makefile
+++ b/usr.bin/ktruss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/07/17 15:48:28 he Exp $
+# $NetBSD: Makefile,v 1.21 2006/10/08 17:52:29 peter Exp $
NOMAN= # defined
@@ -9,7 +9,6 @@ SRCS= ktrace.c dump.c subr.c misc.c setemul.c
CPPFLAGS+= -I. -I${NETBSDSRCDIR}/usr.bin/ktrace -I${NETBSDSRCDIR}/sys \
-I${NETBSDSRCDIR}/usr.bin/kdump -DKTRUSS
CLEANFILES+= misc.c misc.h
-WFORMAT=1
WARNS=3
.if (${MKDYNAMICROOT} == "no")
diff --git a/usr.bin/lam/Makefile b/usr.bin/lam/Makefile
index e51b6790c86..542be2305be 100644
--- a/usr.bin/lam/Makefile
+++ b/usr.bin/lam/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2000/10/11 14:46:05 is Exp $
+# $NetBSD: Makefile,v 1.4 2006/10/08 17:52:29 peter Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= lam
-WFORMAT=1
+
.include <bsd.prog.mk>
diff --git a/usr.bin/less/less/Makefile b/usr.bin/less/less/Makefile
index b0db13b5165..8b37fbbc46d 100644
--- a/usr.bin/less/less/Makefile
+++ b/usr.bin/less/less/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/03/05 12:28:31 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2006/10/08 17:52:29 peter Exp $
# from: @(#)Makefile 5.6 (Berkeley) 3/12/91
PROG= less
@@ -12,6 +12,5 @@ LDADD+= -ltermcap
DPADD+= ${LIBTERM}
MLINKS= less.1 more.1 less.1 page.1
LINKS= ${BINDIR}/less ${BINDIR}/more ${BINDIR}/less ${BINDIR}/page
-WFORMAT=1
.include <bsd.prog.mk>
diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile
index 184ec6db1bd..e6997dcc29d 100644
--- a/usr.bin/lex/Makefile
+++ b/usr.bin/lex/Makefile
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.4 (Berkeley) 6/24/90
-# $NetBSD: Makefile,v 1.27 2003/10/21 10:01:22 lukem Exp $
+# $NetBSD: Makefile,v 1.28 2006/10/08 17:52:29 peter 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
@@ -18,7 +18,6 @@ SRCS= ccl.c dfa.c ecs.c gen.c main.c misc.c nfa.c parse.y sym.c tblcmp.c \
yylex.c scan.c skel.c
YHEADER=1
CLEANFILES+=scan.c skel.c
-WFORMAT= 1
INCS =FlexLexer.h
INCSDIR=/usr/include/g++
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index 442c3d91010..a917744d410 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/08/29 16:54:03 christos Exp $
+# $NetBSD: Makefile,v 1.39 2006/10/08 17:52:29 peter Exp $
# @(#)Makefile 5.2 (Berkeley) 12/28/90
PROG= make
@@ -11,7 +11,6 @@ SRCS+= lstAppend.c lstAtEnd.c lstAtFront.c lstClose.c lstConcat.c \
lstMember.c lstNext.c lstOpen.c lstRemove.c lstReplace.c lstSucc.c
.PATH: ${.CURDIR}/lst.lib
WARNS=3
-WFORMAT= 1
.if make(install)
SUBDIR= PSD.doc
.endif
diff --git a/usr.bin/man/Makefile b/usr.bin/man/Makefile
index 0f82cafad39..1d879acf192 100644
--- a/usr.bin/man/Makefile
+++ b/usr.bin/man/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/09/13 15:56:38 thorpej Exp $
+# $NetBSD: Makefile,v 1.9 2006/10/08 17:52:29 peter Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= man
SRCS= man.c manconf.c
MAN= man.1 man.conf.5
-WFORMAT=1
.include <bsd.prog.mk>
diff --git a/usr.bin/nl/Makefile b/usr.bin/nl/Makefile
index 218bbb54234..4944bf5e03d 100644
--- a/usr.bin/nl/Makefile
+++ b/usr.bin/nl/Makefile
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.2 2000/10/11 14:46:15 is Exp $
+# $NetBSD: Makefile,v 1.3 2006/10/08 17:52:29 peter Exp $
PROG= nl
-WFORMAT= 1
+
.include <bsd.prog.mk>
diff --git a/usr.bin/spell/Makefile.inc b/usr.bin/spell/Makefile.inc
index 600e5270a86..7d392be68e5 100644
--- a/usr.bin/spell/Makefile.inc
+++ b/usr.bin/spell/Makefile.inc
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.1 2005/06/29 21:06:12 perry Exp $
+# $NetBSD: Makefile.inc,v 1.2 2006/10/08 17:52:29 peter Exp $
WARNS?= 0
-WFORMAT?= 2
BINDIR?=/usr/bin
#.include "../Makefile.inc"
diff --git a/usr.bin/xlint/lint1/Makefile b/usr.bin/xlint/lint1/Makefile
index 3f27168261c..facea528ae1 100644
--- a/usr.bin/xlint/lint1/Makefile
+++ b/usr.bin/xlint/lint1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/04/07 16:28:40 christos Exp $
+# $NetBSD: Makefile,v 1.36 2006/10/08 17:52:29 peter Exp $
.include <bsd.own.mk>
@@ -23,7 +23,6 @@ CPPFLAGS+= -DTARGET_OBJFMT_ELF
.endif
LINTFLAGS= -aehpz
-WFORMAT=1 #hopeless
BINDIR= /usr/libexec
CLEANFILES+= ${MAN}
diff --git a/usr.bin/xlint/lint2/Makefile b/usr.bin/xlint/lint2/Makefile
index f7f4e3fc091..ef9770db479 100644
--- a/usr.bin/xlint/lint2/Makefile
+++ b/usr.bin/xlint/lint2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/07 16:28:40 christos Exp $
+# $NetBSD: Makefile,v 1.17 2006/10/08 17:52:29 peter Exp $
NOMAN= # defined
@@ -6,7 +6,6 @@ PROG= lint2
SRCS= main2.c hash.c read.c mem.c mem2.c chk.c msg.c emit.c emit2.c \
inittyp.c tyname.c
LINTFLAGS= -abehrz
-WFORMAT=1 # hopeless
BINDIR= /usr/libexec
CPPFLAGS+= -DPASS=\"${PROG}.h\" -I${.CURDIR}
diff --git a/usr.sbin/amd/Makefile.inc b/usr.sbin/amd/Makefile.inc
index 2ff93b6c9ca..a79949183ae 100644
--- a/usr.sbin/amd/Makefile.inc
+++ b/usr.sbin/amd/Makefile.inc
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.19 2003/04/11 22:47:32 thorpej Exp $
+# $NetBSD: Makefile.inc,v 1.20 2006/10/08 17:52:29 peter Exp $
WARNS?= 1
-WFORMAT=2
.include <bsd.own.mk>
diff --git a/usr.sbin/bind/Makefile.inc b/usr.sbin/bind/Makefile.inc
index 7e09b1e36fd..20f8fe75e7c 100644
--- a/usr.sbin/bind/Makefile.inc
+++ b/usr.sbin/bind/Makefile.inc
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.24 2006/08/28 15:37:05 jdc Exp $
+# $NetBSD: Makefile.inc,v 1.25 2006/10/08 17:52:29 peter Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
WARNS?= 1
-WFORMAT?=2
.include <bsd.own.mk>