mesa: build/use libmesagallium.a for gallium builds

[mesa.git] / configs / linux-dri

diff --git a/configs/linux-dri b/configs/linux-dri
index eb6f307dac55b6c87df8f4fc0960ed999a572ee0..c667a386f3926456065069c5a240c07cebf29d3b 100644 (file)
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -52,23 +52,14 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
 
 # Directories
 SRC_DIRS := glx/x11 egl $(SRC_DIRS)
-
-
-# Directories
-ifeq ($(USING_EGL), 1)
-SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glw
-PROGRAM_DIRS = egl xdemos
-else
-SRC_DIRS = glx/x11 gallium mesa glu glut/glx glw
-PROGRAM_DIRS = xdemos
-endif
+PROGRAM_DIRS := egl $(PROGRAM_DIRS)
 
 # EGL directories
-EGL_DRIVERS_DIRS = demo dri xdri
+EGL_DRIVERS_DIRS = demo glx
 
 DRIVER_DIRS =
 WINDOW_SYSTEM = dri
-GALLIUM_WINSYS_DIRS = drm egl_xlib
+GALLIUM_WINSYS_DIRS = drm 
 
 # gamma are missing because they have not been converted to use the new
 # interface.
@@ -79,4 +70,3 @@ GALLIUM_WINSYS_DIRS = drm egl_xlib
 
 #DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
 #      savage sis tdfx trident unichrome ffb
-DRI_DIRS = intel