diff options
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/ath/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/ath_hal/Makefile | 16 | ||||
| -rw-r--r-- | sys/modules/ath_rate_onoe/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/ath_rate_sample/Makefile | 2 |
4 files changed, 8 insertions, 14 deletions
diff --git a/sys/modules/ath/Makefile b/sys/modules/ath/Makefile index 9b6f3da..fdc0150 100644 --- a/sys/modules/ath/Makefile +++ b/sys/modules/ath/Makefile @@ -43,7 +43,7 @@ SRCS= if_ath.c if_ath_pci.c SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h HAL= ${.CURDIR}/../../contrib/dev/ath -CFLAGS+= -I. -I${HAL}/freebsd -I${HAL} +CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${HAL} opt_ath.h: echo > $@ diff --git a/sys/modules/ath_hal/Makefile b/sys/modules/ath_hal/Makefile index 7324171..42837fc 100644 --- a/sys/modules/ath_hal/Makefile +++ b/sys/modules/ath_hal/Makefile @@ -44,18 +44,17 @@ # maintenance and isolate the bits that are not (currently) distributed # in source form. # -HAL= ${.CURDIR}/../../contrib/dev/ath +HAL?= ${.CURDIR}/../../contrib/dev/ath -.PATH: ${HAL}/freebsd +.PATH: ${.CURDIR}/../../dev/ath KMOD= ath_hal SRCS= ah_osdep.c -SRCS+= bus_if.h device_if.h pci_if.h ah_if.h opt_ah.h +SRCS+= bus_if.h device_if.h pci_if.h opt_ah.h OBJS= hal.o -MFILES= kern/bus_if.m kern/device_if.m dev/pci/pci_if.m \ - contrib/dev/ath/freebsd/ah_if.m +MFILES= kern/bus_if.m kern/device_if.m dev/pci/pci_if.m -CFLAGS+= -I. -I${HAL}/freebsd -I${HAL} +CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${HAL} # patch for hal naming difference .if ${MACHINE_ARCH} == "amd64" @@ -68,14 +67,9 @@ ATH_MODULE_ARCH=powerpc-be ATH_MODULE_ARCH=${MACHINE_ARCH} .endif -.if defined(HAL_SRC) -.include "${HAL}/freebsd/Makefile.inc" -.else - hal.o: ${HAL}/public/${ATH_MODULE_ARCH}-elf.hal.o.uu uudecode -p < ${HAL}/public/${ATH_MODULE_ARCH}-elf.hal.o.uu > ${.TARGET} opt_ah.h: ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h cp ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h ${.TARGET} -.endif .include <bsd.kmod.mk> diff --git a/sys/modules/ath_rate_onoe/Makefile b/sys/modules/ath_rate_onoe/Makefile index b7a6732..bec7967 100644 --- a/sys/modules/ath_rate_onoe/Makefile +++ b/sys/modules/ath_rate_onoe/Makefile @@ -43,6 +43,6 @@ SRCS= onoe.c SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h HAL= ${.CURDIR}/../../contrib/dev/ath -CFLAGS+= -I. -I${HAL}/freebsd -I${HAL} +CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${HAL} .include <bsd.kmod.mk> diff --git a/sys/modules/ath_rate_sample/Makefile b/sys/modules/ath_rate_sample/Makefile index 51c3130..e7b8812 100644 --- a/sys/modules/ath_rate_sample/Makefile +++ b/sys/modules/ath_rate_sample/Makefile @@ -43,6 +43,6 @@ SRCS= sample.c SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h HAL= ${.CURDIR}/../../contrib/dev/ath -CFLAGS+= -I. -I${HAL}/freebsd -I${HAL} +CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${HAL} .include <bsd.kmod.mk> |
