diff options
author | Bjoern A. Zeeb <bz@FreeBSD.org> | 2012-01-22 02:16:31 +0000 |
---|---|---|
committer | Bjoern A. Zeeb <bz@FreeBSD.org> | 2012-01-22 02:16:31 +0000 |
commit | aa57e971bc608ca716f69efe16644ae6e952546e (patch) | |
tree | 80a4a9dd47c096caa224d026aa158da8f8622489 /sys/modules/Makefile | |
parent | 83e521ec73aece952e47c7cdc847c8f7bfb351d1 (diff) | |
download | src-aa57e971bc608ca716f69efe16644ae6e952546e.tar.gz src-aa57e971bc608ca716f69efe16644ae6e952546e.zip |
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
Notes
Notes:
svn path=/head/; revision=230443
Diffstat (limited to 'sys/modules/Makefile')
-rw-r--r-- | sys/modules/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile index f245cc25162f..24b5391f08f6 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 |