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

• Lines: 44
• Date: Tue Oct 31 10:30:43 2000
• Orig file: v2.4.0-test9/linux/drivers/usb/Makefile
• Orig date: Sun Oct 8 10:50:30 2000

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/usb/Makefile linux/drivers/usb/Makefile
@@ -21,7 +21,7 @@
 # Multipart objects.
 
 list-multi		:= usbcore.o
-usbcore-objs		:= usb.o usb-debug.o usb-core.o hub.o
+usbcore-objs		:= usb.o usb-debug.o hub.o
 
 # Optional parts of multipart objects.
 
@@ -86,27 +86,14 @@
 	endif
 endif
 
-# Extract lists of the multi-part drivers.
-# The 'int-*' lists are the intermediate files used to build the multi's.
-
-multi-y		:= $(filter $(list-multi), $(obj-y))
-multi-m		:= $(filter $(list-multi), $(obj-m))
-int-y		:= $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
-int-m		:= $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
-
-# Files that are both resident and modular: remove from modular.
-
-obj-m		:= $(filter-out $(obj-y), $(obj-m))
-int-m		:= $(filter-out $(int-y), $(int-m))
-
 # Translate to Rules.make lists.
-
-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)))
-MIX_OBJS	:= $(sort $(filter     $(export-objs), $(int-m)))
+multi-used	:= $(filter $(list-multi), $(obj-y) $(obj-m))
+multi-objs	:= $(foreach m, $(multi-used), $($(basename $(m))-objs))
+active-objs	:= $(sort $(multi-objs) $(obj-y) $(obj-m))
+
+O_OBJS		:= $(obj-y)
+M_OBJS		:= $(obj-m)
+MIX_OBJS	:= $(filter $(export-objs), $(active-objs))
 
 # The global Rules.make.