patch-2.1.109 linux/drivers/video/Makefile

• Lines: 266
• Date: Fri Jul 10 15:18:31 1998
• Orig file: v2.1.108/linux/drivers/video/Makefile
• Orig date: Wed Jun 24 22:54:07 1998

diff -u --recursive --new-file v2.1.108/linux/drivers/video/Makefile linux/drivers/video/Makefile
@@ -21,9 +21,17 @@
 
 # Frame Buffer Console
 
+# Nasty trick to make sure all wanted stuff is linked in
+O_TARGET = fbdev.o
+L_OBJS += fbdev.o
+
+ifeq ($(CONFIG_DUMMY_CONSOLE),y)
+  L_OBJS += dummycon.o
+endif
+
 ifeq ($(CONFIG_FB),y)
-  L_OBJS += fonts.o font_8x8.o font_8x16.o pearl_8x8.o font_6x11.o
-  LX_OBJS += fbcon.o fbcmap.o fbgen.o
+  L_OBJS += fonts.o font_8x8.o font_8x16.o pearl_8x8.o font_6x11.o font_sun8x16.o
+  OX_OBJS += fbcon.o fbcmap.o fbgen.o
 endif
 
 # Frame Buffer Devices
@@ -90,10 +98,18 @@
 
 ifeq ($(CONFIG_FB_TGA),y)
 L_OBJS += tgafb.o
+else
+  ifeq ($(CONFIG_FB_TGA),m)
+  M_OBJS += tgafb.o
+  endif
 endif
 
 ifeq ($(CONFIG_FB_VGA),y)
 L_OBJS += vgafb.o
+else
+  ifeq ($(CONFIG_FB_VGA),m)
+  M_OBJS += vgafb.o
+  endif
 endif
 
 ifeq ($(CONFIG_FB_VESA),y)
@@ -116,6 +132,50 @@
   endif
 endif
 
+ifeq ($(CONFIG_FB_PROM),y)
+L_OBJS += promfb.o
+else
+  ifeq ($(CONFIG_FB_PROM),m)
+  M_OBJS += promfb.o
+  endif
+endif
+
+ifeq ($(CONFIG_FB_SBUS),y)
+L_OBJS += sbusfb.o
+  ifeq ($(CONFIG_FB_CREATOR),y)
+    L_OBJS += creatorfb.o
+  else
+    ifeq ($(CONFIG_FB_CREATOR),m)
+    M_OBJS += creatorfb.o
+    endif
+  endif
+  ifeq ($(CONFIG_FB_CGSIX),y)
+    L_OBJS += cgsixfb.o
+  else
+    ifeq ($(CONFIG_FB_CGSIX),m)
+    M_OBJS += cgsixfb.o
+    endif
+  endif
+else
+  ifeq ($(CONFIG_FB_SBUS),m)
+  M_OBJS += sbusfb.o
+    ifeq ($(CONFIG_FB_CREATOR),y)
+      M_OBJS += creatorfb.o
+    else
+      ifeq ($(CONFIG_FB_CREATOR),m)
+      M_OBJS += creatorfb.o
+      endif
+    endif
+    ifeq ($(CONFIG_FB_CGSIX),y)
+      M_OBJS += cgsixfb.o
+    else
+      ifeq ($(CONFIG_FB_CGSIX),m)
+      M_OBJS += cgsixfb.o
+      endif
+    endif
+  endif
+endif
+
 ifeq ($(CONFIG_FB_VIRTUAL),y)
 L_OBJS += vfb.o
 else
@@ -126,80 +186,142 @@
 
 # Generic Low Level Drivers
 
