From 40b586fe5868f15b0e41fae384cf06c1375bf2d3 Mon Sep 17 00:00:00 2001 From: obrien Date: Sun, 11 Sep 2005 02:27:34 +0000 Subject: Don't pollute the entire kernel build with -I$S/contrib/ipfilter. --- sys/conf/files | 39 ++++++++++++++++++++++++++------------- sys/conf/kern.pre.mk | 3 --- 2 files changed, 26 insertions(+), 16 deletions(-) (limited to 'sys/conf') 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 -- cgit v1.1