patch-2.3.34 linux/drivers/char/Makefile

• Lines: 101
• Date: Thu Dec 16 13:59:38 1999
• Orig file: v2.3.33/linux/drivers/char/Makefile
• Orig date: Tue Dec 14 01:27:23 1999

diff -u --recursive --new-file v2.3.33/linux/drivers/char/Makefile linux/drivers/char/Makefile
@@ -23,35 +23,54 @@
 O_OBJS   := tty_io.o n_tty.o tty_ioctl.o mem.o random.o raw.o
 OX_OBJS  := pty.o misc.o
 
+KEYMAP   =defkeymap.o
+KEYBD    =pc_keyb.o
+CONSOLE  =console.o
+SERIAL   =serial.o
+
+ifeq ($(ARCH),m68k)
+  KEYMAP   =
+  KEYBD    =
+endif
+
+ifeq ($(ARCH),arm)
+  KEYMAP   =
+  KEYBD    =
+  CONSOLE  =
+  SERIAL   =
+endif
+
+ifneq ($(CONFIG_SUN_SERIAL),)
+  SERIAL   =
+endif
+
 ifdef CONFIG_VT
 O_OBJS += vt.o vc_screen.o consolemap.o consolemap_deftbl.o
-OX_OBJS += console.o selection.o
+OX_OBJS += $(CONSOLE) selection.o
 endif
 
 ifeq ($(CONFIG_SERIAL),y)
-  ifeq ($(CONFIG_SUN_SERIAL),)
-  OX_OBJS += serial.o
-  endif
+OX_OBJS += $(SERIAL)
 else
   ifeq ($(CONFIG_SERIAL),m)
-    ifeq ($(CONFIG_SUN_SERIAL),)
-    MX_OBJS += serial.o
-    endif
+  MX_OBJS += $(SERIAL)
   endif
 endif
 
-ifndef CONFIG_SUN_KEYBOARD
-ifdef CONFIG_VT
-OX_OBJS += keyboard.o
-endif
- ifneq ($(ARCH),m68k)
-   O_OBJS += pc_keyb.o defkeymap.o
- endif
-else
-ifdef CONFIG_PCI
-O_OBJS += defkeymap.o
-OX_OBJS += keyboard.o
+ifeq ($(CONFIG_SERIAL_21285),y)
+O_OBJS += serial_21285.o
 endif
+
+ifndef CONFIG_SUN_KEYBOARD
+  ifdef CONFIG_VT
+    OX_OBJS += keyboard.o
+    O_OBJS  += $(KEYMAP) $(KEYBD)
+  endif
+else
+  ifdef CONFIG_PCI
+    OX_OBJS += keyboard.o
+    O_OBJS  += $(KEYMAP)
+  endif
 endif
 
 ifdef CONFIG_MAGIC_SYSRQ
@@ -360,12 +379,12 @@
 endif
 
 ifeq ($(CONFIG_VIDEO_BT848),y)
-O_OBJS += bttv.o msp3400.o
+O_OBJS += bttv.o msp3400.o tda8425.o tda9855.o tea6300.o
 L_I2C=y
 L_TUNERS=y
 else
   ifeq ($(CONFIG_VIDEO_BT848),m)
-    M_OBJS += bttv.o msp3400.o
+    M_OBJS += bttv.o msp3400.o tda8425.o tda9855.o tea6300.o
     M_I2C=y
     M_TUNERS=y
   endif
@@ -614,10 +633,10 @@
 
 # set when a framegrabber implements i2c support
 ifeq ($(L_I2C),y)
-OX_OBJS += i2c.o
+OX_OBJS += i2c-old.o
 else
  ifeq ($(M_I2C),y)
- MX_OBJS += i2c.o
+ MX_OBJS += i2c-old.o
   endif
 endif