Pick up the correct headers from sys/contrib/ipfilter/netinet.

7 files changed, 23 insertions, 24 deletions

diff --git a/sbin/ipf/Makefile b/sbin/ipf/Makefile
index dd00cc6..23e13be 100644
--- a/sbin/ipf/Makefile
+++ b/sbin/ipf/Makefile
@@ -5,7 +5,9 @@
 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\"
+CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet
+CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter
 
 MAINTAINER=	guido@freebsd.org
 
diff --git a/sbin/ipfstat/Makefile b/sbin/ipfstat/Makefile
index ed4d62e..56731cb 100644
--- a/sbin/ipfstat/Makefile
+++ b/sbin/ipfstat/Makefile
@@ -5,7 +5,9 @@
 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
+CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet
+CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter
 
 DPADD= ${NCURSES}
 LDADD= -lncurses
diff --git a/sbin/ipnat/Makefile b/sbin/ipnat/Makefile
index 6d3644d..9050915 100644
--- a/sbin/ipnat/Makefile
+++ b/sbin/ipnat/Makefile
@@ -6,7 +6,9 @@ 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\"
+CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet
+CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter
 
 MAINTAINER=	guido@freebsd.org
 
diff --git a/usr.sbin/ipftest/Makefile b/usr.sbin/ipftest/Makefile
index 728baa0..ab7233a 100644
--- a/usr.sbin/ipftest/Makefile
+++ b/usr.sbin/ipftest/Makefile
@@ -1,20 +1,16 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../sys/netinet \
+.PATH:	${.CURDIR}/../../sys/contrib/ipfilter/netinet \
 	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
 
 PROG=	ipftest
-SRCS=	opt_ipfilter.h \
-	ipt.c parse.c fil.c ipft_sn.c ipft_ef.c ipft_td.c ipft_pc.c opt.c \
+SRCS=	ipt.c parse.c fil.c ipft_sn.c ipft_ef.c ipft_td.c ipft_pc.c opt.c \
 	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
-
-CLEANFILES+=	opt_ipfilter.h
-
-opt_ipfilter.h:	Makefile
-	echo "#define IPFILTER 1" > opt_ipfilter.h
+CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\"
+CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet
+CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter
 
 MAINTAINER=	guido@freebsd.org
 
diff --git a/usr.sbin/ipresend/Makefile b/usr.sbin/ipresend/Makefile
index 180faad..0c10f9f 100644
--- a/usr.sbin/ipresend/Makefile
+++ b/usr.sbin/ipresend/Makefile
@@ -6,10 +6,9 @@
 PROG=	ipresend
 SRCS=	ipresend.c ip.c resend.c opt.c ipft_ef.c ipft_hx.c ipft_sn.c ipft_td.c ipft_tx.c sbpf.c 44arp.c ipft_pc.c
 
-CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" \
-	-DUSE_INET6 \
-	-I- -I${.CURDIR}/../../sys/netinet \
-	-I${.CURDIR}/../../contrib/ipfilter/ipsend \
+CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" -DUSE_INET6
+CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet
+CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter/ipsend \
 	-I${.CURDIR}/../../contrib/ipfilter
 
 MAINTAINER=	guido@freebsd.org
diff --git a/usr.sbin/ipsend/Makefile b/usr.sbin/ipsend/Makefile
index dc35972..07f2979 100644
--- a/usr.sbin/ipsend/Makefile
+++ b/usr.sbin/ipsend/Makefile
@@ -9,10 +9,9 @@ SRCS=	ipsend.c ip.c ipsopt.c sbpf.c sock.c 44arp.c iplang_y.y iplang_l.l \
 	y.tab.h
 MAN=	ipsend.1 ipsend.5
 
-CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" \
-	-DUSE_INET6 \
-	-I- -I. -I${.CURDIR}/../../sys/netinet \
-	-I${.CURDIR}/../../contrib/ipfilter/ipsend \
+CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" -DUSE_INET6
+CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet
+CFLAGS+=-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..304d009 100644
--- a/usr.sbin/iptest/Makefile
+++ b/usr.sbin/iptest/Makefile
@@ -6,10 +6,9 @@
 PROG=	iptest
 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 \
+CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" -DUSE_INET6
+CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet
+CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter/ipsend \
 	-I${.CURDIR}/../../contrib/ipfilter
 
 MAINTAINER=	guido@freebsd.org