diff options
| author | obrien <obrien@FreeBSD.org> | 2005-09-11 03:38:18 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2005-09-11 03:38:18 +0000 |
| commit | 312435e93341532299b80c689c3b8d8f4f9b3fce (patch) | |
| tree | 49c66f1f9a9d219aa3cf00be2bd04c027e0c5c1c | |
| parent | c6e2bab51884180d0944c8488927b2eb8201ae8e (diff) | |
| download | FreeBSD-src-312435e93341532299b80c689c3b8d8f4f9b3fce.zip FreeBSD-src-312435e93341532299b80c689c3b8d8f4f9b3fce.tar.gz | |
Don't pollute the entire kernel build with -I$S/contrib/dev/ath and
-I$S/contrib/dev/ath/freebsd. "ATH_BUILDING_FROM_SOURCE" can be defined to
globally get back -I$S/contrib/dev/ath.
| -rw-r--r-- | sys/conf/files | 12 | ||||
| -rw-r--r-- | sys/conf/kern.pre.mk | 7 |
2 files changed, 13 insertions, 6 deletions
diff --git a/sys/conf/files b/sys/conf/files index 8dd74eb..3a8b25f 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -246,7 +246,8 @@ contrib/dev/acpica/utmath.c optional acpi 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/dev/ath/freebsd/ah_osdep.c optional ath_hal \ + compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" 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 \ @@ -480,10 +481,13 @@ dev/ata/atapi-cd.c optional atapicd dev/ata/atapi-fd.c optional atapifd dev/ata/atapi-tape.c optional atapist dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr -dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe +dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe \ + compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" dev/ath/ath_rate/sample/sample.c optional ath_rate_sample -dev/ath/if_ath.c optional ath -dev/ath/if_ath_pci.c optional ath pci +dev/ath/if_ath.c optional ath \ + compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" +dev/ath/if_ath_pci.c optional ath pci \ + compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd" dev/awi/am79c930.c optional awi dev/awi/awi.c optional awi dev/awi/if_awi_pccard.c optional awi pccard diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 73bb1f2..008e658 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -55,8 +55,11 @@ INCLUDES+= -I$S/contrib/dev/acpica # ... and the same for altq INCLUDES+= -I$S/contrib/altq -# ... and the same for Atheros HAL -INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd +# ... and the same for Atheros HAL when the author builds it from +# non-distributable sources. +.if defined(ATH_BUILDING_FROM_SOURCE) +INCLUDES+= -I$S/contrib/dev/ath +.endif CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} CFLAGS+= ${INCLUDES} -D_KERNEL -include opt_global.h |
