patch-2.1.97 linux/drivers/macintosh/Makefile

• Lines: 31
• Date: Tue Apr 14 17:33:59 1998
• Orig file: v2.1.96/linux/drivers/macintosh/Makefile
• Orig date: Mon Jan 12 15:18:13 1998

diff -u --recursive --new-file v2.1.96/linux/drivers/macintosh/Makefile linux/drivers/macintosh/Makefile
@@ -14,7 +14,10 @@
 
 L_TARGET := macintosh.a
 M_OBJS   :=
-L_OBJS   := via-cuda.o adb.o nvram.o macio-adb.o
+
+ifndef CONFIG_MBX
+L_OBJS   := via-cuda.o adb.o nvram.o macio-adb.o via-pmu.o mediabay.o
+endif
 
 ifeq ($(CONFIG_SERIAL)$(CONFIG_PMAC),yy)
   LX_OBJS += macserial.o
@@ -25,7 +28,7 @@
 endif
 
 ifdef CONFIG_MAC_KEYBOARD
-L_OBJS += mac_keyb.o mackeymap.o
+L_OBJS += mac_keyb.o
 endif
 
 ifdef CONFIG_VT
@@ -54,5 +57,7 @@
 
 include $(TOPDIR)/Rules.make
 
-mackeymap.c: mackeymap.map
-	loadkeys --mktable mackeymap.map > mackeymap.c
+# Integrated in mac_keyb.c
+# mackeymap.map is retained for historical reasons
+#mackeymap.c: mackeymap.map
+#	loadkeys --mktable mackeymap.map > mackeymap.c