patch-2.4.0-test5 linux/drivers/char/drm/Makefile

• Lines: 127
• Date: Thu Jul 27 15:10:03 2000
• Orig file: v2.4.0-test4/linux/drivers/char/drm/Makefile
• Orig date: Fri Jun 23 21:55:08 2000

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/char/drm/Makefile linux/drivers/char/drm/Makefile
@@ -2,63 +2,76 @@
 # Makefile for the drm device driver.  This driver provides support for
 # the Direct Rendering Infrastructure (DRI) in XFree86 4.x.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-# Note 2! The CFLAGS definitions are now inherited from the
-# parent makes..
-#
-
-O_TARGET	:= drm.o
-
-L_OBJS		:= init.o memory.o proc.o auth.o context.o drawable.o bufs.o \
-			lists.o lock.o ioctl.o fops.o vm.o dma.o
-
-M_OBJS		:= 
-
-ifeq ($(CONFIG_DRM_GAMMA),y)
- OX_OBJS += gamma_drv.o
- O_OBJS += gamma_dma.o
-else
-  ifeq ($(CONFIG_DRM_GAMMA),m)
-    MIX_OBJS += gamma_drv.o
-    MI_OBJS += gamma_dma.o
-    M_OBJS += gamma.o
-  endif
-endif
 
-ifeq ($(CONFIG_DRM_TDFX),y)
- OX_OBJS += tdfx_drv.o
- O_OBJS += tdfx_context.o
-else
-  ifeq ($(CONFIG_DRM_TDFX),m)
-    MIX_OBJS += tdfx_drv.o
-    MI_OBJS += tdfx_context.o
-    M_OBJS += tdfx.o
-  endif
-endif
+O_TARGET =	drm.o
 
-ifeq ($(CONFIG_DRM_FFB),y)
- OX_OBJS += ffb_drv.o
- O_OBJS += ffb_context.o
+export-objs =	drm_syms.o	
+list-multi =	drm.o gamma.o tdfx.o r128.o ffb.o mga.o i810.o
+drm-objs =	init.o memory.o proc.o auth.o context.o \
+		drawable.o bufs.o lists.o lock.o ioctl.o \
+		fops.o vm.o dma.o ctxbitmap.o drm_syms.o
+gamma-objs =	gamma_drv.o			gamma_dma.o
+tdfx-objs =	tdfx_drv.o	tdfx_context.o
+r128-objs =	r128_drv.o	r128_context.o	r128_dma.o	r128_bufs.o
+ffb-objs =	ffb_drv.o	ffb_context.o
+mga-objs =	mga_drv.o	mga_context.o	mga_dma.o mga_bufs.o mga_state.o
+i810-objs =	i810_drv.o	i810_context.o	i810_dma.o	i810_bufs.o
+
+ifeq ($(CONFIG_AGP), y)
+   drm-objs += agpsupport.o
 else
-  ifeq ($(CONFIG_DRM_FFB),m)
-    MIX_OBJC += ffb_drv.o
-    MI_OBJS += ffb_context.o
-    M_OBJS += ffb.o
-  endif
+ ifeq ($(CONFIG_AGP), m)
+   drm-objs += agpsupport.o
+ endif
 endif
 
-O_OBJS += $(L_OBJS)
+obj-$(CONFIG_DRM) 	+= drm.o
+obj-$(CONFIG_DRM_GAMMA) += gamma.o 
+obj-$(CONFIG_DRM_TDFX)  += tdfx.o
+obj-$(CONFIG_DRM_R128)  += r128.o
+obj-$(CONFIG_DRM_FFB)   += ffb.o
+obj-$(CONFIG_DRM_MGA)   += mga.o
+obj-$(CONFIG_DRM_I810)  += i810.o
+
+
+# Extract lists of the multi-part drivers.
+# The 'int-*' lists are the intermediate files used to build the multi's.
+multi-y		:= $(filter $(list-multi), $(obj-y))
+multi-m		:= $(filter $(list-multi), $(obj-m))
+int-y		:= $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
+int-m		:= $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
+
+# Files that are both resident and modular: remove from modular.
+obj-m		:= $(filter-out $(obj-y), $(obj-m))
+int-m		:= $(filter-out $(int-y), $(int-m))
+
+# Take multi-part drivers out of obj-y and put components in.
+obj-y		:= $(filter-out $(list-multi), $(obj-y)) $(int-y)
+
+# Translate to Rules.make lists.
+O_OBJS		:= $(filter-out $(export-objs), $(obj-y))
+OX_OBJS		:= $(filter     $(export-objs), $(obj-y))
+M_OBJS		:= $(sort $(filter-out $(export-objs), $(obj-m)))
+MX_OBJS		:= $(sort $(filter     $(export-objs), $(obj-m)))
+MI_OBJS		:= $(sort $(filter-out $(export-objs), $(int-m)))
+MIX_OBJS	:= $(sort $(filter     $(export-objs), $(int-m)))
 
 include $(TOPDIR)/Rules.make
 
-gamma.o : gamma_drv.o gamma_dma.o $(L_OBJS)
-	$(LD) $(LD_RFLAG) -r -o $@ gamma_drv.o gamma_dma.o $(L_OBJS)
+gamma.o: $(gamma-objs)
+	$(LD) -r -o $@ $(gamma-objs)
+
+tdfx.o: $(tdfx-objs)
+	$(LD) -r -o $@ $(tdfx-objs)
+
+mga.o: $(mga-objs)
+	$(LD) -r -o $@ $(mga-objs)
+
+i810.o: $(i810-objs)
+	$(LD) -r -o $@ $(i810-objs)
 
-tdfx.o: tdfx_drv.o tdfx_context.o $(L_OBJS)
-	$(LD) $(LD_RFLAG) -r -o $@ tdfx_drv.o tdfx_context.o $(L_OBJS)
+r128.o: $(r128-objs)
+	$(LD) -r -o $@ $(r128-objs)
 
-ffb.o: ffb_drv.o ffb_context.o $(L_OBJS)
-	$(LD) $(LD_RFLAG) -r -o $@ ffb_drv.o ffb_context.o $(L_OBJS)
+ffb.o: $(ffb-objs)
+	$(LD) -r -o $@ $(ffb-objs)