From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Sun, 13 Jul 2008 16:04:49 +0000 (+0200)
Subject: EGL: Only build EGL dri based drivers under linux-dri based configs
X-Git-Tag: android-x86-1.6~16^2~1465^2~390^2~939
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e59086ab91281cafcae094164bf4d8454df337ae;p=android-x86%2Fexternal-mesa.git

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

diff --git a/configs/default b/configs/default
index ef9c5fda1eb..1b203b00d29 100644
--- 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 380cd3812ff..7613d41ea19 100644
--- 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 6ce0e6b66d1..f0538f563f7 100644
--- 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: