From 0141a2b113d5330bbd83311ce7c8cff983c4bb86 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Fri, 22 Aug 2003 23:51:55 +0000
Subject: [PATCH] Reintegrate the module build for usb.ko

---
 sys/bus/Makefile                           |  4 +--
 sys/bus/usb/Makefile                       | 40 ++++++++++++++--------
 sys/bus/usb/{Makefile => Makefile.usbdevs} |  7 ++--
 3 files changed, 31 insertions(+), 20 deletions(-)
 copy sys/bus/usb/{Makefile => Makefile.usbdevs} (52%)

diff --git a/sys/bus/Makefile b/sys/bus/Makefile
index c6b9659051..f49db590d4 100644
--- a/sys/bus/Makefile
+++ b/sys/bus/Makefile
@@ -1,6 +1,6 @@
-# $DragonFly: src/sys/bus/Makefile,v 1.1 2003/08/15 01:19:44 dillon Exp $
+# $DragonFly: src/sys/bus/Makefile,v 1.2 2003/08/22 23:51:52 dillon Exp $
 #
 
-SUBDIR=cam canbus firewire
+SUBDIR=cam canbus firewire usb
 
 .include <bsd.subdir.mk>
diff --git a/sys/bus/usb/Makefile b/sys/bus/usb/Makefile
index 87b2429f05..028a0fec3c 100644
--- a/sys/bus/usb/Makefile
+++ b/sys/bus/usb/Makefile
@@ -1,21 +1,33 @@
-# The files usbdevs.h and usbdevs_data.h are generated from usbdevs
+# Makefile - module build for usb.ko
 #
-# $FreeBSD: src/sys/dev/usb/Makefile.usbdevs,v 1.1.2.2 2000/05/07 14:36:41 n_hibma Exp $
-# $DragonFly: src/sys/bus/usb/Makefile,v 1.3 2003/08/15 01:19:54 dillon Exp $
+# $DragonFly: src/sys/bus/usb/Makefile,v 1.4 2003/08/22 23:51:55 dillon Exp $
 
-AWK=	awk
-UNAME=	uname
-RM=	rm
+S		 = ${.CURDIR}/../..
+.PATH:		 $S/bus/pci
 
-# The targets are always remade.
+KMOD		 = usb
+SRCS		 = bus_if.h device_if.h usb_if.h usb_if.c \
+		   vnode_if.h \
+		   opt_usb.h \
+		   hid.c hid.h usbhid.h \
+		   uhub.c \
+		   usb.c usb.h \
+		   usb_mem.h \
+		   usb_port.h \
+		   usb_quirks.c usb_quirks.h \
+		   usb_subr.c \
+		   usbdevs.h usbdevs_data.h \
+		   usbdi.c usbdi.h usbdivar.h \
+		   usbdi_util.c usbdi_util.h \
+		   usb_ethersubr.c
 
-.PHONY=	regen
+SRCS		+= uhci_pci.c uhci.c uhcireg.h uhcivar.h
+SRCS		+= ohci_pci.c ohci.c ohcireg.h ohcivar.h
+SRCS		+= opt_bus.h pci_if.h
 
-all:
-	@echo "Only the 'regen' target may be used to regenerate the"
-	@echo "usbdevs.h and usbdevs_data.h header files"
+NOMAN		 =
 
-regen:	usbdevs devlist2h.awk
-	/bin/rm -f usbdevs.h usbdevs_data.h
-	${AWK} -v type=USB -v os=`${UNAME} -s` -f devlist2h.awk usbdevs
+.include <bsd.kmod.mk>
 
+regen:
+	cd ${.CURDIR} && ${MAKE} -f Makefile.usbdevs regen
diff --git a/sys/bus/usb/Makefile b/sys/bus/usb/Makefile.usbdevs
similarity index 52%
copy from sys/bus/usb/Makefile
copy to sys/bus/usb/Makefile.usbdevs
index 87b2429f05..70f34061f5 100644
--- a/sys/bus/usb/Makefile
+++ b/sys/bus/usb/Makefile.usbdevs
@@ -1,7 +1,6 @@
 # The files usbdevs.h and usbdevs_data.h are generated from usbdevs
 #
-# $FreeBSD: src/sys/dev/usb/Makefile.usbdevs,v 1.1.2.2 2000/05/07 14:36:41 n_hibma Exp $
-# $DragonFly: src/sys/bus/usb/Makefile,v 1.3 2003/08/15 01:19:54 dillon Exp $
+# $DragonFly: src/sys/bus/usb/Attic/Makefile.usbdevs,v 1.1 2003/08/22 23:51:55 dillon Exp $
 
 AWK=	awk
 UNAME=	uname
@@ -16,6 +15,6 @@ all:
 	@echo "usbdevs.h and usbdevs_data.h header files"
 
 regen:	usbdevs devlist2h.awk
-	/bin/rm -f usbdevs.h usbdevs_data.h
-	${AWK} -v type=USB -v os=`${UNAME} -s` -f devlist2h.awk usbdevs
+	/bin/rm -f ${.CURDIR}/usbdevs.h ${.CURDIR}/usbdevs_data.h
+	cd ${.CURDIR} && ${AWK} -v type=USB -v os=`${UNAME} -s` -f devlist2h.awk usbdevs
 
-- 
2.41.0