summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryar <yar@FreeBSD.org>2006-07-27 13:26:29 +0000
committeryar <yar@FreeBSD.org>2006-07-27 13:26:29 +0000
commit51c5aa346aa124a853822a7232945abaa7d17b60 (patch)
treece37a168ff680044697648a8a215dea40f1c639f
parentc6e8412606712a40238dd87fa9c27f8342f2f55b (diff)
downloadFreeBSD-src-51c5aa346aa124a853822a7232945abaa7d17b60.zip
FreeBSD-src-51c5aa346aa124a853822a7232945abaa7d17b60.tar.gz
Obey MK_INET6_SUPPORT.
This is also a good chance to apply style.Makefile(5) in some cases.
-rw-r--r--sbin/route/Makefile12
-rw-r--r--sbin/rtsol/Makefile14
-rw-r--r--sbin/setkey/Makefile11
3 files changed, 28 insertions, 9 deletions
diff --git a/sbin/route/Makefile b/sbin/route/Makefile
index fede01d..ef56dfd 100644
--- a/sbin/route/Makefile
+++ b/sbin/route/Makefile
@@ -1,14 +1,22 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
+.include <bsd.own.mk>
+
PROG= route
MAN= route.8
SRCS= route.c keywords.h
-CFLAGS+=-I. -Wall -DNS
-CFLAGS+=-DINET6
WARNS?= 0
CLEANFILES+=keywords.h _keywords.tmp
+CFLAGS+= -DNS
+
+.if ${MK_INET6_SUPPORT} != "no"
+CFLAGS+= -DINET6
+.endif
+
+CFLAGS+= -I.
+
keywords.h: keywords
sed -e '/^#/d' -e '/^$$/d' ${.CURDIR}/keywords > _keywords.tmp
LC_ALL=C tr 'a-z' 'A-Z' < _keywords.tmp | paste _keywords.tmp - | \
diff --git a/sbin/rtsol/Makefile b/sbin/rtsol/Makefile
index d3d40e8..250f804 100644
--- a/sbin/rtsol/Makefile
+++ b/sbin/rtsol/Makefile
@@ -15,14 +15,20 @@
SRCDIR= ${.CURDIR}/../../usr.sbin/rtsold
+.PATH: ${SRCDIR}
+
PROG= rtsol
SRCS= rtsold.c rtsol.c if.c probe.c rtsock.c
-
-CFLAGS+=-DINET6 -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DSMALL
+NO_MAN=
WARNS?= 0
-NO_MAN=
+# after NO_MAN
+.include <bsd.own.mk>
-.PATH: ${SRCDIR}
+CFLAGS+= -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DSMALL
+
+.if ${MK_INET6_SUPPORT} != "no"
+CFLAGS+= -DINET6
+.endif
.include <bsd.prog.mk>
diff --git a/sbin/setkey/Makefile b/sbin/setkey/Makefile
index 794d6dd..9dd7cf5 100644
--- a/sbin/setkey/Makefile
+++ b/sbin/setkey/Makefile
@@ -27,9 +27,12 @@
#
# $FreeBSD$
+.include <bsd.own.mk>
+
PROG= setkey
MAN= setkey.8
SRCS= setkey.c parse.y token.l
+WARNS?= 1
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libipsec
YFLAGS= -d
@@ -47,7 +50,11 @@ CFLAGS+= -I${.CURDIR}/../../lib/libipsec -I${.CURDIR}/../../sys/netkey
SRCS+= y.tab.h
y.tab.h: parse.y
-CFLAGS+= -DIPSEC_DEBUG -DINET6 -DYY_NO_UNPUT -I.
+CFLAGS+= -DIPSEC_DEBUG -DYY_NO_UNPUT
+.if ${MK_INET6_SUPPORT} != "no"
+CFLAGS+= -DINET6
+.endif
+CFLAGS+= -I.
DPADD+= ${LIBIPSEC}
LDADD+= -lipsec
CLEANFILES+= scriptdump y.tab.h
@@ -56,8 +63,6 @@ CLEANFILES+= scriptdump y.tab.h
LOCALPREFIX= /usr
-WARNS= 1
-
scriptdump: scriptdump.pl
sed -e 's#@LOCALPREFIX@#${LOCALPREFIX}#' < $> > scriptdump
OpenPOWER on IntegriCloud