svn commit: r217738 - head/tools/tools/ath/athstats

[Adrian Chadd]

Author: adrian
Date: Sat Jan 22 23:37:42 2011
New Revision: 217738
URL: http://svn.freebsd.org/changeset/base/217738

Log:
  Patch the athstats code/Makefile to cross-compile correctly.

Modified:
  head/tools/tools/ath/athstats/Makefile
  head/tools/tools/ath/athstats/athstats.c

Modified: head/tools/tools/ath/athstats/Makefile
==============================================================================
--- head/tools/tools/ath/athstats/Makefile	Sat Jan 22 23:30:01 2011	(r217737)
+++ head/tools/tools/ath/athstats/Makefile	Sat Jan 22 23:37:42 2011	(r217738)
@@ -1,28 +1,26 @@
 # $FreeBSD$
 
-PROG=	athstats
+.PATH:	${.CURDIR}/../../../../sys/dev/ath/ath_hal
 
-SRCS=	main.c statfoo.c athstats.c
+PROG=	athstats
 
-.include <bsd.prog.mk>
+SRCS=	main.c statfoo.c athstats.c opt_ah.h ah_osdep.h
 
-SRCDIR=	${.CURDIR}/../../../..
+CLEANFILES+=	opt_ah.h
 
-CLEANFILES+= opt_ah.h ah_osdep.h
+.include <../Makefile.inc>
 
 CFLAGS+=-DATH_SUPPORT_ANI
 CFLAGS+=-DATH_SUPPORT_TDMA
 
-CFLAGS+=-I${.CURDIR}
-CFLAGS+=-I${SRCDIR}/sys/net80211
-
-.include <../Makefile.inc>
-
-athstats.o: opt_ah.h ah_osdep.h
-
 opt_ah.h:
-	touch opt_ah.h
+	echo "#define AH_DEBUG 1" > opt_ah.h
+	echo "#define AH_DEBUG_COUNTRY 1" >> opt_ah.h
+	echo "#define AH_SUPPORT_AR5416 1" >> opt_ah.h
+
 ah_osdep.h:
 	echo 'typedef void *HAL_SOFTC;' >ah_osdep.h
 	echo 'typedef int HAL_BUS_TAG;' >>ah_osdep.h
 	echo 'typedef void *HAL_BUS_HANDLE;' >>ah_osdep.h
+
+.include <bsd.prog.mk>

Modified: head/tools/tools/ath/athstats/athstats.c
==============================================================================
--- head/tools/tools/ath/athstats/athstats.c	Sat Jan 22 23:30:01 2011	(r217737)
+++ head/tools/tools/ath/athstats/athstats.c	Sat Jan 22 23:37:42 2011	(r217738)
@@ -29,6 +29,8 @@
  * $FreeBSD$
  */
 
+#include "opt_ah.h"
+
 /*
  * ath statistics class.
  */