patch-2.3.48 linux/drivers/video/Makefile

• Lines: 46
• Date: Mon Feb 21 11:08:22 2000
• Orig file: v2.3.47/linux/drivers/video/Makefile
• Orig date: Sun Feb 13 19:29:04 2000

diff -u --recursive --new-file v2.3.47/linux/drivers/video/Makefile linux/drivers/video/Makefile
@@ -3,9 +3,9 @@
 # Rewritten to use lists instead of if-statements.
 
 SUB_DIRS        :=
-MOD_SUB_DIRS    :=
+MOD_SUB_DIRS    := $(SUB_DIRS)
 MOD_IN_SUB_DIRS :=
-ALL_SUB_DIRS    :=
+ALL_SUB_DIRS    := $(SUB_DIRS) matrox
 
 O_TARGET := video.o
 O_OBJS   :=
@@ -16,7 +16,11 @@
 # All of the (potential) objects that export symbols.
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
 
-export-objs    :=  fbmem.o fbcmap.o fbcon.o fbcon-afb.o fbcon-ilbm.o fbcon-vga.o fbcon-iplan2p2.o fbcon-iplan2p4.o fbcon-iplan2p8.o fbcon-vga-planes.o fbcon-cfb16.o fbcon-cfb2.o fbcon-cfb24.o fbcon-cfb32.o fbcon-cfb4.o fbcon-cfb8.o fbcon-mac.o fbcon-mfb.o fbcon-vga.o
+export-objs    :=  fbmem.o fbcmap.o fbcon.o fbcon-afb.o fbcon-ilbm.o fbcon-vga.o \
+		   fbcon-iplan2p2.o fbcon-iplan2p4.o fbcon-iplan2p8.o fbcon-vga-planes.o \
+		   fbcon-cfb16.o fbcon-cfb2.o fbcon-cfb24.o fbcon-cfb32.o fbcon-cfb4.o fbcon-cfb8.o \
+		   fbcon-mac.o fbcon-mfb.o fbcon-vga8-planes.o \
+		   matrox/matroxfb.o
 
 # Object file lists.
 obj-y          :=
@@ -81,10 +85,19 @@
 obj-$(CONFIG_FB_CGFOURTEEN)       += cgfourteenfb.o sbusfb.o
 obj-$(CONFIG_FB_P9100)            += p9100fb.o sbusfb.o
 obj-$(CONFIG_FB_LEO)              += leofb.o sbusfb.o
-obj-$(CONFIG_FB_MATROX)           += matroxfb.o
 obj-$(CONFIG_FB_SUN3)             += sun3fb.o
 obj-$(CONFIG_FB_BWTWO)            += bwtwofb.o
 obj-$(CONFIG_FB_VIRTUAL)          += vfb.o  
+
+ifeq ($(CONFIG_FB_MATROX),y)
+SUB_DIRS			  += matrox
+obj-y				  += matrox/matrox.o
+MOD_SUB_DIRS			  += matrox
+else
+  ifeq ($(CONFIG_FB_MATROX),m)
+  MOD_SUB_DIRS			  += matrox
+  endif
+endif
 
 # Generic Low Level Drivers