Author: uqs
Date: Tue Mar 2 16:58:04 2010
New Revision: 204585
URL: http://svn.freebsd.org/changeset/base/204585
Log:
Always assign WARNS using ?=
- fix some nearby style bugs
- include Makefile.inc where it makes sense and reduces duplication
Approved by: ed (co-mentor)
Modified:
head/lib/libbsnmp/Makefile.inc
head/lib/libbsnmp/libbsnmp/Makefile
head/lib/libpam/modules/pam_krb5/Makefile
head/sbin/ddb/Makefile
head/sbin/ipf/ipftest/Makefile
head/share/examples/autofs/driver/Makefile
head/tools/regression/kqueue/Makefile
head/tools/regression/priv/Makefile
head/tools/regression/sockets/unix_gc/Makefile
head/tools/regression/sockets/unix_sorflush/Makefile
head/tools/regression/tmpfs/Makefile
head/tools/tools/netrate/http/Makefile
head/tools/tools/netrate/httpd/Makefile
head/tools/tools/netrate/juggle/Makefile
head/tools/tools/netrate/tcpconnect/Makefile
head/tools/tools/netrate/tcpp/Makefile
head/tools/tools/netrate/tcpreceive/Makefile
head/tools/tools/umastat/Makefile
head/usr.bin/locale/Makefile
head/usr.sbin/fwcontrol/Makefile
head/usr.sbin/uhsoctl/Makefile
Modified: head/lib/libbsnmp/Makefile.inc
==============================================================================
--- head/lib/libbsnmp/Makefile.inc Tue Mar 2 16:29:08 2010
(r204584)
+++ head/lib/libbsnmp/Makefile.inc Tue Mar 2 16:58:04 2010
(r204585)
@@ -1,6 +1,6 @@
# $FreeBSD$
-SHLIB_MAJOR= 5
-WARNS?= 6
NO_WERROR=
INCSDIR= ${INCLUDEDIR}/bsnmp
+
+.include "../Makefile.inc"
Modified: head/lib/libbsnmp/libbsnmp/Makefile
==============================================================================
--- head/lib/libbsnmp/libbsnmp/Makefile Tue Mar 2 16:29:08 2010
(r204584)
+++ head/lib/libbsnmp/libbsnmp/Makefile Tue Mar 2 16:58:04 2010
(r204585)
@@ -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"'
Modified: head/lib/libpam/modules/pam_krb5/Makefile
==============================================================================
--- head/lib/libpam/modules/pam_krb5/Makefile Tue Mar 2 16:29:08 2010
(r204584)
+++ head/lib/libpam/modules/pam_krb5/Makefile Tue Mar 2 16:58:04 2010
(r204585)
@@ -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}
Modified: head/sbin/ddb/Makefile
==============================================================================
--- head/sbin/ddb/Makefile Tue Mar 2 16:29:08 2010 (r204584)
+++ head/sbin/ddb/Makefile Tue Mar 2 16:58:04 2010 (r204585)
@@ -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
Modified: head/sbin/ipf/ipftest/Makefile
==============================================================================
--- head/sbin/ipf/ipftest/Makefile Tue Mar 2 16:29:08 2010
(r204584)
+++ head/sbin/ipf/ipftest/Makefile Tue Mar 2 16:58:04 2010
(r204585)
@@ -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_fra
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.
Modified: head/share/examples/autofs/driver/Makefile
==============================================================================
--- head/share/examples/autofs/driver/Makefile Tue Mar 2 16:29:08 2010
(r204584)
+++ head/share/examples/autofs/driver/Makefile Tue Mar 2 16:58:04 2010
(r204585)
@@ -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
Modified: head/tools/regression/kqueue/Makefile
==============================================================================
--- head/tools/regression/kqueue/Makefile Tue Mar 2 16:29:08 2010
(r204584)
+++ head/tools/regression/kqueue/Makefile Tue Mar 2 16:58:04 2010
(r204585)
@@ -16,6 +16,6 @@ SRCS= \
signal.c \
user.c
NO_MAN=
-WARNS=2
+WARNS?= 2
.include "bsd.prog.mk"
Modified: head/tools/regression/priv/Makefile
==============================================================================
--- head/tools/regression/priv/Makefile Tue Mar 2 16:29:08 2010
(r204584)
+++ head/tools/regression/priv/Makefile Tue Mar 2 16:58:04 2010
(r204585)
@@ -46,7 +46,7 @@ SRCS= main.c \
priv_vm_munlock.c
NO_MAN=
-WARNS= 3
+WARNS?= 3
DPADD+= ${LIBIPSEC}
LDADD+= -lipsec
Modified: head/tools/regression/sockets/unix_gc/Makefile
==============================================================================
--- head/tools/regression/sockets/unix_gc/Makefile Tue Mar 2 16:29:08
2010 (r204584)
+++ head/tools/regression/sockets/unix_gc/Makefile Tue Mar 2 16:58:04
2010 (r204585)
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= unix_gc
-WARNS= 3
NO_MAN=
+WARNS?= 3
.include <bsd.prog.mk>
Modified: head/tools/regression/sockets/unix_sorflush/Makefile
==============================================================================
--- head/tools/regression/sockets/unix_sorflush/Makefile Tue Mar 2
16:29:08 2010 (r204584)
+++ head/tools/regression/sockets/unix_sorflush/Makefile Tue Mar 2
16:58:04 2010 (r204585)
@@ -2,6 +2,6 @@
PROG= unix_sorflush
NO_MAN=
-WARNS= 3
+WARNS?= 3
.include <bsd.prog.mk>
Modified: head/tools/regression/tmpfs/Makefile
==============================================================================
--- head/tools/regression/tmpfs/Makefile Tue Mar 2 16:29:08 2010
(r204584)
+++ head/tools/regression/tmpfs/Makefile Tue Mar 2 16:58:04 2010
(r204585)
@@ -31,7 +31,7 @@ regress: ${tests}
PROG= h_tools
NO_MAN= # defined
-WARNS= 4
+WARNS?= 4
t_sizes t_sockets t_statvfs: h_tools
Modified: head/tools/tools/netrate/http/Makefile
==============================================================================
--- head/tools/tools/netrate/http/Makefile Tue Mar 2 16:29:08 2010
(r204584)
+++ head/tools/tools/netrate/http/Makefile Tue Mar 2 16:58:04 2010
(r204585)
@@ -1,8 +1,8 @@
# $FreeBSD$
PROG= http
-WARNS= 3
NO_MAN=
+WARNS?= 3
DPADD= ${LIBPTHREAD}
LDADD= -lpthread
Modified: head/tools/tools/netrate/httpd/Makefile
==============================================================================
--- head/tools/tools/netrate/httpd/Makefile Tue Mar 2 16:29:08 2010
(r204584)
+++ head/tools/tools/netrate/httpd/Makefile Tue Mar 2 16:58:04 2010
(r204585)
@@ -1,8 +1,8 @@
# $FreeBSD$
PROG= httpd
-WARNS= 3
NO_MAN=
+WARNS?= 3
DPADD= ${LIBPTHREAD}
LDADD= -lpthread
Modified: head/tools/tools/netrate/juggle/Makefile
==============================================================================
--- head/tools/tools/netrate/juggle/Makefile Tue Mar 2 16:29:08 2010
(r204584)
+++ head/tools/tools/netrate/juggle/Makefile Tue Mar 2 16:58:04 2010
(r204585)
@@ -2,9 +2,8 @@
PROG= juggle
NO_MAN=
-WARNS= 3
-
-LDADD= -lpthread
+WARNS?= 3
DPADD= ${LIBPTHREAD}
+LDADD= -lpthread
.include <bsd.prog.mk>
Modified: head/tools/tools/netrate/tcpconnect/Makefile
==============================================================================
--- head/tools/tools/netrate/tcpconnect/Makefile Tue Mar 2 16:29:08
2010 (r204584)
+++ head/tools/tools/netrate/tcpconnect/Makefile Tue Mar 2 16:58:04
2010 (r204585)
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= tcpconnect
-WARNS= 3
NO_MAN=
+WARNS?= 3
.include <bsd.prog.mk>
Modified: head/tools/tools/netrate/tcpp/Makefile
==============================================================================
--- head/tools/tools/netrate/tcpp/Makefile Tue Mar 2 16:29:08 2010
(r204584)
+++ head/tools/tools/netrate/tcpp/Makefile Tue Mar 2 16:58:04 2010
(r204585)
@@ -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>
Modified: head/tools/tools/netrate/tcpreceive/Makefile
==============================================================================
--- head/tools/tools/netrate/tcpreceive/Makefile Tue Mar 2 16:29:08
2010 (r204584)
+++ head/tools/tools/netrate/tcpreceive/Makefile Tue Mar 2 16:58:04
2010 (r204585)
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= tcpreceive
-WARNS= 3
NO_MAN=
+WARNS?= 3
.include <bsd.prog.mk>
Modified: head/tools/tools/umastat/Makefile
==============================================================================
--- head/tools/tools/umastat/Makefile Tue Mar 2 16:29:08 2010
(r204584)
+++ head/tools/tools/umastat/Makefile Tue Mar 2 16:58:04 2010
(r204585)
@@ -2,10 +2,9 @@
PROG= umastat
NO_MAN=
+WARNS?= 3
DPADD= ${LIBKVM}
LDADD= -lkvm
-WARNS= 3
-
.include <bsd.prog.mk>
Modified: head/usr.bin/locale/Makefile
==============================================================================
--- head/usr.bin/locale/Makefile Tue Mar 2 16:29:08 2010
(r204584)
+++ head/usr.bin/locale/Makefile Tue Mar 2 16:58:04 2010
(r204585)
@@ -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>
Modified: head/usr.sbin/fwcontrol/Makefile
==============================================================================
--- head/usr.sbin/fwcontrol/Makefile Tue Mar 2 16:29:08 2010
(r204584)
+++ head/usr.sbin/fwcontrol/Makefile Tue Mar 2 16:58:04 2010
(r204585)
@@ -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
Modified: head/usr.sbin/uhsoctl/Makefile
==============================================================================
--- head/usr.sbin/uhsoctl/Makefile Tue Mar 2 16:29:08 2010
(r204584)
+++ head/usr.sbin/uhsoctl/Makefile Tue Mar 2 16:58:04 2010
(r204585)
@@ -2,7 +2,7 @@
PROG= uhsoctl
MAN= uhsoctl.1
-WARNS= 1
+WARNS?= 1
DPADD= ${LIBUTIL}
LDADD= -lutil
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
