From owner-svn-src-all@FreeBSD.ORG  Sat Jan 22 23:37:42 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D7AE2106564A;
	Sat, 22 Jan 2011 23:37:42 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C63488FC0A;
	Sat, 22 Jan 2011 23:37:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0MNbgih008391;
	Sat, 22 Jan 2011 23:37:42 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0MNbg8c008388;
	Sat, 22 Jan 2011 23:37:42 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201101222337.p0MNbg8c008388@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 22 Jan 2011 23:37:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217738 - head/tools/tools/ath/athstats
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Jan 2011 23:37:42 -0000

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.
  */