Options spring cleanup:
- Add and document the KVM and KVM_SUPPORT options that are needed for the ifmcstats(3) makefile - Garbage collect unused variables - Add missing inclusion of bsd.own.mk where needed Approved by: kan (mentor) Reviewed by: ru
This commit is contained in:
parent
9a97252585
commit
04031e9ae2
@ -48,7 +48,6 @@ SRCS= ${TESTS} \
|
|||||||
|
|
||||||
CLEANFILES+= list.h
|
CLEANFILES+= list.h
|
||||||
|
|
||||||
MK_MAN=no
|
|
||||||
NO_MAN=yes
|
NO_MAN=yes
|
||||||
|
|
||||||
PROG=libarchive_test
|
PROG=libarchive_test
|
||||||
|
@ -325,6 +325,7 @@ WITH_IDEA=
|
|||||||
IPFILTER \
|
IPFILTER \
|
||||||
IPX \
|
IPX \
|
||||||
KERBEROS \
|
KERBEROS \
|
||||||
|
KVM \
|
||||||
LIB32 \
|
LIB32 \
|
||||||
LIBPTHREAD \
|
LIBPTHREAD \
|
||||||
LIBTHR \
|
LIBTHR \
|
||||||
@ -449,6 +450,7 @@ MK_GDB:= no
|
|||||||
INET6 \
|
INET6 \
|
||||||
IPX \
|
IPX \
|
||||||
KERBEROS \
|
KERBEROS \
|
||||||
|
KVM \
|
||||||
PAM
|
PAM
|
||||||
.if defined(WITH_${var}_SUPPORT) && defined(WITHOUT_${var}_SUPPORT)
|
.if defined(WITH_${var}_SUPPORT) && defined(WITHOUT_${var}_SUPPORT)
|
||||||
.error WITH_${var}_SUPPORT and WITHOUT_${var}_SUPPORT can't both be set.
|
.error WITH_${var}_SUPPORT and WITHOUT_${var}_SUPPORT can't both be set.
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
|
.include <bsd.own.mk>
|
||||||
|
|
||||||
.PATH: ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6
|
.PATH: ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6
|
||||||
|
|
||||||
KMOD= ip_mroute
|
KMOD= ip_mroute
|
||||||
@ -8,7 +10,7 @@ SRCS= ip_mroute.c
|
|||||||
SRCS+= opt_inet.h opt_mac.h opt_mrouting.h
|
SRCS+= opt_inet.h opt_mac.h opt_mrouting.h
|
||||||
SRCS+= opt_inet6.h
|
SRCS+= opt_inet6.h
|
||||||
|
|
||||||
.if !defined(MK_INET6_SUPPORT) || ${MK_INET6_SUPPORT} != "no"
|
.if ${MK_INET6_SUPPORT} != "no"
|
||||||
SRCS+= ip6_mroute.c
|
SRCS+= ip6_mroute.c
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
@ -17,7 +19,7 @@ opt_inet.h:
|
|||||||
echo "#define INET 1" > ${.TARGET}
|
echo "#define INET 1" > ${.TARGET}
|
||||||
opt_mrouting.h:
|
opt_mrouting.h:
|
||||||
echo "#define MROUTING 1" > ${.TARGET}
|
echo "#define MROUTING 1" > ${.TARGET}
|
||||||
.if !defined(MK_INET6_SUPPORT) || ${MK_INET6_SUPPORT} != "no"
|
.if ${MK_INET6_SUPPORT} != "no"
|
||||||
opt_inet6.h:
|
opt_inet6.h:
|
||||||
echo "#define INET6 1" > ${.TARGET}
|
echo "#define INET6 1" > ${.TARGET}
|
||||||
.endif
|
.endif
|
||||||
|
5
tools/build/options/WITHOUT_KVM
Normal file
5
tools/build/options/WITHOUT_KVM
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
.\" $FreeBSD$
|
||||||
|
Set to not build the
|
||||||
|
.Nm libkvm
|
||||||
|
library as a part of the base system.
|
||||||
|
.Sy "The option has no effect yet."
|
4
tools/build/options/WITHOUT_KVM_SUPPORT
Normal file
4
tools/build/options/WITHOUT_KVM_SUPPORT
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
.\" $FreeBSD$
|
||||||
|
Set to build some programs without optional
|
||||||
|
.Nm libkvm
|
||||||
|
support.
|
@ -9,8 +9,6 @@
|
|||||||
# Moved to secure: bdes
|
# Moved to secure: bdes
|
||||||
#
|
#
|
||||||
|
|
||||||
.include <bsd.own.mk>
|
|
||||||
|
|
||||||
SUBDIR= alias \
|
SUBDIR= alias \
|
||||||
apply \
|
apply \
|
||||||
asa \
|
asa \
|
||||||
|
@ -1,17 +1,19 @@
|
|||||||
# @(#)Makefile 8.1 (Berkeley) 6/5/93
|
# @(#)Makefile 8.1 (Berkeley) 6/5/93
|
||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
|
.include <bsd.own.mk>
|
||||||
|
|
||||||
PROG= ifmcstat
|
PROG= ifmcstat
|
||||||
MAN= ifmcstat.8
|
MAN= ifmcstat.8
|
||||||
BINMODE= 550
|
BINMODE= 550
|
||||||
|
|
||||||
WARNS?= 2
|
WARNS?= 2
|
||||||
|
|
||||||
.if !defined(MK_INET6_SUPPORT) || ${MK_INET6_SUPPORT} != "no"
|
.if ${MK_INET6_SUPPORT} != "no"
|
||||||
CFLAGS+=-DINET6
|
CFLAGS+=-DINET6
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if !defined(MK_KVM_SUPPORT) || ${MK_KVM_SUPPORT} != "no"
|
.if ${MK_KVM_SUPPORT} != "no"
|
||||||
CFLAGS+=-DWITH_KVM
|
CFLAGS+=-DWITH_KVM
|
||||||
DPADD= ${LIBKVM}
|
DPADD= ${LIBKVM}
|
||||||
LDADD= -lkvm
|
LDADD= -lkvm
|
||||||
|
Loading…
Reference in New Issue
Block a user