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

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

diff -u --recursive --new-file v2.3.6/linux/drivers/acorn/char/Makefile linux/drivers/acorn/char/Makefile
@@ -9,20 +9,21 @@
 # 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)
-else
-  ifeq ($(CONFIG_MOUSE),m)
-    MX_OBJS += $(MOUSE_OBJS)
+ifeq ($(MACHINE),rpc)
+  ifeq ($(CONFIG_MOUSE),y)
+    LX_OBJS += mouse_rpc.o
+  else
+    ifeq ($(CONFIG_MOUSE),m)
+      MX_OBJS += mouse_rpc.o
+    endif
   endif
 endif
 
@@ -41,5 +42,7 @@
     M_OBJS += serial-dualsp.o
   endif
 endif
+
+L_OBJS += $(L_OBJS_$(MACHINE))
 
 include $(TOPDIR)/Rules.make

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)