aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Spörlein <uqs@FreeBSD.org>2010-03-02 18:44:08 +0000
committerUlrich Spörlein <uqs@FreeBSD.org>2010-03-02 18:44:08 +0000
commit7729e3ba4017a3af96cff64b68751cb9d72c79b8 (patch)
treeb4ad29ee41b5c24565c10654e789756458c2edd7
parent0dce12b8dd941e12e60126e3a6deeae2f577f80d (diff)
downloadsrc-7729e3ba4017a3af96cff64b68751cb9d72c79b8.tar.gz
src-7729e3ba4017a3af96cff64b68751cb9d72c79b8.zip
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)
Notes
Notes: svn path=/head/; revision=204596
-rw-r--r--lib/libalias/Makefile.inc3
-rw-r--r--lib/libalias/libalias/Makefile1
-rw-r--r--lib/libarchive/test/Makefile1
-rw-r--r--lib/libpam/Makefile.inc2
-rw-r--r--lib/libpam/modules/Makefile.inc1
-rw-r--r--sbin/hastctl/Makefile1
-rw-r--r--sbin/hastd/Makefile1
-rw-r--r--usr.sbin/bluetooth/bthidd/Makefile1
-rw-r--r--usr.sbin/bsnmpd/modules/Makefile.inc3
9 files changed, 7 insertions, 7 deletions
diff --git a/lib/libalias/Makefile.inc b/lib/libalias/Makefile.inc
new file mode 100644
index 000000000000..265f86d1ed55
--- /dev/null
+++ b/lib/libalias/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
diff --git a/lib/libalias/libalias/Makefile b/lib/libalias/libalias/Makefile
index a3f98891842c..00b4ed8fe20a 100644
--- a/lib/libalias/libalias/Makefile
+++ b/lib/libalias/libalias/Makefile
@@ -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>
diff --git a/lib/libarchive/test/Makefile b/lib/libarchive/test/Makefile
index ab65da3b2ab4..c721f57a173e 100644
--- a/lib/libarchive/test/Makefile
+++ b/lib/libarchive/test/Makefile
@@ -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
diff --git a/lib/libpam/Makefile.inc b/lib/libpam/Makefile.inc
index 1fe2f12efd6b..1c1e513740e5 100644
--- a/lib/libpam/Makefile.inc
+++ b/lib/libpam/Makefile.inc
@@ -30,3 +30,5 @@ DEBUG_FLAGS+= -DDEBUG
SHLIB_MAJOR= 5
PAM_MOD_DIR= ${LIBDIR}
+
+.include "../Makefile.inc"
diff --git a/lib/libpam/modules/Makefile.inc b/lib/libpam/modules/Makefile.inc
index c352f42c3f3e..feb5da01e9ef 100644
--- a/lib/libpam/modules/Makefile.inc
+++ b/lib/libpam/modules/Makefile.inc
@@ -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.
diff --git a/sbin/hastctl/Makefile b/sbin/hastctl/Makefile
index 43c8c201b171..e0d6b5b72232 100644
--- a/sbin/hastctl/Makefile
+++ b/sbin/hastctl/Makefile
@@ -15,7 +15,6 @@ SRCS+= proto.c proto_common.c proto_tcp4.c proto_uds.c
SRCS+= token.l
SRCS+= subr.c
SRCS+= y.tab.h
-WARNS?= 6
MAN= hastctl.8
CFLAGS+=-I${.CURDIR}/../hastd
diff --git a/sbin/hastd/Makefile b/sbin/hastd/Makefile
index 43118075e94b..8153c3a0f4b6 100644
--- a/sbin/hastd/Makefile
+++ b/sbin/hastd/Makefile
@@ -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}
diff --git a/usr.sbin/bluetooth/bthidd/Makefile b/usr.sbin/bluetooth/bthidd/Makefile
index 128bd20eee79..dd0754d582d2 100644
--- a/usr.sbin/bluetooth/bthidd/Makefile
+++ b/usr.sbin/bluetooth/bthidd/Makefile
@@ -8,7 +8,6 @@ SRCS= bthidd.c client.c hid.c kbd.c lexer.l parser.y server.c \
session.c
CFLAGS+= -I${.CURDIR}
-WARNS?= 6
DEBUG_FLAGS= -g
DPADD= ${LIBBLUETOOTH} ${LIBUSBHID}
diff --git a/usr.sbin/bsnmpd/modules/Makefile.inc b/usr.sbin/bsnmpd/modules/Makefile.inc
index adf6d726d72c..b5dad56e277a 100644
--- a/usr.sbin/bsnmpd/modules/Makefile.inc
+++ b/usr.sbin/bsnmpd/modules/Makefile.inc
@@ -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"