patch-2.1.91 linux/drivers/video/Makefile

• Lines: 236
• Date: Sat Mar 21 11:12:49 1998
• Orig file: v2.1.90/linux/drivers/video/Makefile
• Orig date: Tue Nov 25 02:37:04 1997

diff -u --recursive --new-file v2.1.90/linux/drivers/video/Makefile linux/drivers/video/Makefile
@@ -22,15 +22,11 @@
 # Frame Buffer Console
 
 ifeq ($(CONFIG_FB),y)
-  L_OBJS += fonts.o font_8x8.o font_8x16.o pearl_8x8.o
-  LX_OBJS += fbcon.o fbcmap.o
+  L_OBJS += fonts.o font_8x8.o font_8x16.o pearl_8x8.o font_6x11.o
+  LX_OBJS += fbcon.o fbcmap.o fbgen.o
 endif
 
-# Frame buffer devices
-
-ifeq ($(CONFIG_APOLLO),y)
-L_OBJS += dn_fb.o
-endif
+# Frame Buffer Devices
 
 ifeq ($(CONFIG_FB_AMIGA),y)
 L_OBJS += amifb.o
@@ -40,6 +36,10 @@
   endif
 endif
 
+ifeq ($(CONFIG_FB_APOLLO),y)
+L_OBJS += dnfb.o
+endif
+
 ifeq ($(CONFIG_FB_ATARI),y)
 L_OBJS += atafb.o
 else
@@ -48,134 +48,114 @@
   endif
 endif
 
+ifeq ($(CONFIG_FB_ATY),y)
+L_OBJS += atyfb.o
+endif
+
 ifeq ($(CONFIG_FB_CYBER),y)
-LX_OBJS += cyberfb.o
+L_OBJS += cyberfb.o
 else
   ifeq ($(CONFIG_FB_CYBER),m)
-  MX_OBJS += cyberfb.o
+  M_OBJS += cyberfb.o
   endif
 endif
 
+ifeq ($(CONFIG_FB_MAC),y)
+L_OBJS += macfb.o
+endif
+
+ifeq ($(CONFIG_FB_OF),y)
+L_OBJS += offb.o
+endif
+
 ifeq ($(CONFIG_FB_RETINAZ3),y)
-LX_OBJS += retz3fb.o
+L_OBJS += retz3fb.o
 else
   ifeq ($(CONFIG_FB_RETINAZ3),m)
-  MX_OBJS += retz3fb.o
+  M_OBJS += retz3fb.o
   endif
 endif
 
-ifeq ($(CONFIG_FB_VIRTUAL),y)
-L_OBJS += vfb.o
+ifeq ($(CONFIG_FB_S3TRIO),y)
+L_OBJS += S3triofb.o
 else
-  ifeq ($(CONFIG_FB_VIRTUAL),m)
-  M_OBJS += vfb.o
+  ifeq ($(CONFIG_FB_S3TRIO),m)
+  M_OBJS += S3triofb.o
   endif
 endif
 
-ifeq ($(CONFIG_FB_OPEN_FIRMWARE),y)
-L_OBJS += offb.o
+ifeq ($(CONFIG_FB_TGA),y)
+L_OBJS += tgafb.o
 endif
 
-ifeq ($(CONFIG_FB_MACH64),y)
-L_OBJS += mach64fb.o
+ifeq ($(CONFIG_FB_VIRGE),y)
+L_OBJS += virgefb.o
 else
-  ifeq ($(CONFIG_FB_MACH64),m)
-  M_OBJS += mach64fb.o
+  ifeq ($(CONFIG_FB_VIRGE),m)
+  M_OBJS += virgefb.o
   endif
 endif
 
-ifeq ($(CONFIG_FB_TGA),y)
-L_OBJS += tgafb.o
+ifeq ($(CONFIG_FB_VIRTUAL),y)
+L_OBJS += vfb.o
+else
+  ifeq ($(CONFIG_FB_VIRTUAL),m)
+  M_OBJS += vfb.o
+  endif
 endif
 
-# Low level drivers
+# Generic Low Level Drivers
 
-ifeq ($(CONFIG_FBCON_AFB),y)
-L_OBJS += fbcon-afb.o
-else
-  ifeq ($(CONFIG_FBCON_AFB),m)
-  M_OBJS += fbcon-afb.o
-  endif
+ifdef CONFIG_FBCON_AFB
+LX_OBJS += fbcon-afb.o
 endif
 
