diff options
author | Rik Faith <faith@alephnull.com> | 1999-12-08 19:20:20 +0000 |
---|---|---|
committer | Rik Faith <faith@alephnull.com> | 1999-12-08 19:20:20 +0000 |
commit | b03b238dfc4d1992e27878ea6f3cac334f1fd56d (patch) | |
tree | db0e5ea72c8afcc7a890eff427243ede089b00ff /linux-core | |
parent | e1dba5c3a73078dec24f07a6d685435677db94a4 (diff) |
Sync with Linux 2.3.30
Diffstat (limited to 'linux-core')
-rw-r--r-- | linux-core/Makefile.kernel | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel index c286d8fd..57c6c50c 100644 --- a/linux-core/Makefile.kernel +++ b/linux-core/Makefile.kernel @@ -9,7 +9,6 @@ # 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 $ L_TARGET := libdrm.a @@ -22,7 +21,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 |