summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2005-09-11 02:27:34 +0000
committerobrien <obrien@FreeBSD.org>2005-09-11 02:27:34 +0000
commit40b586fe5868f15b0e41fae384cf06c1375bf2d3 (patch)
treeed876feeea38ff65ca64622cfc33105e90dba5b1 /sys/conf
parent52479142b60622a3424f68cf7b615280f1bb6f43 (diff)
downloadFreeBSD-src-40b586fe5868f15b0e41fae384cf06c1375bf2d3.zip
FreeBSD-src-40b586fe5868f15b0e41fae384cf06c1375bf2d3.tar.gz
Don't pollute the entire kernel build with -I$S/contrib/ipfilter.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/files39
-rw-r--r--sys/conf/kern.pre.mk3
2 files changed, 26 insertions, 16 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 0484848..8dd74eb 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -247,19 +247,32 @@ contrib/dev/acpica/utmisc.c optional acpi
contrib/dev/acpica/utobject.c optional acpi
contrib/dev/acpica/utxface.c optional acpi
contrib/dev/ath/freebsd/ah_osdep.c optional ath_hal
-contrib/ipfilter/netinet/fil.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_fil_freebsd.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_frag.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_log.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_nat.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_proxy.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_state.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_lookup.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_pool.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_htable.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_sync.c optional ipfilter inet
-contrib/ipfilter/netinet/mlfk_ipl.c optional ipfilter inet
+contrib/ipfilter/netinet/fil.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_fil_freebsd.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_frag.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_log.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_nat.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_proxy.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_state.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_lookup.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_pool.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_htable.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_sync.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/mlfk_ipl.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
contrib/ngatm/netnatm/api/cc_conn.c optional ngatm_ccatm \
compile-with "${NORMAL_C} -I$S/contrib/ngatm"
contrib/ngatm/netnatm/api/cc_data.c optional ngatm_ccatm \
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 98aea36..73bb1f2 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -55,9 +55,6 @@ INCLUDES+= -I$S/contrib/dev/acpica
# ... and the same for altq
INCLUDES+= -I$S/contrib/altq
-# ... and the same for ipfilter
-INCLUDES+= -I$S/contrib/ipfilter
-
# ... and the same for Atheros HAL
INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd
OpenPOWER on IntegriCloud