-ifdef CONFIG_FBCON_AFB
-LX_OBJS += fbcon-afb.o
+ifeq ($(CONFIG_FBCON_AFB),y)
+OX_OBJS += fbcon-afb.o
+else
+  ifeq ($(CONFIG_FBCON_AFB),m)
+  MX_OBJS += fbcon-afb.o
+  endif
+endif
+
+ifeq ($(CONFIG_FBCON_CFB2),y)
+OX_OBJS += fbcon-cfb2.o
+else
+  ifeq ($(CONFIG_FBCON_CFB2),m)
+  MX_OBJS += fbcon-cfb2.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_CFB2
-LX_OBJS += fbcon-cfb2.o
+ifeq ($(CONFIG_FBCON_CFB4),y)
+OX_OBJS += fbcon-cfb4.o
+else
+  ifeq ($(CONFIG_FBCON_CFB4),m)
+  MX_OBJS += fbcon-cfb4.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_CFB4
-LX_OBJS += fbcon-cfb4.o
+ifeq ($(CONFIG_FBCON_CFB8),y)
+OX_OBJS += fbcon-cfb8.o
+else
+  ifeq ($(CONFIG_FBCON_CFB8),m)
+  MX_OBJS += fbcon-cfb8.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_CFB8
-LX_OBJS += fbcon-cfb8.o
+ifeq ($(CONFIG_FBCON_CFB16),y)
+OX_OBJS += fbcon-cfb16.o
+else
+  ifeq ($(CONFIG_FBCON_CFB16),m)
+  MX_OBJS += fbcon-cfb16.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_CFB16
-LX_OBJS += fbcon-cfb16.o
+ifeq ($(CONFIG_FBCON_CFB24),y)
+OX_OBJS += fbcon-cfb24.o
+else
+  ifeq ($(CONFIG_FBCON_CFB24),m)
+  MX_OBJS += fbcon-cfb24.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_CFB24
-LX_OBJS += fbcon-cfb24.o
+ifeq ($(CONFIG_FBCON_CFB32),y)
+OX_OBJS += fbcon-cfb32.o
+else
+  ifeq ($(CONFIG_FBCON_CFB32),m)
+  MX_OBJS += fbcon-cfb32.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_CFB32
-LX_OBJS += fbcon-cfb32.o
+ifeq ($(CONFIG_FBCON_ILBM),y)
+OX_OBJS += fbcon-ilbm.o
+else
+  ifeq ($(CONFIG_FBCON_ILBM),m)
+  MX_OBJS += fbcon-ilbm.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_ILBM
-LX_OBJS += fbcon-ilbm.o
+ifeq ($(CONFIG_FBCON_IPLAN2P2),y)
+OX_OBJS += fbcon-iplan2p2.o
+else
+  ifeq ($(CONFIG_FBCON_IPLAN2P2),m)
+  MX_OBJS += fbcon-iplan2p2.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_IPLAN2P2
-LX_OBJS += fbcon-iplan2p2.o
+ifeq ($(CONFIG_FBCON_IPLAN2P4),y)
+OX_OBJS += fbcon-iplan2p4.o
+else
+  ifeq ($(CONFIG_FBCON_IPLAN2P4),m)
+  MX_OBJS += fbcon-iplan2p4.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_IPLAN2P4
-LX_OBJS += fbcon-iplan2p4.o
+ifeq ($(CONFIG_FBCON_IPLAN2P8),y)
+OX_OBJS += fbcon-iplan2p8.o
+else
+  ifeq ($(CONFIG_FBCON_IPLAN2P8),m)
+  MX_OBJS += fbcon-iplan2p8.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_IPLAN2P8
-LX_OBJS += fbcon-iplan2p8.o
+ifeq ($(CONFIG_FBCON_IPLAN2P16),y)
+OX_OBJS += fbcon-iplan2p16.o
+else
+  ifeq ($(CONFIG_FBCON_IPLAN2P16),m)
+  MX_OBJS += fbcon-iplan2p16.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_MAC
-LX_OBJS += fbcon-mac.o
+ifeq ($(CONFIG_FBCON_MAC),y)
+OX_OBJS += fbcon-mac.o
+else
+  ifeq ($(CONFIG_FBCON_MAC),m)
+  MX_OBJS += fbcon-mac.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_MFB
-LX_OBJS += fbcon-mfb.o
+ifeq ($(CONFIG_FBCON_MFB),y)
+OX_OBJS += fbcon-mfb.o
+else
+  ifeq ($(CONFIG_FBCON_MFB),m)
+  MX_OBJS += fbcon-mfb.o
+  endif
 endif
 
-ifdef CONFIG_FBCON_VGA
-LX_OBJS += fbcon-vga.o
+ifeq ($(CONFIG_FBCON_VGA),y)
+OX_OBJS += fbcon-vga.o
+else
+  ifeq ($(CONFIG_FBCON_VGA),m)
+  MX_OBJS += fbcon-vga.o
+  endif
 endif
 
 # GSP Console
 
 ifdef CONFIG_AMIGA_GSP
-L_OBJS := $(L_OBJS) gspcon.o gspcore.o
+L_OBJS += gspcon.o gspcore.o
 endif
 
 # VGA Text Console
 
 ifdef CONFIG_VGA_CONSOLE
-ifndef CONFIG_FB_VGA
-L_OBJS := $(L_OBJS) vgacon.o
-endif
+L_OBJS += vgacon.o
 endif
 
 # Console Wrapper
 
 ifdef CONFIG_ABSCON_COMPAT
-L_OBJS := $(L_OBJS) compatcon.o
+L_OBJS += compatcon.o
 endif
 
 include $(TOPDIR)/Rules.make