Merge remote-tracking branch 'x86/froyo-x86' into froyo-next

[android-x86/external-mesa.git] / configs / linux-indirect

diff --git a/configs/linux-indirect b/configs/linux-indirect
index 310ae6d..507382a 100644 (file)
--- a/configs/linux-indirect
+++ b/configs/linux-indirect
@@ -42,12 +42,11 @@ MESA_ASM_SOURCES =
 # Library/program dependencies
 EXTRA_LIB_PATH=-L/usr/X11R6/lib
 
-DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
+MESA_MODULES  = $(TOP)/src/mesa/libmesa.a
+DRI_LIB_DEPS  = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
 GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
 
 
 # Directories
-SRC_DIRS = glx/x11 glu glut/glx glw
+SRC_DIRS = glx glu glut/glx glw
 DRIVER_DIRS =
-PROGRAM_DIRS = 
-WINDOW_SYSTEM=dri