patch-1.3.58 linux/drivers/char/Makefile

Next file: linux/drivers/char/apm_bios.c
Previous file: linux/drivers/char/Config.in
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.57/linux/drivers/char/Makefile linux/drivers/char/Makefile
@@ -95,6 +95,7 @@
 ifdef CONFIG_SOFT_WATCHDOG
 L_OBJS += softdog.o
 M = y
+# This is not modularized, so if configured then "mouse.c" will be resident
 endif
 
 ifdef CONFIG_QIC02_TAPE
@@ -106,16 +107,20 @@
 endif
 
 ifdef M
-L_OBJS += mouse.o
+LX_OBJS += mouse.o
 else
   ifdef MM
-  M_OBJS += mouse.o
+  MX_OBJS += mouse.o
   endif
 endif
-  
-ifdef CONFIG_SCC
+
+ifeq ($(CONFIG_SCC),y)
 L_OBJS += scc.o
-endif
+else
+  ifeq ($(CONFIG_SCC),m)
+  M_OBJS += scc.o
+  endif
+endif  
 
 ifdef CONFIG_TGA_CONSOLE
 L_OBJS += tga.o

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