patch-2.1.124 linux/drivers/video/Makefile

• Lines: 205
• Date: Wed Sep 30 10:19:10 1998
• Orig file: v2.1.123/linux/drivers/video/Makefile
• Orig date: Tue Jul 28 14:21:09 1998

diff -u --recursive --new-file v2.1.123/linux/drivers/video/Makefile linux/drivers/video/Makefile
@@ -9,9 +9,6 @@
 # parent makes..
 #
 
-GSPA = gspa
-GSPH2C = gspahextoc
-
 L_TARGET := video.a
 L_OBJS   :=
 M_OBJS   :=
@@ -19,11 +16,16 @@
 MX_OBJS  :=
 MOD_LIST_NAME := VIDEO_MODULES
 
+CONFIG_FBGEN_BUILTIN :=
+CONFIG_FBGEN_MODULE :=
+
 # Frame Buffer Console
 
-# Nasty trick to make sure all wanted stuff is linked in
-O_TARGET = fbdev.o
-L_OBJS += fbdev.o
+ifeq ($(CONFIG_FB),y)
+  # Nasty trick to make sure all wanted stuff is linked in
+  O_TARGET = fbdev.o
+  L_OBJS += fbdev.o
+endif
 
 ifeq ($(CONFIG_DUMMY_CONSOLE),y)
   L_OBJS += dummycon.o
@@ -35,8 +37,7 @@
 
 ifeq ($(CONFIG_FB),y)
   L_OBJS += fonts.o
-  OX_OBJS += fbcon.o fbcmap.o
-# fbgen is not compiled by default since nobody uses it yet, except clgenfb
+  OX_OBJS += fbcon.o fbcmap.o fbmem.o
   ifeq ($(CONFIG_FONT_8x8),y)
     L_OBJS += font_8x8.o
   endif
@@ -102,6 +103,10 @@
 L_OBJS += platinumfb.o
 endif
 
+ifeq ($(CONFIG_FB_VALKYRIE),y)
+L_OBJS += valkyriefb.o
+endif
+
 ifeq ($(CONFIG_FB_CT65550),y)
 L_OBJS += chipsfb.o
 endif
@@ -126,6 +131,10 @@
 L_OBJS += offb.o macmodes.o
 endif
 
+ifeq ($(CONFIG_FB_IMSTT),y)
+L_OBJS += imsttfb.o
+endif
+
 ifeq ($(CONFIG_FB_RETINAZ3),y)
 L_OBJS += retz3fb.o
 else
@@ -136,11 +145,11 @@
 
 ifeq ($(CONFIG_FB_CLGEN),y)
 L_OBJS += clgenfb.o
-OX_OBJS += fbgen.o
+CONFIG_FBGEN_BUILTIN = y
 else
   ifeq ($(CONFIG_FB_CLGEN),m)
   M_OBJS += clgenfb.o
-  OX_OBJS += fbgen.o
+  CONFIG_FBGEN_MODULE = y
   endif
 endif
 
@@ -160,26 +169,10 @@
   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)
 L_OBJS += vesafb.o
 endif
 
-ifeq ($(CONFIG_FB_MDA),y)
-L_OBJS += mdafb.o
-else
-  ifeq ($(CONFIG_FB_MDA),m)
-  M_OBJS += mdafb.o
-  endif
-endif
-
 ifeq ($(CONFIG_FB_VIRGE),y)
 L_OBJS += virgefb.o
 else
@@ -188,6 +181,10 @@
   endif
 endif
 
+ifdef CONFIG_FB_G364
+L_OBJS := $(L_OBJS) g364fb.o
+endif
+
 ifeq ($(CONFIG_FB_SBUS),y)
 L_OBJS += sbusfb.o
   ifeq ($(CONFIG_FB_CREATOR),y)
@@ -225,6 +222,20 @@
     M_OBJS += tcxfb.o
     endif
   endif
+  ifeq ($(CONFIG_FB_CGFOURTEEN),y)
+    L_OBJS += cgfourteenfb.o
+  else
+    ifeq ($(CONFIG_FB_CGFOURTEEN),m)
+    M_OBJS += cgfourteenfb.o
+    endif
+  endif
+  ifeq ($(CONFIG_FB_LEO),y)
+    L_OBJS += leofb.o
+  else
+    ifeq ($(CONFIG_FB_LEO),m)
+    M_OBJS += leofb.o
+    endif
+  endif
 else
   ifeq ($(CONFIG_FB_SBUS),m)
   M_OBJS += sbusfb.o
@@ -263,6 +274,20 @@
       M_OBJS += tcxfb.o
       endif
     endif
+    ifeq ($(CONFIG_FB_CGFOURTEEN),y)
+      M_OBJS += cgfourteenfb.o
+    else
+      ifeq ($(CONFIG_FB_CGFOURTEEN),m)
+      M_OBJS += cgfourteenfb.o
+      endif
+    endif
+    ifeq ($(CONFIG_FB_LEO),y)
+      M_OBJS += leofb.o
+    else
+      ifeq ($(CONFIG_FB_LEO),m)
+      M_OBJS += leofb.o
+      endif
+    endif
   endif
 endif
 
@@ -274,6 +299,14 @@
   endif
 endif
 
+ifdef CONFIG_FBGEN_BUILTIN
+OX_OBJS += fbgen.o
+else
+  ifdef CONFIG_FBGEN_MODULE
+  MX_OBJS += fbgen.o
+  endif
+endif
+
 # Generic Low Level Drivers
 
 ifeq ($(CONFIG_FBCON_AFB),y)
@@ -396,23 +429,23 @@
   endif
 endif
 
-# GSP Console
-
-ifdef CONFIG_AMIGA_GSP
-L_OBJS += gspcon.o gspcore.o
-endif
-
 # VGA Text Console
 
 ifdef CONFIG_VGA_CONSOLE
 L_OBJS += vgacon.o
 endif
 
-include $(TOPDIR)/Rules.make
+# MDA Text Console
 
-gspcore.c: gspcore.gsp
-	$(GSPA) $< > $*.hex
-	$(GSPH2C) $*.hex > gspcore.c
+ifeq ($(CONFIG_MDA_CONSOLE),y)
+L_OBJS += mdacon.o
+else
+  ifeq ($(CONFIG_MDA_CONSOLE),m)
+  M_OBJS += mdacon.o
+  endif
+endif
+
+include $(TOPDIR)/Rules.make
 
 promcon_tbl.c: prom.uni
 	../char/conmakehash prom.uni | \