patch-2.3.22 linux/drivers/usb/Makefile

• Lines: 49
• Date: Thu Oct 14 14:22:09 1999
• Orig file: v2.3.21/linux/drivers/usb/Makefile
• Orig date: Sat Oct 9 11:47:50 1999

diff -u --recursive --new-file v2.3.21/linux/drivers/usb/Makefile linux/drivers/usb/Makefile
@@ -98,21 +98,27 @@
 endif
 
 ifeq ($(CONFIG_USB_SERIAL),y)
-  L_OBJS += serial.o
+  L_OBJS += usb-serial.o
 endif
 
 ifeq ($(CONFIG_USB_SERIAL),m)
-  M_OBJS += serial.o
-  MIX_OBJS += serial.o  
+  M_OBJS += usb-serial.o
+  MIX_OBJS += usb-serial.o  
+endif
+
+ifneq ($(CONFIG_ADB_KEYBOARD),y)
+KEYMAP=keymap
+else
+KEYMAP=keymap-mac
 endif
 
 ifeq ($(CONFIG_USB_KBD),y)
-  L_OBJS += keyboard.o keymap.o
+  L_OBJS += keyboard.o $(KEYMAP).o
 endif
 
 ifeq ($(CONFIG_USB_KBD),m)
   M_OBJS += usb-keyboard.o
-  MIX_OBJS += keyboard.o keymap.o
+  MIX_OBJS += keyboard.o $(KEYMAP).o
 endif
 
 ifeq ($(CONFIG_USB_AUDIO),y)
@@ -177,13 +183,8 @@
 keymap-mac.c: maps/mac.map maps/usb.map
 	./mkmap.adb > $@
 
-ifneq ($(CONFIG_MAC_KEYBOARD),y)
-usb-keyboard.o: keymap.o keyboard.o
-	$(LD) $(LD_RFLAG) -r -o $@  keymap.o keyboard.o 
-else
-usb-keyboard.o: keymap-mac.o keyboard.o
-	$(LD) $(LD_RFLAG) -r -o $@  keymap-mac.o keyboard.o 
-endif
+usb-keyboard.o: $(KEYMAP).o keyboard.o
+	$(LD) $(LD_RFLAG) -r -o $@  $(KEYMAP).o keyboard.o 
 
 ifeq ($(CONFIG_USB_SCSI_DEBUG),y)
 usb-scsi.o: usb_scsi.o usb_scsi_debug.o