patch-2.1.111 linux/drivers/video/Makefile

• Lines: 43
• Date: Tue Jul 21 10:28:24 1998
• Orig file: v2.1.110/linux/drivers/video/Makefile
• Orig date: Tue Jul 21 00:15:32 1998

diff -u --recursive --new-file v2.1.110/linux/drivers/video/Makefile linux/drivers/video/Makefile
@@ -34,12 +34,41 @@
 endif
 
 ifeq ($(CONFIG_FB),y)
-  L_OBJS += fonts.o font_8x8.o font_8x16.o pearl_8x8.o font_6x11.o font_sun8x16.o font_sun12x22.o
+  L_OBJS += fonts.o
   OX_OBJS += fbcon.o fbcmap.o
 # fbgen is not compiled by default since nobody uses it yet
+  ifeq ($(CONFIG_FONT_8x8),y)
+    L_OBJS += font_8x8.o
+  endif
+  ifeq ($(CONFIG_FONT_8x16),y)
+    L_OBJS += font_8x16.o
+  endif
+  ifeq ($(CONFIG_FONT_SUN8x16),y)
+    L_OBJS += font_sun8x16.o
+  endif
+  ifeq ($(CONFIG_FONT_SUN12x22),y)
+    L_OBJS += font_sun12x22.o
+  endif
+  ifeq ($(CONFIG_FONT_6x11),y)
+    L_OBJS += font_6x11.o
+  endif
+  ifeq ($(CONFIG_FONT_ACORN_8x8),y)
+    L_OBJS += font_acorn_8x8.o
+  endif
+  ifeq ($(CONFIG_FONT_PEARL_8x8),y)
+    L_OBJS += font_pearl_8x8.o
+  endif
 endif
 
 # Frame Buffer Devices
+
+ifeq ($(CONFIG_FB_ACORN),y)
+L_OBJS += acornfb.o
+else
+  ifeq ($(CONFIG_FB_ACORN),m)
+  M_OBJS += acornfb.o
+  endif
+endif
 
 ifeq ($(CONFIG_FB_AMIGA),y)
 L_OBJS += amifb.o