patch-2.4.0-test7 linux/drivers/usb/Makefile

• Lines: 95
• Date: Tue Aug 22 11:41:14 2000
• Orig file: v2.4.0-test6/linux/drivers/usb/Makefile
• Orig date: Wed Aug 9 19:19:51 2000

diff -u --recursive --new-file v2.4.0-test6/linux/drivers/usb/Makefile linux/drivers/usb/Makefile
@@ -17,7 +17,7 @@
 
 # Objects that export symbols.
 
-export-objs		:= usb.o input.o
+export-objs		:= usb.o
 
 # Multipart objects.
 
@@ -37,27 +37,6 @@
 obj-n	:=
 obj-	:=
 
-# Object files in subdirectories
-
-ifeq ($(CONFIG_USB_SERIAL),y)
-	SUB_DIRS += serial
-	obj-y += serial/usb-serial.o
-else
-	ifeq ($(CONFIG_USB_SERIAL),m)
-		MOD_IN_SUB_DIRS += serial
-	endif
-endif
-
-ifeq ($(CONFIG_USB_STORAGE),y)
-	SUB_DIRS += storage
-	obj-y += storage/usb-storage.o
-else
-	ifeq ($(CONFIG_USB_STORAGE),m)
-		MOD_IN_SUB_DIRS += storage
-	endif
-endif
-
-
 # Each configuration option enables a list of files.
 
 obj-$(CONFIG_USB)		+= usbcore.o
@@ -65,15 +44,10 @@
 obj-$(CONFIG_USB_UHCI_ALT)	+= uhci.o
 obj-$(CONFIG_USB_OHCI)		+= usb-ohci.o
 
-obj-$(CONFIG_USB_MOUSE)		+= usbmouse.o input.o
-obj-$(CONFIG_USB_HID)		+= hid.o input.o
-obj-$(CONFIG_USB_KBD)		+= usbkbd.o input.o
-obj-$(CONFIG_USB_WACOM)		+= wacom.o input.o
-obj-$(CONFIG_INPUT_IFORCE)	+= iforce.o input.o
-obj-$(CONFIG_INPUT_KEYBDEV)	+= keybdev.o input.o
-obj-$(CONFIG_INPUT_MOUSEDEV)	+= mousedev.o input.o
-obj-$(CONFIG_INPUT_JOYDEV)	+= joydev.o input.o
-obj-$(CONFIG_INPUT_EVDEV)	+= evdev.o input.o
+obj-$(CONFIG_USB_MOUSE)		+= usbmouse.o
+obj-$(CONFIG_USB_HID)		+= hid.o
+obj-$(CONFIG_USB_KBD)		+= usbkbd.o
+obj-$(CONFIG_USB_WACOM)		+= wacom.o
 
 obj-$(CONFIG_USB_SCANNER)	+= scanner.o
 obj-$(CONFIG_USB_ACM)		+= acm.o
@@ -92,6 +66,26 @@
 obj-$(CONFIG_USB_MICROTEK)	+= microtek.o
 obj-$(CONFIG_USB_BLUETOOTH)	+= bluetooth.o
 
+# Object files in subdirectories
+
+ifeq ($(CONFIG_USB_SERIAL),y)
+	SUB_DIRS += serial
+	obj-y += serial/usb-serial.o
+else
+	ifeq ($(CONFIG_USB_SERIAL),m)
+		MOD_IN_SUB_DIRS += serial
+	endif
+endif
+
+ifeq ($(CONFIG_USB_STORAGE),y)
+	SUB_DIRS += storage
+	obj-y += storage/usb-storage.o
+else
+	ifeq ($(CONFIG_USB_STORAGE),m)
+		MOD_IN_SUB_DIRS += storage
+	endif
+endif
+
 # Extract lists of the multi-part drivers.
 # The 'int-*' lists are the intermediate files used to build the multi's.
 
@@ -111,8 +105,8 @@
 
 # Translate to Rules.make lists.
 
-O_OBJS		:= $(sort $(filter-out $(export-objs), $(obj-y)))
-OX_OBJS		:= $(sort $(filter     $(export-objs), $(obj-y)))
+O_OBJS		:= $(filter-out $(export-objs), $(obj-y))
+OX_OBJS		:= $(filter     $(export-objs), $(obj-y))
 M_OBJS		:= $(sort $(filter-out $(export-objs), $(obj-m)))
 MX_OBJS		:= $(sort $(filter     $(export-objs), $(obj-m)))
 MI_OBJS		:= $(sort $(filter-out $(export-objs), $(int-m)))