[src/trunk]: src/sys/rump Move the net80211 support component into the proper...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/da03c3514b2b
branches:  trunk
changeset: 751499:da03c3514b2b
user:      pooka <pooka%NetBSD.org@localhost>
date:      Fri Feb 05 22:01:38 2010 +0000

description:
Move the net80211 support component into the proper place in "net"
and install as rumpnet_net80211.

diffstat:

 sys/rump/dev/wip/Makefile                  |   4 ++--
 sys/rump/dev/wip/libnet80211/Makefile      |  19 -------------------
 sys/rump/dev/wip/libnet80211/shlib_version |   4 ----
 sys/rump/net/Makefile.rumpnet              |   4 ++--
 sys/rump/net/lib/libnet80211/Makefile      |  18 ++++++++++++++++++
 sys/rump/net/lib/libnet80211/shlib_version |   4 ++++
 6 files changed, 26 insertions(+), 27 deletions(-)

diffs (87 lines):

diff -r 0bb1f36c4f7f -r da03c3514b2b sys/rump/dev/wip/Makefile
--- a/sys/rump/dev/wip/Makefile Fri Feb 05 21:58:41 2010 +0000
+++ b/sys/rump/dev/wip/Makefile Fri Feb 05 22:01:38 2010 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile,v 1.4 2010/01/11 02:15:38 pooka Exp $
+#      $NetBSD: Makefile,v 1.5 2010/02/05 22:01:38 pooka Exp $
 #
 
-SUBDIR=        libnet80211 librumpusbhc libucom libumass libulpt libusb libusbrum
+SUBDIR=        librumpusbhc libucom libumass libulpt libusb libusbrum
 SUBDIR+=libums libukbd
 
 SUBDIR+=libwscons
diff -r 0bb1f36c4f7f -r da03c3514b2b sys/rump/dev/wip/libnet80211/Makefile
--- a/sys/rump/dev/wip/libnet80211/Makefile     Fri Feb 05 21:58:41 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-#      $NetBSD: Makefile,v 1.1 2009/10/04 10:40:40 pooka Exp $
-#
-
-.PATH: ${.CURDIR}/../../../../net80211
-
-LIB=   rumpdev_net80211
-
-SRCS=   ieee80211.c ieee80211_acl.c ieee80211_amrr.c ieee80211_crypto.c        \
-       ieee80211_crypto_ccmp.c ieee80211_crypto_none.c                 \
-       ieee80211_crypto_tkip.c ieee80211_crypto_wep.c ieee80211_input.c\
-       ieee80211_ioctl.c ieee80211_netbsd.c ieee80211_node.c           \
-       ieee80211_output.c ieee80211_proto.c ieee80211_rssadapt.c       \
-       ieee80211_xauth.c
-
-CFLAGS+=       -Wno-pointer-sign
-CPPFLAGS+=     -I${.CURDIR}/opt -I${RUMPTOP}/librump/rumpnet/opt
-
-.include <bsd.lib.mk>
-.include <bsd.klinks.mk>
diff -r 0bb1f36c4f7f -r da03c3514b2b sys/rump/dev/wip/libnet80211/shlib_version
--- a/sys/rump/dev/wip/libnet80211/shlib_version        Fri Feb 05 21:58:41 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#      $NetBSD: shlib_version,v 1.1 2009/10/04 10:40:40 pooka Exp $
-#
-major=0
-minor=0
diff -r 0bb1f36c4f7f -r da03c3514b2b sys/rump/net/Makefile.rumpnet
--- a/sys/rump/net/Makefile.rumpnet     Fri Feb 05 21:58:41 2010 +0000
+++ b/sys/rump/net/Makefile.rumpnet     Fri Feb 05 22:01:38 2010 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile.rumpnet,v 1.5 2009/02/28 15:28:45 pooka Exp $
+#      $NetBSD: Makefile.rumpnet,v 1.6 2010/02/05 22:01:38 pooka Exp $
 #
 
-RUMPNETLIST=   sockin shmif virtif net netinet local
+RUMPNETLIST=   net net80211 netinet local sockin shmif virtif
 
 .for var in ${RUMPNETLIST}
 RUMPNETLIBS+=lib${var}
diff -r 0bb1f36c4f7f -r da03c3514b2b sys/rump/net/lib/libnet80211/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/net/lib/libnet80211/Makefile     Fri Feb 05 22:01:38 2010 +0000
@@ -0,0 +1,18 @@
+#      $NetBSD: Makefile,v 1.1 2010/02/05 22:01:38 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../net80211
+
+LIB=   rumpnet_net80211
+
+SRCS=   ieee80211.c ieee80211_acl.c ieee80211_amrr.c ieee80211_crypto.c        \
+       ieee80211_crypto_ccmp.c ieee80211_crypto_none.c                 \
+       ieee80211_crypto_tkip.c ieee80211_crypto_wep.c ieee80211_input.c\
+       ieee80211_ioctl.c ieee80211_netbsd.c ieee80211_node.c           \
+       ieee80211_output.c ieee80211_proto.c ieee80211_rssadapt.c       \
+       ieee80211_xauth.c
+
+CFLAGS+=       -Wno-pointer-sign
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
diff -r 0bb1f36c4f7f -r da03c3514b2b sys/rump/net/lib/libnet80211/shlib_version
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/rump/net/lib/libnet80211/shlib_version        Fri Feb 05 22:01:38 2010 +0000
@@ -0,0 +1,4 @@
+#      $NetBSD: shlib_version,v 1.1 2010/02/05 22:01:38 pooka Exp $
+#
+major=0
+minor=0