From a0e4020b845cd38a8c6ba92d53971c2a049c1ee3 Mon Sep 17 00:00:00 2001 From: ru Date: Mon, 11 Jun 2001 17:41:58 +0000 Subject: Backout previous change (removal of -I${.CURDIR}/../../sys/netinet). This is needed to pick up the right headers. Wrong headers from src/contrib/ipfilter are used otherwise. The right fix would be to fix contrib/ipfilter C sources to pick up headers from . Noticed by: peter --- usr.sbin/ipftest/Makefile | 2 +- usr.sbin/ipresend/Makefile | 1 + usr.sbin/ipsend/Makefile | 2 +- usr.sbin/iptest/Makefile | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/ipftest/Makefile b/usr.sbin/ipftest/Makefile index 14cce72..728baa0 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${.CURDIR}/../../contrib/ipfilter +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 diff --git a/usr.sbin/ipresend/Makefile b/usr.sbin/ipresend/Makefile index 949be18..180faad 100644 --- a/usr.sbin/ipresend/Makefile +++ b/usr.sbin/ipresend/Makefile @@ -8,6 +8,7 @@ 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 04a99f4..dc35972 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. -I${.CURDIR}/../../sys/netinet \ -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 45ece63..6639fa9 100644 --- a/usr.sbin/iptest/Makefile +++ b/usr.sbin/iptest/Makefile @@ -8,6 +8,7 @@ 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 -- cgit v1.1