-ifeq ($(CONFIG_FBCON_CFB8),y)
-L_OBJS += fbcon-cfb8.o
-else
-  ifeq ($(CONFIG_FBCON_CFB8),m)
-  M_OBJS += fbcon-cfb8.o
-  endif
+ifdef CONFIG_FBCON_CFB2
+LX_OBJS += fbcon-cfb2.o
 endif
 
-ifeq ($(CONFIG_FBCON_CFB16),y)
+ifdef CONFIG_FBCON_CFB4
+LX_OBJS += fbcon-cfb4.o
+endif
+
+ifdef CONFIG_FBCON_CFB8
+LX_OBJS += fbcon-cfb8.o
+endif
+
+ifdef CONFIG_FBCON_CFB16
 LX_OBJS += fbcon-cfb16.o
-else
-  ifeq ($(CONFIG_FBCON_CFB16),m)
-  MX_OBJS += fbcon-cfb16.o
-  endif
 endif
 
-ifeq ($(CONFIG_FBCON_ILBM),y)
-L_OBJS += fbcon-ilbm.o
-else
-  ifeq ($(CONFIG_FBCON_ILBM),m)
-  M_OBJS += fbcon-ilbm.o
-  endif
+ifdef CONFIG_FBCON_CFB24
+LX_OBJS += fbcon-cfb24.o
 endif
 
-ifeq ($(CONFIG_FBCON_IPLAN2P2),y)
-L_OBJS += fbcon-iplan2p2.o
-else
-  ifeq ($(CONFIG_FBCON_IPLAN2P2),m)
-  M_OBJS += fbcon-iplan2p2.o
-  endif
+ifdef CONFIG_FBCON_CFB32
+LX_OBJS += fbcon-cfb32.o
 endif
 
-ifeq ($(CONFIG_FBCON_IPLAN2P4),y)
-L_OBJS += fbcon-iplan2p4.o
-else
-  ifeq ($(CONFIG_FBCON_IPLAN2P4),m)
-  M_OBJS += fbcon-iplan2p4.o
-  endif
+ifdef CONFIG_FBCON_ILBM
+LX_OBJS += fbcon-ilbm.o
 endif
 
-ifeq ($(CONFIG_FBCON_IPLAN2P8),y)
-L_OBJS += fbcon-iplan2p8.o
-else
-  ifeq ($(CONFIG_FBCON_IPLAN2P8),m)
-  M_OBJS += fbcon-iplan2p8.o
-  endif
+ifdef CONFIG_FBCON_IPLAN2P2
+LX_OBJS += fbcon-iplan2p2.o
 endif
 
-ifeq ($(CONFIG_FBCON_MFB),y)
-L_OBJS += fbcon-mfb.o
-else
-  ifeq ($(CONFIG_FBCON_MFB),m)
-  M_OBJS += fbcon-mfb.o
-  endif
+ifdef CONFIG_FBCON_IPLAN2P4
+LX_OBJS += fbcon-iplan2p4.o
 endif
 
-ifeq ($(CONFIG_FBCON_CYBER),y)
-L_OBJS += fbcon-cyber.o
-else
-  ifeq ($(CONFIG_FBCON_CYBER),m)
-  M_OBJS += fbcon-cyber.o
-  endif
+ifdef CONFIG_FBCON_IPLAN2P8
+LX_OBJS += fbcon-iplan2p8.o
 endif
 
-ifeq ($(CONFIG_FBCON_RETINAZ3),y)
-L_OBJS += fbcon-retz3.o
-else
-  ifeq ($(CONFIG_FBCON_RETINAZ3),m)
-  M_OBJS += fbcon-retz3.o
-  endif
+ifdef CONFIG_FBCON_MAC
+LX_OBJS += fbcon-mac.o
 endif
 
-ifeq ($(CONFIG_FBCON_MACH64),y)
-L_OBJS += fbcon-mach64.o
-else
-  ifeq ($(CONFIG_FBCON_MACH64),m)
-  M_OBJS += fbcon-mach64.o
-  endif
+ifdef CONFIG_FBCON_MFB
+LX_OBJS += fbcon-mfb.o
 endif
 
 # GSP Console
@@ -184,7 +164,7 @@
 L_OBJS := $(L_OBJS) gspcon.o gspcore.o
 endif
 
-# VGA Console
+# VGA Text Console
 
 ifdef CONFIG_ABSTRACT_CONSOLE
 ifdef CONFIG_VGA_CONSOLE