Always assign WARNS using ?=

- fix some nearby style bugs
- include Makefile.inc where it makes sense and reduces duplication

Approved by:	ed (co-mentor)

12 files changed, 13 insertions, 15 deletions

diff --git a/tools/regression/kqueue/Makefile b/tools/regression/kqueue/Makefile
index b25a17b..4537249 100644
--- a/tools/regression/kqueue/Makefile
+++ b/tools/regression/kqueue/Makefile
@@ -16,6 +16,6 @@ SRCS=			\
 	signal.c	\
 	user.c
 NO_MAN=
-WARNS=2
+WARNS?=	2
 
 .include "bsd.prog.mk"
diff --git a/tools/regression/priv/Makefile b/tools/regression/priv/Makefile
index 814f5c3..663d68d 100644
--- a/tools/regression/priv/Makefile
+++ b/tools/regression/priv/Makefile
@@ -46,7 +46,7 @@ SRCS=	main.c				\
 	priv_vm_munlock.c
 
 NO_MAN=
-WARNS=	3
+WARNS?=	3
 
 DPADD+= ${LIBIPSEC}
 LDADD+= -lipsec
diff --git a/tools/regression/sockets/unix_gc/Makefile b/tools/regression/sockets/unix_gc/Makefile
index 1e2fd56..d791494 100644
--- a/tools/regression/sockets/unix_gc/Makefile
+++ b/tools/regression/sockets/unix_gc/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	unix_gc
-WARNS=	3
 NO_MAN=
+WARNS?=	3
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_sorflush/Makefile b/tools/regression/sockets/unix_sorflush/Makefile
index 7f0b9f1..96e48cf 100644
--- a/tools/regression/sockets/unix_sorflush/Makefile
+++ b/tools/regression/sockets/unix_sorflush/Makefile
@@ -2,6 +2,6 @@
 
 PROG=	unix_sorflush
 NO_MAN=
-WARNS=	3
+WARNS?=	3
 
 .include <bsd.prog.mk>
diff --git a/tools/regression/tmpfs/Makefile b/tools/regression/tmpfs/Makefile
index 91e1392..f96ba18 100644
--- a/tools/regression/tmpfs/Makefile
+++ b/tools/regression/tmpfs/Makefile
@@ -31,7 +31,7 @@ regress: ${tests}
 
 PROG=	h_tools
 NO_MAN=	# defined
-WARNS=	4
+WARNS?=	4
 
 t_sizes t_sockets t_statvfs: h_tools
 
diff --git a/tools/tools/netrate/http/Makefile b/tools/tools/netrate/http/Makefile
index 789e7d0..fb8960b 100644
--- a/tools/tools/netrate/http/Makefile
+++ b/tools/tools/netrate/http/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PROG=	http
-WARNS=	3
 NO_MAN=
+WARNS?=	3
 DPADD=	${LIBPTHREAD}
 LDADD=	-lpthread
 
diff --git a/tools/tools/netrate/httpd/Makefile b/tools/tools/netrate/httpd/Makefile
index 74067f2..b66ad19 100644
--- a/tools/tools/netrate/httpd/Makefile
+++ b/tools/tools/netrate/httpd/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PROG=	httpd
-WARNS=	3
 NO_MAN=
+WARNS?=	3
 DPADD=	${LIBPTHREAD}
 LDADD=	-lpthread
 
diff --git a/tools/tools/netrate/juggle/Makefile b/tools/tools/netrate/juggle/Makefile
index 67d6263..cd64a07 100644
--- a/tools/tools/netrate/juggle/Makefile
+++ b/tools/tools/netrate/juggle/Makefile
@@ -2,9 +2,8 @@
 
 PROG=	juggle
 NO_MAN=
-WARNS=	3
-
-LDADD=	-lpthread
+WARNS?=	3
 DPADD=	${LIBPTHREAD}
+LDADD=	-lpthread
 
 .include <bsd.prog.mk>
diff --git a/tools/tools/netrate/tcpconnect/Makefile b/tools/tools/netrate/tcpconnect/Makefile
index 4a3f5ad..624c94a 100644
--- a/tools/tools/netrate/tcpconnect/Makefile
+++ b/tools/tools/netrate/tcpconnect/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	tcpconnect
-WARNS=	3
 NO_MAN=
+WARNS?=	3
 
 .include <bsd.prog.mk>
diff --git a/tools/tools/netrate/tcpp/Makefile b/tools/tools/netrate/tcpp/Makefile
index 31f8fc2..a0b2715 100644
--- a/tools/tools/netrate/tcpp/Makefile
+++ b/tools/tools/netrate/tcpp/Makefile
@@ -4,6 +4,6 @@ PROG=	tcpp
 INCS=	tcpp.h
 NO_MAN=	
 SRCS=	tcpp.c tcpp_client.c tcpp_server.c tcpp_util.c
-WARNS=	3
+WARNS?=	3
 
 .include <bsd.prog.mk>
diff --git a/tools/tools/netrate/tcpreceive/Makefile b/tools/tools/netrate/tcpreceive/Makefile
index 06d58ce..f04ea5f 100644
--- a/tools/tools/netrate/tcpreceive/Makefile
+++ b/tools/tools/netrate/tcpreceive/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	tcpreceive
-WARNS=	3
 NO_MAN=
+WARNS?=	3
 
 .include <bsd.prog.mk>
diff --git a/tools/tools/umastat/Makefile b/tools/tools/umastat/Makefile
index 9461173..2335673 100644
--- a/tools/tools/umastat/Makefile
+++ b/tools/tools/umastat/Makefile
@@ -2,10 +2,9 @@
 
 PROG=	umastat
 NO_MAN=
+WARNS?=	3
 
 DPADD=	${LIBKVM}
 LDADD=	-lkvm
 
-WARNS=	3
-
 .include <bsd.prog.mk>