Removed -I${.CURDIR}/.../sys from CFLAGS.

29 files changed, 13 insertions, 35 deletions

diff --git a/bin/chio/Makefile b/bin/chio/Makefile
index d4b7f56..1720328 100644
--- a/bin/chio/Makefile
+++ b/bin/chio/Makefile
@@ -1,8 +1,6 @@
 # $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
-CFLAGS+=-I${.CURDIR}/../../sys
-
 PROG=	chio
 SRCS=	chio.c
 
diff --git a/bin/ps/Makefile b/bin/ps/Makefile
index d5c791c..08ea30b 100644
--- a/bin/ps/Makefile
+++ b/bin/ps/Makefile
@@ -9,7 +9,7 @@ SRCS=	fmt.c keyword.c nlist.c print.c ps.c
 # keep ps from being an unnecessary load
 # on large systems.
 #
-CFLAGS+=-I${.CURDIR}/../../sys -DLAZY_PS
+CFLAGS+=-DLAZY_PS
 DPADD=	${LIBM} ${LIBKVM}
 LDADD=	-lm -lkvm
 #BINGRP=	kmem
diff --git a/lib/libdevstat/Makefile b/lib/libdevstat/Makefile
index 07e580e..ea52a6e 100644
--- a/lib/libdevstat/Makefile
+++ b/lib/libdevstat/Makefile
@@ -18,6 +18,6 @@ MLINKS+=devstat.3 buildmatch.3
 MLINKS+=devstat.3 compute_stats.3
 MLINKS+=devstat.3 compute_etime.3
 
-CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../sys
+CFLAGS+=-I${.CURDIR}
 
 .include <bsd.lib.mk>
diff --git a/lib/libipx/Makefile b/lib/libipx/Makefile
index b468f60..4c02334 100644
--- a/lib/libipx/Makefile
+++ b/lib/libipx/Makefile
@@ -1,11 +1,8 @@
 # $FreeBSD$
 
 LIB=	ipx
-#CFLAGS+=-DLIBC_SCCS -I${.CURDIR}/../../sys
 SRCS=	ipx_addr.c ipx_ntoa.c
-
 MAN=	ipx.3
-
 MLINKS+=ipx.3 ipx_addr.3 ipx.3 ipx_ntoa.3
 
 .include <bsd.lib.mk>
diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile
index 68e7f30..f079485 100644
--- a/lib/libkvm/Makefile
+++ b/lib/libkvm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 LIB=	kvm
-CFLAGS+=-DLIBC_SCCS -I${.CURDIR} -I${.CURDIR}/../../sys
+CFLAGS+=-DLIBC_SCCS -I${.CURDIR}
 SRCS=	kvm.c kvm_${MACHINE_ARCH}.c kvm_file.c kvm_getloadavg.c \
 	kvm_getswapinfo.c kvm_proc.c
 INCS=	kvm.h
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index 1cbf1cb..b49a691 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -4,7 +4,7 @@
 LIB=	util
 SHLIB_MAJOR= 3
 SHLIB_MINOR= 0
-CFLAGS+=-Wall -DLIBC_SCCS -I${.CURDIR} -I${.CURDIR}/../../sys
+CFLAGS+=-Wall -DLIBC_SCCS -I${.CURDIR}
 CFLAGS+=-DINET6
 SRCS=	_secure_path.c auth.c extattr.c fparseln.c login.c login_auth.c \
 	login_cap.c login_class.c login_crypt.c login_ok.c login_times.c \
diff --git a/sbin/ccdconfig/Makefile b/sbin/ccdconfig/Makefile
index 19e6fa3..33bcd48 100644
--- a/sbin/ccdconfig/Makefile
+++ b/sbin/ccdconfig/Makefile
@@ -3,7 +3,6 @@
 PROG=	ccdconfig
 MAN=	ccdconfig.8
 
-CFLAGS+=	-I${.CURDIR}/../../sys
 LDADD+=		-lkvm
 DPADD+=		${LIBKVM}
 BINGRP=		kmem
diff --git a/sbin/ipf/Makefile b/sbin/ipf/Makefile
index dd00cc6..530950e 100644
--- a/sbin/ipf/Makefile
+++ b/sbin/ipf/Makefile
@@ -5,7 +5,7 @@
 PROG=	ipf
 MAN=	ipf.4 ipf.5 ipf.8
 SRCS=	ipf.c parse.c opt.c facpri.c common.c
-CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -I- -I${.CURDIR}/../../sys/netinet -I${.CURDIR}/../../contrib/ipfilter
+CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -I${.CURDIR}/../../contrib/ipfilter
 
 MAINTAINER=	guido@freebsd.org
 
diff --git a/sbin/ipfstat/Makefile b/sbin/ipfstat/Makefile
index ed4d62e..fd6a5ff 100644
--- a/sbin/ipfstat/Makefile
+++ b/sbin/ipfstat/Makefile
@@ -5,7 +5,7 @@
 PROG=	ipfstat
 MAN=	ipfstat.8
 SRCS=	fils.c parse.c opt.c kmem.c facpri.c common.c
-CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -DSTATETOP -I- -I${.CURDIR}/../../sys/netinet -I${.CURDIR}/../../sys -I${.CURDIR}/../../contrib/ipfilter
+CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -DSTATETOP -I${.CURDIR}/../../contrib/ipfilter
 
 DPADD= ${NCURSES}
 LDADD= -lncurses
diff --git a/sbin/ipmon/Makefile b/sbin/ipmon/Makefile
index 4426f29..b4450f7 100644
--- a/sbin/ipmon/Makefile
+++ b/sbin/ipmon/Makefile
@@ -6,7 +6,7 @@ PROG=	ipmon
 MAN=	ipl.4 ipmon.8
 SRCS=	ipmon.c
 
-CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -I- -I${.CURDIR}/../../sys -I${.CURDIR}/../../contrib/ipfilter
+CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -I${.CURDIR}/../../contrib/ipfilter
 
 MAINTAINER=	guido@freebsd.org
 
diff --git a/sbin/ipnat/Makefile b/sbin/ipnat/Makefile
index 6d3644d..2fe7781 100644
--- a/sbin/ipnat/Makefile
+++ b/sbin/ipnat/Makefile
@@ -6,7 +6,7 @@ PROG=	ipnat
 MAN=	ipnat.1 ipnat.4 ipnat.5
 MLINKS=	ipnat.5 ipnat.conf.5
 SRCS=	ipnat.c kmem.c natparse.c common.c
-CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -I- -I${.CURDIR}/../../sys/netinet -I${.CURDIR}/../../sys -I${.CURDIR}/../../contrib/ipfilter
+CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -I${.CURDIR}/../../contrib/ipfilter
 
 MAINTAINER=	guido@freebsd.org
 
diff --git a/sbin/kldload/Makefile b/sbin/kldload/Makefile
index 5fcbc68..05ad5ba 100644
--- a/sbin/kldload/Makefile
+++ b/sbin/kldload/Makefile
@@ -29,6 +29,4 @@
 PROG=	kldload
 MAN=	kldload.8
 
-CFLAGS+=-I${.CURDIR}/../../sys
-
 .include <bsd.prog.mk>
diff --git a/sbin/kldstat/Makefile b/sbin/kldstat/Makefile
index fe0797d..e4145d7 100644
--- a/sbin/kldstat/Makefile
+++ b/sbin/kldstat/Makefile
@@ -29,6 +29,4 @@
 PROG=	kldstat
 MAN=	kldstat.8
 
-CFLAGS+=-I${.CURDIR}/../../sys
-
 .include <bsd.prog.mk>
diff --git a/sbin/kldunload/Makefile b/sbin/kldunload/Makefile
index c0edca7..1a25a02 100644
--- a/sbin/kldunload/Makefile
+++ b/sbin/kldunload/Makefile
@@ -29,6 +29,4 @@
 PROG=	kldunload
 MAN=	kldunload.8
 
-CFLAGS+=-I${.CURDIR}/../../sys
-
 .include <bsd.prog.mk>
diff --git a/sbin/mount_hpfs/Makefile b/sbin/mount_hpfs/Makefile
index de78daf..c8e0fd2 100644
--- a/sbin/mount_hpfs/Makefile
+++ b/sbin/mount_hpfs/Makefile
@@ -7,7 +7,7 @@ SRCS=	mount_hpfs.c getmntopts.c
 MAN=	mount_hpfs.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT} -DHPFS
