From e6f17963a89ebc2ef1ce0b2000d1a5d872ad5f01 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 26 Feb 2016 22:14:08 +0000
Subject: [PATCH] Remove unneeded lines.

- WARNS can be inherited from lib/Makefile.inc
- CFLAGS referred to a non-existent directory and this shouldn't be needed
  anyhow due to the build picking up includes from WORLDTMP.

Sponsored by:	EMC / Isilon Storage Division
---
 lib/libcasper/Makefile.inc                 | 3 +++
 lib/libcasper/libcasper/Makefile           | 2 --
 lib/libcasper/services/Makefile.inc        | 3 +++
 lib/libcasper/services/cap_dns/Makefile    | 3 ---
 lib/libcasper/services/cap_grp/Makefile    | 3 ---
 lib/libcasper/services/cap_pwd/Makefile    | 3 ---
 lib/libcasper/services/cap_random/Makefile | 3 ---
 lib/libcasper/services/cap_sysctl/Makefile | 3 ---
 8 files changed, 6 insertions(+), 17 deletions(-)
 create mode 100644 lib/libcasper/Makefile.inc
 create mode 100644 lib/libcasper/services/Makefile.inc

diff --git a/lib/libcasper/Makefile.inc b/lib/libcasper/Makefile.inc
new file mode 100644
index 00000000000..265f86d1ed5
--- /dev/null
+++ b/lib/libcasper/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
diff --git a/lib/libcasper/libcasper/Makefile b/lib/libcasper/libcasper/Makefile
index 2a123ac6d24..6fbdffbb12d 100644
--- a/lib/libcasper/libcasper/Makefile
+++ b/lib/libcasper/libcasper/Makefile
@@ -18,8 +18,6 @@ LIBADD=	nv
 
 CFLAGS+=-I${.CURDIR}
 
-WARNS?=	6
-
 MAN+=	libcasper.3
 
 MLINKS+=libcasper.3 cap_init.3
diff --git a/lib/libcasper/services/Makefile.inc b/lib/libcasper/services/Makefile.inc
new file mode 100644
index 00000000000..265f86d1ed5
--- /dev/null
+++ b/lib/libcasper/services/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
diff --git a/lib/libcasper/services/cap_dns/Makefile b/lib/libcasper/services/cap_dns/Makefile
index 871975d3b09..c52f6bf7a52 100644
--- a/lib/libcasper/services/cap_dns/Makefile
+++ b/lib/libcasper/services/cap_dns/Makefile
@@ -13,8 +13,5 @@ INCS=	cap_dns.h
 LIBADD=	nv
 
 CFLAGS+=-I${.CURDIR}
-CFLAGS+=-I${.CURDIR}/../libcasper
-
-WARNS?=	6
 
 .include <bsd.lib.mk>
diff --git a/lib/libcasper/services/cap_grp/Makefile b/lib/libcasper/services/cap_grp/Makefile
index 81b94771e05..8a552d26bcd 100644
--- a/lib/libcasper/services/cap_grp/Makefile
+++ b/lib/libcasper/services/cap_grp/Makefile
@@ -13,8 +13,5 @@ INCS=	cap_grp.h
 LIBADD=	nv
 
 CFLAGS+=-I${.CURDIR}
-CFLAGS+=-I${.CURDIR}/../libcasper
-
-WARNS?=	6
 
 .include <bsd.lib.mk>
diff --git a/lib/libcasper/services/cap_pwd/Makefile b/lib/libcasper/services/cap_pwd/Makefile
index 34b8a1205a9..294ce7e2f05 100644
--- a/lib/libcasper/services/cap_pwd/Makefile
+++ b/lib/libcasper/services/cap_pwd/Makefile
@@ -13,8 +13,5 @@ INCS=	cap_pwd.h
 LIBADD=	nv
 
 CFLAGS+=-I${.CURDIR}
-CFLAGS+=-I${.CURDIR}/../libcasper
-
-WARNS?=	6
 
 .include <bsd.lib.mk>
diff --git a/lib/libcasper/services/cap_random/Makefile b/lib/libcasper/services/cap_random/Makefile
index 244723683a3..61dcc6ceba2 100644
--- a/lib/libcasper/services/cap_random/Makefile
+++ b/lib/libcasper/services/cap_random/Makefile
@@ -13,8 +13,5 @@ INCS=	cap_random.h
 LIBADD=	nv
 
 CFLAGS+=-I${.CURDIR}
-CFLAGS+=-I${.CURDIR}/../libcasper
-
-WARNS?=	6
 
 .include <bsd.lib.mk>
diff --git a/lib/libcasper/services/cap_sysctl/Makefile b/lib/libcasper/services/cap_sysctl/Makefile
index 779ed7ecee3..ba3a4b3c5ca 100644
--- a/lib/libcasper/services/cap_sysctl/Makefile
+++ b/lib/libcasper/services/cap_sysctl/Makefile
@@ -13,8 +13,5 @@ INCS=	cap_sysctl.h
 LIBADD=	nv
 
 CFLAGS+=-I${.CURDIR}
-CFLAGS+=-I${.CURDIR}/../libcasper
-
-WARNS?=	6
 
 .include <bsd.lib.mk>