[Midnightbsd-cvs] src: Makefile: Update ath_hal

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update ath_hal

Modified Files:
--------------
    src/sys/modules/ath_hal:
        Makefile (r1.1.1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sys/modules/ath_hal/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/modules/ath_hal/Makefile -L sys/modules/ath_hal/Makefile -u -r1.1.1.1 -r1.2
--- sys/modules/ath_hal/Makefile
+++ sys/modules/ath_hal/Makefile
@@ -33,7 +33,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGES.
 #
-# $FreeBSD: src/sys/modules/ath_hal/Makefile,v 1.4 2005/01/18 03:28:08 sam Exp $
+# $FreeBSD: src/sys/modules/ath_hal/Makefile,v 1.8 2006/09/18 16:49:15 sam Exp $
 #
 
 #
@@ -44,30 +44,32 @@
 # 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
-ATH_MODULE_ARCH=${MACHINE_ARCH:S/amd64/x86_64/}
-
-.if defined(HAL_SRC)
-.include "${HAL}/freebsd/Makefile.inc"
+.if ${MACHINE_ARCH} == "amd64"
+ATH_MODULE_ARCH=x86_64
+.elif ${MACHINE_ARCH} == "sparc64"
+ATH_MODULE_ARCH=sparc64-be
+.elif ${MACHINE_ARCH} == "powerpc"
+ATH_MODULE_ARCH=powerpc-be
 .else
+ATH_MODULE_ARCH=${MACHINE_ARCH}
+.endif
 
 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>