+CFLAGS+=-I${MOUNT} -DHPFS
 .PATH:	${MOUNT}
 
 .include <bsd.prog.mk>
diff --git a/sbin/mount_ntfs/Makefile b/sbin/mount_ntfs/Makefile
index c45b7d9..042c5e5 100644
--- a/sbin/mount_ntfs/Makefile
+++ b/sbin/mount_ntfs/Makefile
@@ -7,7 +7,7 @@ SRCS=	mount_ntfs.c getmntopts.c
 MAN=	mount_ntfs.8
 
 MOUNT=	${.CURDIR}/../mount
-CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
+CFLAGS+=-I${MOUNT}
 .PATH:	${MOUNT}
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile
index ae51fb6..6cf4c59 100644
--- a/usr.bin/fstat/Makefile
+++ b/usr.bin/fstat/Makefile
@@ -4,7 +4,6 @@
 PROG=	fstat
 SRCS=	cd9660.c fstat.c msdosfs.c
 CFLAGS+=-Wall
-CFLAGS+=-I${.CURDIR}/../../sys
 DPADD=	${LIBKVM}
 LDADD=	-lkvm
 BINGRP=	kmem
diff --git a/usr.bin/mt/Makefile b/usr.bin/mt/Makefile
index 0e692e9..25b4af5 100644
--- a/usr.bin/mt/Makefile
+++ b/usr.bin/mt/Makefile
@@ -2,6 +2,5 @@
 # $FreeBSD$
 
 PROG=	mt
-CFLAGS+=-I${.CURDIR}/../../sys
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile
index 1bbaae6..80f7bc3 100644
--- a/usr.bin/systat/Makefile
+++ b/usr.bin/systat/Makefile
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PROG=	systat
-CFLAGS+=-I${.CURDIR}/../../sys
 SRCS=	cmds.c cmdtab.c devs.c fetch.c iostat.c keyboard.c main.c \
 	mbufs.c netcmds.c netstat.c pigs.c swap.c icmp.c mode.c ip.c tcp.c \
 	vmstat.c
diff --git a/usr.bin/vmstat/Makefile b/usr.bin/vmstat/Makefile
index d3bd40d..9dd3768 100644
--- a/usr.bin/vmstat/Makefile
+++ b/usr.bin/vmstat/Makefile
@@ -3,7 +3,6 @@
 
 PROG=	vmstat
 MAN=	vmstat.8
-CFLAGS+=-I${.CURDIR}/../../sys
 BINGRP=	kmem
 BINMODE=2555
 DPADD=	${LIBKVM} ${LIBDEVSTAT}
diff --git a/usr.sbin/atm/atmarpd/Makefile b/usr.sbin/atm/atmarpd/Makefile
index 973b59a..4e81596 100644
--- a/usr.sbin/atm/atmarpd/Makefile
+++ b/usr.sbin/atm/atmarpd/Makefile
@@ -32,7 +32,6 @@ SRCS=	atmarpd.c atmarp_config.c atmarp_log.c atmarp_scsp.c \
 	atmarp_subr.c atmarp_timer.c
 MAN=	atmarpd.8
 
-CFLAGS+=	-I${.CURDIR}/../../../sys
 LDADD+=		-latm -lmd
 DPADD+=		${LIBATM} ${LIBMD}
 
diff --git a/usr.sbin/atm/scspd/Makefile b/usr.sbin/atm/scspd/Makefile
index 7740c25..91b38d3 100644
--- a/usr.sbin/atm/scspd/Makefile
+++ b/usr.sbin/atm/scspd/Makefile
@@ -35,7 +35,7 @@ SRCS=	scspd.c scsp_cafsm.c scsp_config.c scsp_config_lex.c \
 	scsp_timer.c
 MAN=	scspd.8
 
-CFLAGS+=	-I. -I${.CURDIR}/../../../sys -I${.CURDIR}
+CFLAGS+=	-I. -I${.CURDIR}
 LDADD+=		-latm -lmd
 DPADD+=		${LIBATM} ${LIBMD}
 
