svn commit: r204596 - in head: lib/libalias lib/libalias/libalias lib/libarchive/test lib/libpam lib/libpam/modules sbin/hastctl sbin/hastd usr.sbin/bluetooth/bthidd usr.sbin/bsnmpd/modules

[Ulrich Spoerlein]

Author: uqs
Date: Tue Mar  2 18:44:08 2010
New Revision: 204596
URL: http://svn.freebsd.org/changeset/base/204596

Log:
  Remove redundant WARNS?=6 overrides and inherit the WARNS setting from
  the toplevel directory.
  
  This does not change any WARNS level and survives a make universe.
  
  Approved by:        ed (co-mentor)

Added:
  head/lib/libalias/Makefile.inc   (contents, props changed)
Modified:
  head/lib/libalias/libalias/Makefile
  head/lib/libarchive/test/Makefile
  head/lib/libpam/Makefile.inc
  head/lib/libpam/modules/Makefile.inc
  head/sbin/hastctl/Makefile
  head/sbin/hastd/Makefile
  head/usr.sbin/bluetooth/bthidd/Makefile
  head/usr.sbin/bsnmpd/modules/Makefile.inc

Added: head/lib/libalias/Makefile.inc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lib/libalias/Makefile.inc	Tue Mar  2 18:44:08 2010	(r204596)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"

Modified: head/lib/libalias/libalias/Makefile
==============================================================================
--- head/lib/libalias/libalias/Makefile	Tue Mar  2 18:43:12 2010	(r204595)
+++ head/lib/libalias/libalias/Makefile	Tue Mar  2 18:44:08 2010	(r204596)
@@ -8,7 +8,6 @@ SHLIB_MAJOR= 7
 MAN=	libalias.3
 SRCS=	alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c
 INCS=	alias.h
-WARNS?=	6
 NO_WERROR=
 
 .include <bsd.lib.mk>

Modified: head/lib/libarchive/test/Makefile
==============================================================================
--- head/lib/libarchive/test/Makefile	Tue Mar  2 18:43:12 2010	(r204595)
+++ head/lib/libarchive/test/Makefile	Tue Mar  2 18:44:08 2010	(r204596)
@@ -137,7 +137,6 @@ CFLAGS+= -I${LA_SRCDIR} -I.
 # Uncomment to link against dmalloc
 #LDADD+= -L/usr/local/lib -ldmalloc
 #CFLAGS+= -I/usr/local/include -DUSE_DMALLOC
-#WARNS=6
 
 # Build libarchive_test and run it.
 check test: libarchive_test

Modified: head/lib/libpam/Makefile.inc
==============================================================================
--- head/lib/libpam/Makefile.inc	Tue Mar  2 18:43:12 2010	(r204595)
+++ head/lib/libpam/Makefile.inc	Tue Mar  2 18:44:08 2010	(r204596)
@@ -30,3 +30,5 @@ DEBUG_FLAGS+=	-DDEBUG
 
 SHLIB_MAJOR=	5
 PAM_MOD_DIR=	${LIBDIR}
+
+.include "../Makefile.inc"

Modified: head/lib/libpam/modules/Makefile.inc
==============================================================================
--- head/lib/libpam/modules/Makefile.inc	Tue Mar  2 18:43:12 2010	(r204595)
+++ head/lib/libpam/modules/Makefile.inc	Tue Mar  2 18:44:08 2010	(r204596)
@@ -6,7 +6,6 @@ NO_INSTALLLIB=
 NO_PROFILE=
 
 CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam
-WARNS?=	6
 
 # This is nasty.
 # For the static case, libpam.a depends on the modules.

Modified: head/sbin/hastctl/Makefile
==============================================================================
--- head/sbin/hastctl/Makefile	Tue Mar  2 18:43:12 2010	(r204595)
+++ head/sbin/hastctl/Makefile	Tue Mar  2 18:44:08 2010	(r204596)
@@ -15,7 +15,6 @@ SRCS+=	proto.c proto_common.c proto_tcp4
 SRCS+=	token.l
 SRCS+=	subr.c
 SRCS+=	y.tab.h
-WARNS?=	6
 MAN=	hastctl.8
 
 CFLAGS+=-I${.CURDIR}/../hastd

Modified: head/sbin/hastd/Makefile
==============================================================================
--- head/sbin/hastd/Makefile	Tue Mar  2 18:43:12 2010	(r204595)
+++ head/sbin/hastd/Makefile	Tue Mar  2 18:44:08 2010	(r204596)
@@ -16,7 +16,6 @@ SRCS+=	rangelock.c
 SRCS+=	subr.c
 SRCS+=	token.l
 SRCS+=	y.tab.h
-WARNS?=	6
 MAN=	hastd.8 hast.conf.5
 
 CFLAGS+=-I${.CURDIR}

Modified: head/usr.sbin/bluetooth/bthidd/Makefile
==============================================================================
--- head/usr.sbin/bluetooth/bthidd/Makefile	Tue Mar  2 18:43:12 2010	(r204595)
+++ head/usr.sbin/bluetooth/bthidd/Makefile	Tue Mar  2 18:44:08 2010	(r204596)
@@ -8,7 +8,6 @@ SRCS=		bthidd.c client.c hid.c kbd.c lex
 		session.c
 
 CFLAGS+=	-I${.CURDIR}
-WARNS?=		6
 DEBUG_FLAGS=	-g
 
 DPADD=          ${LIBBLUETOOTH} ${LIBUSBHID}

Modified: head/usr.sbin/bsnmpd/modules/Makefile.inc
==============================================================================
--- head/usr.sbin/bsnmpd/modules/Makefile.inc	Tue Mar  2 18:43:12 2010	(r204595)
+++ head/usr.sbin/bsnmpd/modules/Makefile.inc	Tue Mar  2 18:44:08 2010	(r204596)
@@ -1,8 +1,9 @@
 # $FreeBSD$
 
 SHLIB_MAJOR=	6
-WARNS?=		6
 
 MANFILTER=	sed -e 's%@MODPATH@%${LIBDIR}/%g'		\
 		    -e 's%@DEFPATH@%${DEFSDIR}/%g'		\
 		    -e 's%@MIBSPATH@%${BMIBSDIR}/%g'
+
+.include "../Makefile.inc"