diff options
| author | obrien <obrien@FreeBSD.org> | 2005-09-11 02:04:04 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2005-09-11 02:04:04 +0000 |
| commit | 52479142b60622a3424f68cf7b615280f1bb6f43 (patch) | |
| tree | 8412c7343b3b880f9209b095e555e83b1a251584 /sys | |
| parent | acd336fc161f3fdbe1b789e7164f8e36ae37957d (diff) | |
| download | FreeBSD-src-52479142b60622a3424f68cf7b615280f1bb6f43.zip FreeBSD-src-52479142b60622a3424f68cf7b615280f1bb6f43.tar.gz | |
Don't pollute the entire kernel build with -I$S/contrib/pf.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/files | 48 | ||||
| -rw-r--r-- | sys/conf/kern.pre.mk | 3 |
2 files changed, 32 insertions, 19 deletions
diff --git a/sys/conf/files b/sys/conf/files index 56f1b0b..0484848 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -111,14 +111,20 @@ coda/coda_venus.c optional vcoda coda/coda_vfsops.c optional vcoda coda/coda_vnops.c optional vcoda compat/linprocfs/linprocfs.c optional linprocfs -contrib/altq/altq/altq_cbq.c optional altq +contrib/altq/altq/altq_cbq.c optional altq \ + compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/altq/altq/altq_cdnr.c optional altq -contrib/altq/altq/altq_hfsc.c optional altq -contrib/altq/altq/altq_priq.c optional altq -contrib/altq/altq/altq_red.c optional altq -contrib/altq/altq/altq_rio.c optional altq +contrib/altq/altq/altq_hfsc.c optional altq \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/altq/altq/altq_priq.c optional altq \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/altq/altq/altq_red.c optional altq \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/altq/altq/altq_rio.c optional altq \ + compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/altq/altq/altq_rmclass.c optional altq -contrib/altq/altq/altq_subr.c optional altq +contrib/altq/altq/altq_subr.c optional altq \ + compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/dev/acpica/dbcmds.c optional acpi acpi_debug contrib/dev/acpica/dbdisply.c optional acpi acpi_debug contrib/dev/acpica/dbexec.c optional acpi acpi_debug @@ -298,15 +304,24 @@ contrib/ngatm/netnatm/sig/sig_unimsgcpy.c optional ngatm_uni \ compile-with "${NORMAL_C} -I$S/contrib/ngatm" contrib/ngatm/netnatm/sig/sig_verify.c optional ngatm_uni \ compile-with "${NORMAL_C} -I$S/contrib/ngatm" -contrib/pf/net/if_pflog.c optional pflog -contrib/pf/net/if_pfsync.c optional pfsync -contrib/pf/net/pf.c optional pf -contrib/pf/net/pf_if.c optional pf -contrib/pf/net/pf_subr.c optional pf -contrib/pf/net/pf_ioctl.c optional pf -contrib/pf/net/pf_norm.c optional pf -contrib/pf/net/pf_table.c optional pf -contrib/pf/net/pf_osfp.c optional pf +contrib/pf/net/if_pflog.c optional pflog \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/pf/net/if_pfsync.c optional pfsync \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/pf/net/pf.c optional pf \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/pf/net/pf_if.c optional pf \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/pf/net/pf_subr.c optional pf \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/pf/net/pf_ioctl.c optional pf \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/pf/net/pf_norm.c optional pf \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/pf/net/pf_table.c optional pf \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/pf/net/pf_osfp.c optional pf \ + compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/pf/netinet/in4_cksum.c optional pf inet crypto/blowfish/bf_ecb.c optional ipsec ipsec_esp crypto/blowfish/bf_skey.c optional crypto @@ -1616,7 +1631,8 @@ netinet/in_gif.c optional gif inet netinet/ip_gre.c optional gre inet netinet/ip_id.c optional inet netinet/in_pcb.c optional inet -netinet/in_proto.c optional inet +netinet/in_proto.c optional inet \ + compile-with "${NORMAL_C} -I$S/contrib/pf" netinet/in_rmx.c optional inet netinet/ip_divert.c optional ipdivert netinet/ip_dummynet.c optional dummynet diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 3059609..98aea36 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -58,9 +58,6 @@ INCLUDES+= -I$S/contrib/altq # ... and the same for ipfilter INCLUDES+= -I$S/contrib/ipfilter -# ... and the same for pf -INCLUDES+= -I$S/contrib/pf - # ... and the same for Atheros HAL INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd |
