patch-1.3.96 linux/drivers/char/Makefile

• Lines: 60
• Date: Thu Apr 25 13:27:42 1996
• Orig file: v1.3.95/linux/drivers/char/Makefile
• Orig date: Tue Apr 23 13:57:09 1996

diff -u --recursive --new-file v1.3.95/linux/drivers/char/Makefile linux/drivers/char/Makefile
@@ -20,18 +20,24 @@
 
 L_TARGET := char.a
 M_OBJS   :=
-L_OBJS   := tty_io.o n_tty.o console.o keyboard.o \
+L_OBJS   := tty_io.o n_tty.o console.o \
 	tty_ioctl.o pty.o vt.o mem.o vc_screen.o random.o \
-	defkeymap.o consolemap.o selection.o
- 
+	consolemap.o selection.o
+
 ifeq ($(CONFIG_SERIAL),y)
-LX_OBJS += serial.o
+  ifndef CONFIG_SUN_SERIAL
+  LX_OBJS += serial.o
+  endif
 else
   ifeq ($(CONFIG_SERIAL),m)
   MX_OBJS += serial.o
   endif
 endif
 
+ifndef CONFIG_SUN_KEYBOARD
+L_OBJS += keyboard.o defkeymap.o
+endif
+
 ifeq ($(CONFIG_DIGI),y)
 L_OBJS += pcxx.o
 endif
@@ -127,6 +133,10 @@
 # This is not modularized, so if configured then "misc.c" will be resident
 endif
 
+ifdef CONFIG_SUN_MOUSE
+M = y
+endif
+
 ifeq ($(CONFIG_WDT),y)
 M = y
 L_OBJS += wdt.o
@@ -167,7 +177,7 @@
   MX_OBJS += misc.o
   endif
 endif
-
+  
 ifeq ($(CONFIG_SCC),y)
 L_OBJS += scc.o
 else
@@ -179,7 +189,9 @@
 ifdef CONFIG_TGA_CONSOLE
 L_OBJS += tga.o
 else
-L_OBJS += vga.o vesa_blank.o
+ ifndef CONFIG_SUN_CONSOLE
+ L_OBJS += vga.o vesa_blank.o
+ endif
 endif
 
 include $(TOPDIR)/Rules.make