patch-2.3.13 linux/drivers/usb/Makefile

Next file: linux/drivers/usb/README.acm
Previous file: linux/drivers/usb/Config.in
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.12/linux/drivers/usb/Makefile linux/drivers/usb/Makefile
@@ -85,6 +85,15 @@
   MIX_OBJS += printer.o  
 endif
 
+ifeq ($(CONFIG_USB_CPIA),y)
+  L_OBJS += cpia.o
+endif
+
+ifeq ($(CONFIG_USB_CPIA),m)
+  M_OBJS += cpia.o
+  MIX_OBJS += cpia.o  
+endif
+
 ifeq ($(CONFIG_USB_KBD),y)
   L_OBJS += keyboard.o keymap.o
 endif
@@ -119,6 +128,14 @@
   endif
 endif
 
+ifeq ($(CONFIG_USB_SCSI),m)
+  M_OBJS += usb-scsi.o
+  MIX_OBJS += usb_scsi.o
+  ifeq ($(CONFIG_USB_SCSI_DEBUG),y)
+    MIX_OBJS += usb_scsi_debug.o
+  endif
+endif
+
 ifeq ($(CONFIG_USB_EZUSB),y)
   L_OBJS += ezusb.o
 endif
@@ -128,6 +145,15 @@
   MIX_OBJS += ezusb.o
 endif
 
+ifeq ($(CONFIG_USB_USS720),y)
+  L_OBJS += uss720.o
+endif
+
+ifeq ($(CONFIG_USB_USS720),m)
+  M_OBJS += uss720.o
+  MIX_OBJS += uss720.o
+endif
+
 include $(TOPDIR)/Rules.make
 
 keymap.o: keymap.c
@@ -145,6 +171,14 @@
 else
 usb-keyboard.o: keymap-mac.o keyboard.o
 	$(LD) $(LD_RFLAG) -r -o $@  keymap-mac.o keyboard.o 
+endif
+
+ifeq ($(CONFIG_USB_SCSI_DEBUG),y)
+usb-scsi.o: usb_scsi.o usb_scsi_debug.o
+	$(LD) $(LD_RFLAG) -r -o $@  usb_scsi.o usb_scsi_debug.o 
+else
+usb-scsi.o: usb_scsi.o
+	$(LD) $(LD_RFLAG) -r -o $@  usb_scsi.o
 endif
 
 usb-uhci.o: uhci.o uhci-debug.o 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)