From 7a9b291ab55dd9dcfeb35217f6105ad57c94f433 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Tue, 22 Feb 2000 15:43:59 +0000 Subject: Import of XFree86 3.9.18 --- linux-core/Makefile.kernel | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'linux-core/Makefile.kernel') diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel index c286d8fd..44d75c48 100644 --- a/linux-core/Makefile.kernel +++ b/linux-core/Makefile.kernel @@ -9,7 +9,7 @@ # Note 2! The CFLAGS definitions are now inherited from the # parent makes.. # -# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel,v 1.2 1999/09/27 14:59:24 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel/Makefile.kernel,v 1.5 2000/02/14 06:27:25 martin Exp $ L_TARGET := libdrm.a @@ -22,7 +22,14 @@ ifdef CONFIG_DRM_GAMMA M_OBJS += gamma.o endif +ifdef CONFIG_DRM_TDFX +M_OBJS += tdfx.o +endif + include $(TOPDIR)/Rules.make gamma.o: gamma_drv.o gamma_dma.o $(L_TARGET) $(LD) $(LD_RFLAG) -r -o $@ gamma_drv.o gamma_dma.o -L. -ldrm + +tdfx.o: tdfx_drv.o tdfx_context.o $(L_TARGET) + $(LD) $(LD_RFLAG) -r -o $@ tdfx_drv.o tdfx_context.o -L. -ldrm -- cgit v1.2.3