Merge branch 'nouveau-gallium-0.1' into darktama-gallium-0.1

[mesa.git] / configs / linux-dri-x86-64

diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64
index 1d758d8967e70a25dbfe9448e40d430e5fcaa093..821ab3e336688e357f00024a4c2997157491bdab 100644 (file)
--- a/configs/linux-dri-x86-64
+++ b/configs/linux-dri-x86-64
@@ -8,16 +8,17 @@ CONFIG_NAME = linux-dri-x86-64
 ARCH_FLAGS = -m64
 
 ASM_FLAGS = -DUSE_X86_64_ASM
-ASM_SOURCES = $(X86-64_SOURCES) $(X86-64_API)
+ASM_SOURCES = $(X86-64_SOURCES)
+ASM_API = $(X86-64_API)
 
-LIB_DIR = $(TOP)/lib64
+LIB_DIR = lib64
 
 # Library/program dependencies
 EXTRA_LIB_PATH=-L/usr/X11R6/lib64
 
 # ffb, gamma, and sis are missing because they have not be converted to use
-# the new interface.  i810 and i830 are missing because there is no x86-64
+# the new interface.  i810 are missing because there is no x86-64
 # system where they could *ever* be used.
 #
-DRI_DIRS = dri_client i915 mach64 mga r128 r200 radeon tdfx unichrome savage r300
+DRI_DIRS = i915tex i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300