diff --git a/usr.sbin/iostat/Makefile b/usr.sbin/iostat/Makefile
index d3a1f19..bfc1e49 100644
--- a/usr.sbin/iostat/Makefile
+++ b/usr.sbin/iostat/Makefile
@@ -5,7 +5,6 @@ MAINTAINER=ken@FreeBSD.ORG
 
 PROG=	iostat
 MAN=	iostat.8
-CFLAGS+=-I${.CURDIR}/../../sys
 DPADD=	${LIBKVM} ${LIBDEVSTAT}
 LDADD=	-lkvm -ldevstat
 BINGRP=	kmem
diff --git a/usr.sbin/ipftest/Makefile b/usr.sbin/ipftest/Makefile
index 728baa0..14cce72 100644
--- a/usr.sbin/ipftest/Makefile
+++ b/usr.sbin/ipftest/Makefile
@@ -9,7 +9,7 @@ SRCS=	opt_ipfilter.h \
 	ipft_tx.c misc.c ip_frag.c ip_state.c ip_nat.c ip_proxy.c \
 	ip_auth.c ipft_hx.c ip_fil.c natparse.c facpri.c common.c
 
-CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -I- -I${.OBJDIR} -I${.CURDIR}/../../sys/netinet -I${.CURDIR}/../../sys -I${.CURDIR}/../../contrib/ipfilter
+CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -I. -I${.CURDIR}/../../contrib/ipfilter
 
 CLEANFILES+=	opt_ipfilter.h
 
diff --git a/usr.sbin/ipresend/Makefile b/usr.sbin/ipresend/Makefile
index 180faad..949be18 100644
--- a/usr.sbin/ipresend/Makefile
+++ b/usr.sbin/ipresend/Makefile
@@ -8,7 +8,6 @@ SRCS=	ipresend.c ip.c resend.c opt.c ipft_ef.c ipft_hx.c ipft_sn.c ipft_td.c ipf
 
 CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" \
 	-DUSE_INET6 \
-	-I- -I${.CURDIR}/../../sys/netinet \
 	-I${.CURDIR}/../../contrib/ipfilter/ipsend \
 	-I${.CURDIR}/../../contrib/ipfilter
 
diff --git a/usr.sbin/ipsend/Makefile b/usr.sbin/ipsend/Makefile
index dc35972..04a99f4 100644
--- a/usr.sbin/ipsend/Makefile
+++ b/usr.sbin/ipsend/Makefile
@@ -11,7 +11,7 @@ MAN=	ipsend.1 ipsend.5
 
 CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" \
 	-DUSE_INET6 \
-	-I- -I. -I${.CURDIR}/../../sys/netinet \
+	-I. \
 	-I${.CURDIR}/../../contrib/ipfilter/ipsend \
 	-I${.CURDIR}/../../contrib/ipfilter/iplang \
 	-I${.CURDIR}/../../contrib/ipfilter
diff --git a/usr.sbin/iptest/Makefile b/usr.sbin/iptest/Makefile
index 6639fa9..45ece63 100644
--- a/usr.sbin/iptest/Makefile
+++ b/usr.sbin/iptest/Makefile
@@ -8,7 +8,6 @@ SRCS=	iptest.c iptests.c ip.c sbpf.c 44arp.c sock.c
 
 CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" \
 	-DUSE_INET6 \
-	-I- -I${.CURDIR}/../../sys/netinet \
 	-I${.CURDIR}/../../contrib/ipfilter/ipsend \
 	-I${.CURDIR}/../../contrib/ipfilter
 
diff --git a/usr.sbin/usbd/Makefile b/usr.sbin/usbd/Makefile
index 716456d..aadecee 100644
--- a/usr.sbin/usbd/Makefile
+++ b/usr.sbin/usbd/Makefile
@@ -2,6 +2,5 @@
 
 PROG=	usbd
 MAN=	usbd.conf.5 usbd.8
-CFLAGS+=-I${.CURDIR}/../../sys
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/usbdevs/Makefile b/usr.sbin/usbdevs/Makefile
index a735c08..3cfc8ef 100644
--- a/usr.sbin/usbdevs/Makefile
+++ b/usr.sbin/usbdevs/Makefile
@@ -3,6 +3,5 @@
 
 PROG=	usbdevs
 MAN=	usbdevs.8
-CFLAGS+=-I${.CURDIR}/../../sys
 
 .include <bsd.prog.mk>