From d4cd2f9764e97b47a501ec40c083dd0f29e2bf64 Mon Sep 17 00:00:00 2001 From: adrian Date: Sat, 16 May 2015 06:18:39 +0000 Subject: [PATCH] Make these all work with the new way of doing privatelib. Without these CFLAGS settings a cross-compile won't find the headers anywhere. Tested: * mips (32, big endian) cross-build w/ LOCAL_DIRS including these tools. --- tools/tools/ath/athaggrstats/Makefile | 1 + tools/tools/ath/athstats/Makefile | 6 ++---- tools/tools/mwl/mwlstats/Makefile | 1 + tools/tools/net80211/wlanstats/Makefile | 1 + tools/tools/npe/npestats/Makefile | 1 + 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/tools/ath/athaggrstats/Makefile b/tools/tools/ath/athaggrstats/Makefile index b6234b5fab79..2748b6f3ac12 100644 --- a/tools/tools/ath/athaggrstats/Makefile +++ b/tools/tools/ath/athaggrstats/Makefile @@ -12,6 +12,7 @@ CLEANFILES+= opt_ah.h CFLAGS+=-DATH_SUPPORT_ANI CFLAGS+=-DATH_SUPPORT_TDMA +CFLAGS+=-I${.CURDIR}/../../../../lib/libbsdstat/ LIBADD+= bsdstat opt_ah.h: diff --git a/tools/tools/ath/athstats/Makefile b/tools/tools/ath/athstats/Makefile index a7ff43b4c9c2..93f98ae3f24c 100644 --- a/tools/tools/ath/athstats/Makefile +++ b/tools/tools/ath/athstats/Makefile @@ -8,10 +8,6 @@ MAN= PROG= athstats -# Because of a clang preprocessor parser limitation causing this -# to not compile, use gcc for now. -#CC= gcc - SRCS= main.c athstats.c opt_ah.h ah_osdep.h CLEANFILES+= opt_ah.h @@ -21,6 +17,8 @@ CLEANFILES+= opt_ah.h CFLAGS+=-DATH_SUPPORT_ANI CFLAGS+=-DATH_SUPPORT_TDMA +CFLAGS+=-I${.CURDIR}/../../../../lib/libbsdstat/ + CFLAGS.clang+= -fbracket-depth=512 LIBADD= bsdstat diff --git a/tools/tools/mwl/mwlstats/Makefile b/tools/tools/mwl/mwlstats/Makefile index 16decd1a4cd0..69382b8f820a 100644 --- a/tools/tools/mwl/mwlstats/Makefile +++ b/tools/tools/mwl/mwlstats/Makefile @@ -6,6 +6,7 @@ MAN= SRCS= main.c mwlstats.c LIBADD= bsdstat +CFLAGS+=-I${.CURDIR}/../../../../lib/libbsdstat/ .include diff --git a/tools/tools/net80211/wlanstats/Makefile b/tools/tools/net80211/wlanstats/Makefile index dbd53a67e637..2d23932a62a5 100644 --- a/tools/tools/net80211/wlanstats/Makefile +++ b/tools/tools/net80211/wlanstats/Makefile @@ -6,6 +6,7 @@ PROG= wlanstats BINDIR= /usr/local/bin MAN= LIBADD= bsdstat +CFLAGS+=-I${.CURDIR}/../../../../lib/libbsdstat/ SRCS= wlanstats.c main.c diff --git a/tools/tools/npe/npestats/Makefile b/tools/tools/npe/npestats/Makefile index 20f381944776..740d3594cdcf 100644 --- a/tools/tools/npe/npestats/Makefile +++ b/tools/tools/npe/npestats/Makefile @@ -5,5 +5,6 @@ SRCS= main.c npestats.c BINDIR= /usr/local/bin MAN= LIBADD= bsdstat +CFLAGS+=-I${.CURDIR}/../../../../lib/libbsdstat/ .include