patch-2.1.123 linux/drivers/char/Makefile

• Lines: 196
• Date: Sat Sep 26 23:28:08 1998
• Orig file: v2.1.122/linux/drivers/char/Makefile
• Orig date: Thu Sep 17 17:53:35 1998

diff -u --recursive --new-file v2.1.122/linux/drivers/char/Makefile linux/drivers/char/Makefile
@@ -21,7 +21,7 @@
 L_TARGET := char.a
 M_OBJS   :=
 L_OBJS   := tty_io.o n_tty.o tty_ioctl.o mem.o random.o
-LX_OBJS  := pty.o
+LX_OBJS  := pty.o misc.o
 
 ifdef CONFIG_VT
 L_OBJS += vt.o vc_screen.o consolemap.o consolemap_deftbl.o
@@ -136,22 +136,18 @@
 endif
 
 ifeq ($(CONFIG_ATIXL_BUSMOUSE),y)
-M = y
 L_OBJS += atixlmouse.o
 else
   ifeq ($(CONFIG_ATIXL_BUSMOUSE),m)
   M_OBJS += atixlmouse.o
-  MM = m
   endif
 endif
 
 ifeq ($(CONFIG_BUSMOUSE),y)
-M = y
 L_OBJS += busmouse.o
 else
   ifeq ($(CONFIG_BUSMOUSE),m)
   M_OBJS += busmouse.o
-  MM = m
   endif
 endif
 
@@ -172,135 +168,109 @@
 endif
 
 ifeq ($(CONFIG_MS_BUSMOUSE),y)
-M = y
 L_OBJS += msbusmouse.o
 else
   ifeq ($(CONFIG_MS_BUSMOUSE),m)
   M_OBJS += msbusmouse.o
-  MM = m
+  endif
+endif
+
+ifeq ($(CONFIG_82C710_MOUSE),y)
+L_OBJS += qpmouse.o
+else
+  ifeq ($(CONFIG_82C710_MOUSE),m)
+  M_OBJS += qpmouse.o
   endif
 endif
 
 ifeq ($(CONFIG_PSMOUSE),y)
-M = y
 L_OBJS += psaux.o
 else
   ifeq ($(CONFIG_PSMOUSE),m)
   M_OBJS += psaux.o
-  MM = m
   endif
 endif
 
-ifeq ($(CONFIG_UMISC),y)
-# To support third-party modules, misc.c must reside in the kernel
-M = y
-endif
-
 ifeq ($(CONFIG_SOFT_WATCHDOG),y)
-M = y
 L_OBJS += softdog.o
 else
   ifeq ($(CONFIG_SOFT_WATCHDOG),m)
   M_OBJS += softdog.o
-  MM = m
   endif   
 endif
 
 ifeq ($(CONFIG_PCWATCHDOG),y)
-M = y
 L_OBJS += pcwd.o
 else
   ifeq ($(CONFIG_PCWATCHDOG),m)
   M_OBJS += pcwd.o
-  MM = m
   endif
 endif
 
 ifeq ($(CONFIG_ACQUIRE_WDT),y)
-M = y
 L_OBJS += acquirewdt.o
 else
   ifeq ($(CONFIG_ACQUIRE_WDT),m)
   M_OBJS += acquirewdt.o
-  MM = m
   endif
 endif
 
 ifeq ($(CONFIG_AMIGAMOUSE),y)
-M = y
 L_OBJS += amigamouse.o
 else
   ifeq ($(CONFIG_AMIGAMOUSE),m)
     M_OBJS += amigamouse.o
-    MM = m
   endif
 endif
 
 ifeq ($(CONFIG_ATARIMOUSE),y)
-M = y
 L_OBJS += atarimouse.o
 else
   ifeq ($(CONFIG_ATARIMOUSE),m)
     M_OBJS += atarimouse.o
-    MM = m
   endif
 endif
 
 ifeq ($(CONFIG_MACMOUSE),y)
-M = y
 L_OBJS += macmouse.o
 else
   ifeq ($(CONFIG_MACMOUSE),m)
     M_OBJS += macmouse.o
-    MM = m
   endif
 endif
 
-ifdef CONFIG_SUN_MOUSE
-M = y
-endif
-
 ifeq ($(CONFIG_PC110_PAD),y)
-M = y
 L_OBJS += pc110pad.o
 else
   ifeq ($(CONFIG_PC110_PAD),m)
     M_OBJS += pc110pad.o
-    MM = m
   endif
 endif
 
 ifeq ($(CONFIG_SUN_OPENPROMIO),y)
-M = y
 else
   ifeq ($(CONFIG_SUN_OPENPROMIO),m)
-  MM = m
   endif
 endif
 
 ifeq ($(CONFIG_WDT),y)
-M = y
 L_OBJS += wdt.o
 else
   ifeq ($(CONFIG_WDT),m)
     M_OBJS += wdt.o
-    MM = m
   endif
 endif
 
 ifeq ($(CONFIG_RTC),y)
-M = y
 L_OBJS += rtc.o
 endif
 
 ifeq ($(CONFIG_NVRAM),y)
-M = y
   ifeq ($(CONFIG_PMAC)$(CONFIG_CHRP),)
   L_OBJS += nvram.o
   endif
 else
   ifeq ($(CONFIG_NVRAM),m)
-    MM = m
     ifeq ($(CONFIG_PMAC)$(CONFIG_CHRP),)
     M_OBJS += nvram.o
     endif
@@ -437,19 +407,6 @@
 
 ifdef CONFIG_H8
 LX_OBJS += h8.o
-M = y
-endif
-
-ifdef CONFIG_APM
-M = y
-endif
-
-ifdef M
-LX_OBJS += misc.o
-else
-  ifdef MM
-  MX_OBJS += misc.o
-  endif
 endif
 
 ifeq ($(L_I2C),y)