patch-2.2.18 linux/drivers/macintosh/Makefile

Next file: linux/drivers/macintosh/adb.c
Previous file: linux/drivers/isdn/isdnloop/isdnloop.h
Back to the patch index
Back to the overall index

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/drivers/macintosh/Makefile linux/drivers/macintosh/Makefile
@@ -12,16 +12,16 @@
 SUB_DIRS     := 
 MOD_SUB_DIRS := $(SUB_DIRS)
 
-L_TARGET := macintosh.a
+O_TARGET := macintosh.o
 M_OBJS   :=
 
 ifndef CONFIG_MBX
-L_OBJS   := via-cuda.o macio-adb.o via-pmu.o mediabay.o
-LX_OBJS  := adb.o
+O_OBJS   := via-cuda.o macio-adb.o via-pmu.o mediabay.o
+OX_OBJS  := adb.o
 endif
 
 ifeq ($(CONFIG_MAC_SERIAL),y)
-  L_OBJS += macserial.o
+  O_OBJS += macserial.o
 else
   ifeq ($(CONFIG_MAC_SERIAL),m)
     M_OBJS += macserial.o
@@ -29,7 +29,7 @@
 endif
 
 ifeq ($(CONFIG_NVRAM),y)
-  L_OBJS += nvram.o
+  O_OBJS += nvram.o
 else
   ifeq ($(CONFIG_NVRAM),m)
     M_OBJS += nvram.o
@@ -37,7 +37,7 @@
 endif
 
 ifeq ($(CONFIG_PPC_RTC),y)
-  L_OBJS += rtc.o
+  O_OBJS += rtc.o
 else
   ifeq ($(CONFIG_PPC_RTC),m)
     M_OBJS += rtc.o
@@ -45,7 +45,13 @@
 endif
 
 ifdef CONFIG_MAC_KEYBOARD
-L_OBJS += mac_keyb.o
+  O_OBJS += mac_keyb.o
+endif
+ifdef CONFIG_INPUT_ADBHID
+  O_OBJS += adbhid.o
+endif
+ifdef CONFIG_MAC_HID
+  O_OBJS += mac_hid.o
 endif
 
 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)