diff options
author | bz <bz@FreeBSD.org> | 2012-01-22 02:16:31 +0000 |
---|---|---|
committer | bz <bz@FreeBSD.org> | 2012-01-22 02:16:31 +0000 |
commit | 6aadb2bfe6ffccddb769e61e1dd5ba14dd5b53c5 (patch) | |
tree | 80a4a9dd47c096caa224d026aa158da8f8622489 /sys/modules | |
parent | a8d3ef905d6a09a0cfa4378c505c468682b9a267 (diff) | |
download | FreeBSD-src-6aadb2bfe6ffccddb769e61e1dd5ba14dd5b53c5.zip FreeBSD-src-6aadb2bfe6ffccddb769e61e1dd5ba14dd5b53c5.tar.gz |
Fix ip_divert handling of inet and inet6 and module building some more.
Properly sort the "carp" case in modules/Makefile after it was renamed.
Reported by: bde (most)
Reviewed by: bde
MFC after: 3 days
Diffstat (limited to 'sys/modules')
-rw-r--r-- | sys/modules/Makefile | 11 | ||||
-rw-r--r-- | sys/modules/ipdivert/Makefile | 10 |
2 files changed, 15 insertions, 6 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile index f245cc2..24b5391 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -136,7 +136,7 @@ SUBDIR= ${_3dfx} \ ${_igb} \ ${_iir} \ ${_io} \ - ipdivert \ + ${_ipdivert} \ ${_ipfilter} \ ${_ipfw} \ ipfw_nat \ @@ -370,20 +370,21 @@ _random= random .endif .endif -.if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES) -_if_gre= if_gre -.endif - .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \ defined(ALL_MODULES) _carp= carp .endif +.if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES) +_if_gre= if_gre +.endif + .if ${MK_IPFILTER} != "no" || defined(ALL_MODULES) _ipfilter= ipfilter .endif .if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES) +_ipdivert= ipdivert _ipfw= ipfw .endif diff --git a/sys/modules/ipdivert/Makefile b/sys/modules/ipdivert/Makefile index 886802a..14f92ad 100644 --- a/sys/modules/ipdivert/Makefile +++ b/sys/modules/ipdivert/Makefile @@ -1,13 +1,21 @@ # $FreeBSD$ +.include <bsd.own.mk> + .PATH: ${.CURDIR}/../../netinet KMOD= ipdivert -SRCS= ip_divert.c opt_inet6.h +SRCS= ip_divert.c opt_inet.h opt_inet6.h .if !defined(KERNBUILDDIR) +.if ${MK_INET_SUPPORT} != "no" +opt_inet.h: + echo "#define INET 1" > ${.TARGET} +.endif +.if ${MK_INET6_SUPPORT} != "no" opt_inet6.h: echo "#define INET6 1" > ${.TARGET} .endif +.endif .include <bsd.kmod.mk> |