o move programs to separate directories and use stock Makefiles;

this simplifies including them in crunchgen images o rename 80211* programs to wlan* as was originally intended
author: sam <sam@FreeBSD.org> 2005-12-11 23:13:54 +0000
committer: sam <sam@FreeBSD.org> 2005-12-11 23:13:54 +0000
commit: 310b3b7c691095359894a5706f08971dda87e6da (patch)
tree: 7cc1897d379269041a42fb870f9dfa4bc7285c97 /tools
parent: 97e6ad836b1f63ecaf625de97528f0f7ee3ebeb3 (diff)
download: FreeBSD-src-310b3b7c691095359894a5706f08971dda87e6da.zip
FreeBSD-src-310b3b7c691095359894a5706f08971dda87e6da.tar.gz
11 files changed, 39 insertions, 50 deletions
diff --git a/tools/tools/ath/Makefile b/tools/tools/ath/Makefile
index 899ef47..34c732a 100644
--- a/tools/tools/ath/Makefile
+++ b/tools/tools/ath/Makefile
@@ -1,51 +1,5 @@
 #	$FreeBSD$
-#
-# Copyright (c) 2002, 2003	Sam Leffler, Errno Consulting
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-BINDIR=	/usr/local/bin
 
-ALL=	athstats 80211stats 80211watch athdebug 80211debug
+SUBDIR=	athstats athdebug
 
-all:	${ALL}
-
-athstats: athstats.c
-	${CC} -o athstats athstats.c
-athdebug: athdebug.c
-	${CC} -o athdebug athdebug.c
-80211stats: 80211stats.c
-	${CC} -o 80211stats 80211stats.c
-80211watch: 80211watch.c
-	${CC} -o 80211watch 80211watch.c
-80211debug: 80211debug.c
-	${CC} -o 80211debug 80211debug.c
-install: ${ALL}
-	install athstats ${DESTDIR}${BINDIR}
-	install 80211stats ${DESTDIR}${BINDIR}
-	install 80211watch ${DESTDIR}${BINDIR}
-	install 80211debug ${DESTDIR}${BINDIR}
-	install athdebug ${DESTDIR}${BINDIR}
-
-clean:
-	rm -f ${ALL} core a.out
+.include <bsd.subdir.mk>
diff --git a/tools/tools/ath/athdebug/Makefile b/tools/tools/ath/athdebug/Makefile
new file mode 100644
index 0000000..ad46020
--- /dev/null
+++ b/tools/tools/ath/athdebug/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG    = athdebug
+BINDIR	= /usr/local/bin
+NO_MAN	= noman
+
+.include <bsd.prog.mk>
diff --git a/tools/tools/ath/athdebug.c b/tools/tools/ath/athdebug/athdebug.c
index 06591cd..06591cd 100644
--- a/tools/tools/ath/athdebug.c
+++ b/tools/tools/ath/athdebug/athdebug.c
diff --git a/tools/tools/ath/athstats/Makefile b/tools/tools/ath/athstats/Makefile
new file mode 100644
index 0000000..df04b5d
--- /dev/null
+++ b/tools/tools/ath/athstats/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG    = athstats
+BINDIR	= /usr/local/bin
+NO_MAN	= noman
+
+.include <bsd.prog.mk>
diff --git a/tools/tools/ath/athstats.c b/tools/tools/ath/athstats/athstats.c
index ed3a35b..ed3a35b 100644
--- a/tools/tools/ath/athstats.c
+++ b/tools/tools/ath/athstats/athstats.c
diff --git a/tools/tools/net80211/wlandebug/Makefile b/tools/tools/net80211/wlandebug/Makefile
new file mode 100644
index 0000000..26e6e51
--- /dev/null
+++ b/tools/tools/net80211/wlandebug/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG    = wlandebug
+BINDIR	= /usr/local/bin
+NO_MAN	= noman
+
+.include <bsd.prog.mk>
diff --git a/tools/tools/ath/80211debug.c b/tools/tools/net80211/wlandebug/wlandebug.c
index 1c65eaa..4d1bfd0 100644
--- a/tools/tools/ath/80211debug.c
+++ b/tools/tools/net80211/wlandebug/wlandebug.c
@@ -37,7 +37,7 @@
  */
 
 /*
- * 80211debug [-i interface] flags
+ * wlandebug [-i interface] flags
  * (default interface is wlan.0).
  */
 #include <sys/types.h>
diff --git a/tools/tools/net80211/wlanstats/Makefile b/tools/tools/net80211/wlanstats/Makefile
new file mode 100644
index 0000000..3e2f726
--- /dev/null
+++ b/tools/tools/net80211/wlanstats/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG    = wlanstats
+BINDIR	= /usr/local/bin
+NO_MAN	= noman
+
+.include <bsd.prog.mk>
diff --git a/tools/tools/ath/80211stats.c b/tools/tools/net80211/wlanstats/wlanstats.c
index 4917b16..133a2b5 100644
--- a/tools/tools/ath/80211stats.c
+++ b/tools/tools/net80211/wlanstats/wlanstats.c
@@ -37,7 +37,7 @@
  */
 
 /*
- * 80211stats [-i interface]
+ * wlanstats [-i interface]
  * (default interface is ath0).
  */
 #include <sys/types.h>
diff --git a/tools/tools/net80211/wlanwatch/Makefile b/tools/tools/net80211/wlanwatch/Makefile
new file mode 100644
index 0000000..e1f8dfe
--- /dev/null
+++ b/tools/tools/net80211/wlanwatch/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PROG    = wlanwatch
+BINDIR	= /usr/local/bin
+NO_MAN	= noman
+
+.include <bsd.prog.mk>
diff --git a/tools/tools/ath/80211watch.c b/tools/tools/net80211/wlanwatch/wlanwatch.c
index c169f99..c169f99 100644
--- a/tools/tools/ath/80211watch.c
+++ b/tools/tools/net80211/wlanwatch/wlanwatch.c
author	sam <sam@FreeBSD.org>	2005-12-11 23:13:54 +0000
committer	sam <sam@FreeBSD.org>	2005-12-11 23:13:54 +0000
commit	310b3b7c691095359894a5706f08971dda87e6da (patch)
tree	7cc1897d379269041a42fb870f9dfa4bc7285c97 /tools
parent	97e6ad836b1f63ecaf625de97528f0f7ee3ebeb3 (diff)
download	FreeBSD-src-310b3b7c691095359894a5706f08971dda87e6da.zip FreeBSD-src-310b3b7c691095359894a5706f08971dda87e6da.tar.gz