patch-2.2.18 linux/drivers/acorn/char/Makefile

• Lines: 39
• Date: Fri Sep 15 23:31:12 2000
• Orig file: v2.2.17/drivers/acorn/char/Makefile
• Orig date: Fri Apr 21 12:45:50 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/drivers/acorn/char/Makefile linux/drivers/acorn/char/Makefile
@@ -9,20 +9,19 @@
 # parent makes..
 #
 
-L_TARGET := acorn-char.a
-M_OBJS   :=
-L_OBJS   :=
+L_TARGET 	:= acorn-char.a
+M_OBJS   	:=
+L_OBJS   	:=
 
-ifeq ($(MACHINE),rpc)
-  MOUSE_OBJS += mouse_rpc.o
-  L_OBJS += keyb_ps2.o
-endif
+L_OBJS_arc	:= keyb_arc.o
+L_OBJS_a5k	:= keyb_arc.o
+L_OBJS_rpc	:= keyb_ps2.o
 
-ifeq ($(CONFIG_MOUSE),y)
-  LX_OBJS += $(MOUSE_OBJS)
+ifeq ($(CONFIG_RPCMOUSE),y)
+  LX_OBJS += mouse_rpc.o
 else
-  ifeq ($(CONFIG_MOUSE),m)
-    MX_OBJS += $(MOUSE_OBJS)
+  ifeq ($(CONFIG_RPCMOUSE),m)
+    MX_OBJS += mouse_rpc.o
   endif
 endif
 
@@ -41,5 +40,7 @@
     M_OBJS += serial-dualsp.o
   endif
 endif
+
+L_OBJS += $(L_OBJS_$(MACHINE))
 
 include $(TOPDIR)/Rules.make