patch-1.3.26 linux/drivers/char/Makefile

Next file: linux/drivers/char/atixlmouse.c
Previous file: linux/drivers/block/ide.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.25/linux/drivers/char/Makefile linux/drivers/char/Makefile
@@ -24,14 +24,24 @@
 L_OBJS += cyclades.o
 endif
 
-ifdef CONFIG_ATIXL_BUSMOUSE
+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
 
-ifdef CONFIG_BUSMOUSE
+ifeq ($(CONFIG_BUSMOUSE),y)
 M = y
 L_OBJS += busmouse.o
+else
+  ifeq ($(CONFIG_BUSMOUSE),m)
+  M_OBJS += busmouse.o
+  MM = m
+  endif
 endif
 
 ifeq ($(CONFIG_PRINTER),y)
@@ -42,18 +52,24 @@
   endif
 endif
 
-ifdef CONFIG_MS_BUSMOUSE
+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
 
-ifdef CONFIG_82C710_MOUSE
-CONFIG_PSMOUSE = CONFIG_PSMOUSE
-endif
-
-ifdef CONFIG_PSMOUSE
+ifeq ($(CONFIG_PSMOUSE),y)
 M = y
 L_OBJS += psaux.o
+else
+  ifeq ($(CONFIG_PSMOUSE),m)
+  M_OBJS += psaux.o
+  MM = m
+  endif
 endif
 
 ifdef CONFIG_QIC02_TAPE
@@ -62,6 +78,10 @@
 
 ifdef M
 L_OBJS += mouse.o
+else
+  ifdef MM
+  M_OBJS += mouse.o
+  endif
 endif
   
 ifdef CONFIG_SCC

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this