summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryar <yar@FreeBSD.org>2006-07-27 15:31:13 +0000
committeryar <yar@FreeBSD.org>2006-07-27 15:31:13 +0000
commitb8f7c8982840ef5fd64bebc37afe60ab32cdfe48 (patch)
tree9f7d37c34f91fa38fb08501018ebf8b640cf3782
parentbbba5d85e1dbe1228583d2a9a6b574e26488fedf (diff)
downloadFreeBSD-src-b8f7c8982840ef5fd64bebc37afe60ab32cdfe48.zip
FreeBSD-src-b8f7c8982840ef5fd64bebc37afe60ab32cdfe48.tar.gz
These IPv6-only tools have no explicit dependency on the INET6 macro.
Tested with: cmp(1)
-rw-r--r--sbin/ping6/Makefile2
-rw-r--r--usr.sbin/mld6query/Makefile2
-rw-r--r--usr.sbin/ndp/Makefile1
-rw-r--r--usr.sbin/rip6query/Makefile2
-rw-r--r--usr.sbin/route6d/Makefile2
-rw-r--r--usr.sbin/rrenumd/Makefile2
-rw-r--r--usr.sbin/rtadvd/Makefile2
-rw-r--r--usr.sbin/rtsold/Makefile2
-rw-r--r--usr.sbin/traceroute6/Makefile2
9 files changed, 8 insertions, 9 deletions
diff --git a/sbin/ping6/Makefile b/sbin/ping6/Makefile
index 2d0cad4..89e7fbe 100644
--- a/sbin/ping6/Makefile
+++ b/sbin/ping6/Makefile
@@ -3,7 +3,7 @@
PROG= ping6
MAN= ping6.8
-CFLAGS+=-DINET6 -DIPSEC -DKAME_SCOPEID -DUSE_RFC2292BIS \
+CFLAGS+=-DIPSEC -DKAME_SCOPEID -DUSE_RFC2292BIS \
-DHAVE_POLL_H -DHAVE_ARC4RANDOM
WARNS?= 2
diff --git a/usr.sbin/mld6query/Makefile b/usr.sbin/mld6query/Makefile
index 7100520..0e9da49 100644
--- a/usr.sbin/mld6query/Makefile
+++ b/usr.sbin/mld6query/Makefile
@@ -18,6 +18,6 @@ PROG= mld6query
MAN= mld6query.8
SRCS= mld6.c
-CFLAGS+= -DINET6 -DIPSEC -DUSE_RFC2292BIS
+CFLAGS+= -DIPSEC -DUSE_RFC2292BIS
.include <bsd.prog.mk>
diff --git a/usr.sbin/ndp/Makefile b/usr.sbin/ndp/Makefile
index c35dfc7..f156691 100644
--- a/usr.sbin/ndp/Makefile
+++ b/usr.sbin/ndp/Makefile
@@ -19,7 +19,6 @@ PROG= ndp
MAN= ndp.8
SRCS= ndp.c gmt2local.c
-CFLAGS+= -DINET6
CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/../../contrib/tcpdump
CFLAGS+= -D_U_=""
diff --git a/usr.sbin/rip6query/Makefile b/usr.sbin/rip6query/Makefile
index 51438a1..e0ea621 100644
--- a/usr.sbin/rip6query/Makefile
+++ b/usr.sbin/rip6query/Makefile
@@ -5,6 +5,6 @@ PROG= rip6query
MAN= rip6query.8
WARNS?= 2
-CFLAGS+= -DINET6 -I${.CURDIR}/../route6d
+CFLAGS+= -I${.CURDIR}/../route6d
.include <bsd.prog.mk>
diff --git a/usr.sbin/route6d/Makefile b/usr.sbin/route6d/Makefile
index 1bed21a..308aad7 100644
--- a/usr.sbin/route6d/Makefile
+++ b/usr.sbin/route6d/Makefile
@@ -4,6 +4,6 @@
PROG= route6d
MAN= route6d.8
-CFLAGS+= -DINET6 -DHAVE_POLL_H
+CFLAGS+= -DHAVE_POLL_H
.include <bsd.prog.mk>
diff --git a/usr.sbin/rrenumd/Makefile b/usr.sbin/rrenumd/Makefile
index c85911e..c31a7c7 100644
--- a/usr.sbin/rrenumd/Makefile
+++ b/usr.sbin/rrenumd/Makefile
@@ -18,7 +18,7 @@ PROG= rrenumd
MAN= rrenumd.conf.5 rrenumd.8
SRCS= rrenumd.c parser.y lexer.l
-CFLAGS+= -DINET6 -DIPSEC -I. -I${.CURDIR}
+CFLAGS+= -DIPSEC -I. -I${.CURDIR}
YFLAGS= -d
LDADD= -lipsec -ll -ly
diff --git a/usr.sbin/rtadvd/Makefile b/usr.sbin/rtadvd/Makefile
index 7fa2098..f7e2021 100644
--- a/usr.sbin/rtadvd/Makefile
+++ b/usr.sbin/rtadvd/Makefile
@@ -18,6 +18,6 @@ PROG= rtadvd
MAN= rtadvd.conf.5 rtadvd.8
SRCS= rtadvd.c rrenum.c advcap.c if.c config.c timer.c dump.c
-CFLAGS+= -DINET6 -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DROUTEINFO
+CFLAGS+= -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DROUTEINFO
.include <bsd.prog.mk>
diff --git a/usr.sbin/rtsold/Makefile b/usr.sbin/rtsold/Makefile
index 6ae47e9..1afa0f6 100644
--- a/usr.sbin/rtsold/Makefile
+++ b/usr.sbin/rtsold/Makefile
@@ -19,7 +19,7 @@ MAN= rtsold.8
MLINKS= rtsold.8 rtsol.8
SRCS= rtsold.c rtsol.c if.c probe.c dump.c rtsock.c
-CFLAGS+= -DINET6 -DHAVE_ARC4RANDOM -DHAVE_POLL_H
+CFLAGS+= -DHAVE_ARC4RANDOM -DHAVE_POLL_H
DPADD= ${LIBKVM}
LDADD= -lkvm
diff --git a/usr.sbin/traceroute6/Makefile b/usr.sbin/traceroute6/Makefile
index ab4e52c..6ff72d2 100644
--- a/usr.sbin/traceroute6/Makefile
+++ b/usr.sbin/traceroute6/Makefile
@@ -18,7 +18,7 @@ MAN= traceroute6.8
BINOWN= root
BINMODE= 4555
-CFLAGS+= -DINET6 -DIPSEC -DUSE_RFC2292BIS -DHAVE_POLL
+CFLAGS+= -DIPSEC -DUSE_RFC2292BIS -DHAVE_POLL
DPADD= ${LIBIPSEC}
LDADD= -lipsec
OpenPOWER on IntegriCloud