X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=configs%2Flinux-egl;h=216bcbab321f907ccea98212f529debbc2566a95;hb=2e481e5fc4c99d353cc5b21dacf1470847a11646;hp=e906806f4b887c4aefc2b0d053cfb04115eb2686;hpb=2a6c6fe01e84ffd54b47ea11aa766960df6ddcaf;p=mesa.git

diff --git a/configs/linux-egl b/configs/linux-egl
index e906806f4b8..216bcbab321 100644
--- a/configs/linux-egl
+++ b/configs/linux-egl
@@ -38,28 +38,21 @@ MESA_ASM_SOURCES =
 # Library/program dependencies
 EXTRA_LIB_PATH=-L/usr/X11R6/lib
 
+MESA_MODULES  = $(TOP)/src/mesa/libmesa.a
+
 LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm)
 LIBDRM_LIB = $(shell pkg-config --libs libdrm)
-DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
+DRI_LIB_DEPS  = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
 GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
 		-lm -lpthread -ldl \
                 $(LIBDRM_LIB)
 
 
-# This is now 0 by default since it seems to confuse the hell out of people
-# and generate a lot of extra noise on bugzilla.  If you need to build with
-# EGL, do 'make linux-dri USING_EGL=1'
-
-USING_EGL=0
-
 # Directories
-SRC_DIRS = gallium mesa gallium/winsys glu egl
-PROGRAM_DIRS = egl
+SRC_DIRS = gallium mesa gallium/winsys gallium/targets glu egl
 
 DRIVER_DIRS = dri
-WINDOW_SYSTEM = dri
 GALLIUM_WINSYS_DIRS = egl_drm
+GALLIUM_TARGET_DIRS =
 
-# gamma are missing because they have not been converted to use the new
-# interface.
 DRI_DIRS = intel