summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/libbsnmp/Makefile.inc4
-rw-r--r--lib/libbsnmp/libbsnmp/Makefile5
-rw-r--r--lib/libpam/modules/pam_krb5/Makefile2
-rw-r--r--sbin/ddb/Makefile2
-rw-r--r--sbin/ipf/ipftest/Makefile3
-rw-r--r--share/examples/autofs/driver/Makefile6
-rw-r--r--tools/regression/kqueue/Makefile2
-rw-r--r--tools/regression/priv/Makefile2
-rw-r--r--tools/regression/sockets/unix_gc/Makefile2
-rw-r--r--tools/regression/sockets/unix_sorflush/Makefile2
-rw-r--r--tools/regression/tmpfs/Makefile2
-rw-r--r--tools/tools/netrate/http/Makefile2
-rw-r--r--tools/tools/netrate/httpd/Makefile2
-rw-r--r--tools/tools/netrate/juggle/Makefile5
-rw-r--r--tools/tools/netrate/tcpconnect/Makefile2
-rw-r--r--tools/tools/netrate/tcpp/Makefile2
-rw-r--r--tools/tools/netrate/tcpreceive/Makefile2
-rw-r--r--tools/tools/umastat/Makefile3
-rw-r--r--usr.bin/locale/Makefile6
-rw-r--r--usr.sbin/fwcontrol/Makefile2
-rw-r--r--usr.sbin/uhsoctl/Makefile2
21 files changed, 28 insertions, 32 deletions
diff --git a/lib/libbsnmp/Makefile.inc b/lib/libbsnmp/Makefile.inc
index 566274c..82f48ac 100644
--- a/lib/libbsnmp/Makefile.inc
+++ b/lib/libbsnmp/Makefile.inc
@@ -1,6 +1,6 @@
# $FreeBSD$
-SHLIB_MAJOR= 5
-WARNS?= 6
NO_WERROR=
INCSDIR= ${INCLUDEDIR}/bsnmp
+
+.include "../Makefile.inc"
diff --git a/lib/libbsnmp/libbsnmp/Makefile b/lib/libbsnmp/libbsnmp/Makefile
index 91351c0..a0ceecd 100644
--- a/lib/libbsnmp/libbsnmp/Makefile
+++ b/lib/libbsnmp/libbsnmp/Makefile
@@ -5,9 +5,8 @@
CONTRIB= ${.CURDIR}/../../../contrib/bsnmp/lib
.PATH: ${CONTRIB}
-LIB = bsnmp
-SHLIBDIR ?= /lib
-WARNS ?= 6
+LIB= bsnmp
+SHLIBDIR?= /lib
CFLAGS+= -I${CONTRIB} -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY
CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DQUADFMT='"llu"' -DQUADXFMT='"llx"'
diff --git a/lib/libpam/modules/pam_krb5/Makefile b/lib/libpam/modules/pam_krb5/Makefile
index 500801b..85f3421 100644
--- a/lib/libpam/modules/pam_krb5/Makefile
+++ b/lib/libpam/modules/pam_krb5/Makefile
@@ -29,7 +29,7 @@ SRCS= pam_krb5.c
MAN= pam_krb5.8
.if defined(_FREEFALL_CONFIG)
CFLAGS+=-D_FREEFALL_CONFIG
-WARNS= 3
+WARNS?= 3
.endif
DPADD= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO}
diff --git a/sbin/ddb/Makefile b/sbin/ddb/Makefile
index b9189c1..c556be1 100644
--- a/sbin/ddb/Makefile
+++ b/sbin/ddb/Makefile
@@ -3,7 +3,7 @@
PROG= ddb
SRCS= ddb.c ddb_capture.c ddb_script.c
MAN= ddb.8
-WARNS= 3
+WARNS?= 3
DPADD= ${LIBKVM}
LDADD= -lkvm
diff --git a/sbin/ipf/ipftest/Makefile b/sbin/ipf/ipftest/Makefile
index 8903f25..d089b2b 100644
--- a/sbin/ipf/ipftest/Makefile
+++ b/sbin/ipf/ipftest/Makefile
@@ -1,7 +1,5 @@
# $FreeBSD$
-WARNS=0
-
PROG= ipftest
SRCS= ${GENHDRS} ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c \
ip_proxy.c ip_auth.c ip_htable.c ip_lookup.c \
@@ -10,6 +8,7 @@ SRCS= ${GENHDRS} ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c \
ipf_l.c ipnat_y.c ipnat_l.c md5.c radix.c bpf_filter.c
MAN= ipftest.1
+WARNS?= 0
CFLAGS+= -DIPFILTER_LOG -DIPFILTER_COMPILED -DIPFILTER_LOOKUP \
-DIPFILTER_SCAN -DIPFILTER_SYNC -DIPFILTER_CKSUM -I.
diff --git a/share/examples/autofs/driver/Makefile b/share/examples/autofs/driver/Makefile
index 7a0f159..d577668 100644
--- a/share/examples/autofs/driver/Makefile
+++ b/share/examples/autofs/driver/Makefile
@@ -1,11 +1,11 @@
# $Id: Makefile,v 1.5 2004/09/08 08:27:12 bright Exp $
# $FreeBSD$
-PROG=autodriver
+PROG= autodriver
+NO_MAN=
SRCS= autodriver.c
-NO_MAN=
-WARNS= 4
+WARNS?= 4
CFLAGS+= -g
BINDIR?= /sbin
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>
diff --git a/usr.bin/locale/Makefile b/usr.bin/locale/Makefile
index 5b8932c..96c18bc 100644
--- a/usr.bin/locale/Makefile
+++ b/usr.bin/locale/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
-PROG = locale
-CFLAGS += -I${.CURDIR}/../../lib/libc/locale
-WARNS ?= 3
+PROG= locale
+WARNS?= 3
+CFLAGS+= -I${.CURDIR}/../../lib/libc/locale
.include <bsd.prog.mk>
diff --git a/usr.sbin/fwcontrol/Makefile b/usr.sbin/fwcontrol/Makefile
index 9694d5e..10320d2 100644
--- a/usr.sbin/fwcontrol/Makefile
+++ b/usr.sbin/fwcontrol/Makefile
@@ -3,7 +3,7 @@
PROG= fwcontrol
SRCS= fwcontrol.c fwcrom.c fwdv.c fwmpegts.c
MAN= fwcontrol.8
-WARNS= 3
+WARNS?= 3
.PATH: ${.CURDIR}/../../sys/dev/firewire
diff --git a/usr.sbin/uhsoctl/Makefile b/usr.sbin/uhsoctl/Makefile
index 9704923..565b2e6 100644
--- a/usr.sbin/uhsoctl/Makefile
+++ b/usr.sbin/uhsoctl/Makefile
@@ -2,7 +2,7 @@
PROG= uhsoctl
MAN= uhsoctl.1
-WARNS= 1
+WARNS?= 1
DPADD= ${LIBUTIL}
LDADD= -lutil
OpenPOWER on IntegriCloud