EGL: Only build EGL dri based drivers under linux-dri based configs

diff --git a/configs/default b/configs/default
index ef9c5fda1eba59dc1e0717cc7bf769e1fe5a1e79..1b203b00d295efb84efe8ab0690316e58ad9b889 100644 (file)
--- a/configs/default
+++ b/configs/default
@@ -66,6 +66,8 @@ DRIVER_DIRS =
 # Which subdirs under $(TOP)/progs/ to enter:
 PROGRAM_DIRS = demos redbook samples glsl xdemos
 
+# EGL directories
+EGL_DRIVERS_DIRS = demo
 
 # Gallium directories and 
 GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util

diff --git a/configs/linux-dri b/configs/linux-dri
index 380cd3812ff377b505410bd593e050cbdb274df4..7613d41ea19fc26b3e93d2dae458ae584169676e 100644 (file)
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -50,6 +50,8 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
 SRC_DIRS := glx/x11 egl $(SRC_DIRS)
 
 
+# EGL directories
+EGL_DRIVERS_DIRS = demo dri xdri
 
 DRIVER_DIRS =
 WINDOW_SYSTEM = dri

diff --git a/src/egl/drivers/Makefile b/src/egl/drivers/Makefile
index 6ce0e6b66d155eeb4db8a4098349861b841c5cd4..f0538f563f7ff93a28f6734cfbe7ef27e7894445 100644 (file)
--- a/src/egl/drivers/Makefile
+++ b/src/egl/drivers/Makefile
@@ -3,27 +3,10 @@
 TOP = ../../..
 include $(TOP)/configs/current
 
+SUBDIRS = $(EGL_DRIVERS_DIRS)
 
-SUBDIRS = demo dri xdri
-
-
-default: dri_subdirs
-
-
-# (UNUSED) depending on $DRIVER_DIRS...
-conditional_subdirs:
-       @if [ "${DRIVER_DIRS}" = "dri" ] ; then \
-               $(MAKE) dri_subdirs ; \
-       fi
-
-
-dri_subdirs:
-       @ (cd dri ; $(MAKE)) || exit 1
-       @ (cd xdri ; $(MAKE)) || exit 1
-
-demo_subdir:
-       @ (cd demo ; $(MAKE)) || exit 1
 
+default: subdirs
 
 
 subdirs: