summaryrefslogtreecommitdiff
path: root/linux-core/Makefile.kernel
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2000-02-22 15:43:59 +0000
committerKevin E Martin <kem@kem.org>2000-02-22 15:43:59 +0000
commit7a9b291ab55dd9dcfeb35217f6105ad57c94f433 (patch)
tree8941caba3a974912d8abc9f2f7b307c82ef5a54a /linux-core/Makefile.kernel
parent9a1197da5cd84624f5b0741e0a20fee60eb8b4f1 (diff)
Import of XFree86 3.9.18
Diffstat (limited to 'linux-core/Makefile.kernel')
-rw-r--r--linux-core/Makefile.kernel9
1 files changed, 8 insertions, 1 deletions
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