Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1

[mesa.git] / configs / linux-dri

diff --git a/configs/linux-dri b/configs/linux-dri
index bcc2b615618aa8691ae293e49fd14482f4ecdf95..4fdef196d968eac6c5a36f73e1a797643634ea24 100644 (file)
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -53,9 +53,9 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
 USING_EGL=0
 
 # Directories
-SRC_DIRS := glx/x11 egl $(SRC_DIRS)
-PROGRAM_DIRS := egl $(PROGRAM_DIRS)
+SRC_DIRS := glx/x11 $(SRC_DIRS)
 ifeq ($(USING_EGL), 1)
+SRC_DIRS := egl $(SRC_DIRS)
 PROGRAM_DIRS = egl
 endif
 
@@ -67,4 +67,4 @@ GALLIUM_WINSYS_DIRS = dri
 
 # gamma are missing because they have not been converted to use the new
 # interface.
-DRI_DIRS = intel 
+DRI_DIRS = nouveau