patch-2.4.0-test5 linux/drivers/char/Makefile

• Lines: 70
• Date: Fri Jul 21 14:21:06 2000
• Orig file: v2.4.0-test4/linux/drivers/char/Makefile
• Orig date: Mon Jul 10 16:47:22 2000

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/char/Makefile linux/drivers/char/Makefile
@@ -38,7 +38,10 @@
 
 export-objs     :=	busmouse.o console.o i2c-old.o keyboard.o sysrq.o \
 			misc.o pty.o random.o selection.o serial.o videodev.o \
-			tty_io.o bttv.o cpia.o
+			tty_io.o bttv-if.o cpia.o
+
+list-multi	:=	bttv.o
+bttv-objs	:=	bttv-driver.o bttv-cards.o bttv-if.o
 
 KEYMAP   =defkeymap.o
 KEYBD    =pc_keyb.o
@@ -62,28 +65,22 @@
 endif
 
 ifeq ($(ARCH),arm)
+# we actually need to be able to select various different keymaps
+# and keyboards dependent on which actual machine we're going to
+# run on.
   KEYMAP   =
   KEYBD    =
-  CONSOLE  =
 endif
 
 ifeq ($(ARCH),sh)
   KEYMAP   =
   KEYBD    =
   CONSOLE  =
-  SERIAL =
   ifeq ($(CONFIG_SH_HP600),y)
   KEYMAP   = defkeymap.o
   KEYBD    = scan_keyb.o hp600_keyb.o
   CONSOLE  = console.o
   endif
-  ifeq ($(CONFIG_SERIAL),y)
-  SERIAL = generic_serial.o sh-sci.o
-  else
-    ifeq ($(CONFIG_SERIAL),m)
-    SERIAL = sh-sci.o
-    endif
-  endif
 endif
 
 ifeq ($(CONFIG_DECSTATION),y)
@@ -144,7 +141,7 @@
 # So this should simply provide the wanted functionality!
 obj-$(CONFIG_SX) += sx.o generic_serial.o
 obj-$(CONFIG_RIO) += rio/rio.o generic_serial.o
-
+obj-$(CONFIG_SH_SCI) += sh-sci.o generic_serial.o
 
 ifeq ($(CONFIG_RIO),y)
   SUB_DIRS += rio
@@ -371,6 +368,8 @@
 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)))
 
 include $(TOPDIR)/Rules.make
 
@@ -389,3 +388,7 @@
 
 zoran.o: zr36120.o zr36120_i2c.o zr36120_mem.o
 	$(LD) $(LD_RFLAG) -r -o $@ zr36120.o zr36120_i2c.o zr36120_mem.o
+
+bttv.o: $(bttv-objs)
+	$(LD) $(LD_RFLAG) -r -o $@ $(bttv-objs)
+