From 7986baf7cf5434c0ff8210eedd0be366ab5e8f14 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 10 Jul 2008 15:11:01 -0600
Subject: build egl subdirs

---
 configs/linux-dri        | 12 +-----------
 src/egl/drivers/Makefile |  4 ++--
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/configs/linux-dri b/configs/linux-dri
index 9fd3721265..380cd3812f 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -46,18 +46,8 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
                 $(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 := glx/x11 $(SRC_DIRS)
-ifeq ($(USING_EGL), 1)
-SRC_DIRS := egl $(SRC_DIRS)
-PROGRAM_DIRS = egl
-endif
+SRC_DIRS := glx/x11 egl $(SRC_DIRS)
 
 
 
diff --git a/src/egl/drivers/Makefile b/src/egl/drivers/Makefile
index a2d67ca5a8..6ce0e6b66d 100644
--- a/src/egl/drivers/Makefile
+++ b/src/egl/drivers/Makefile
@@ -7,10 +7,10 @@ include $(TOP)/configs/current
 SUBDIRS = demo dri xdri
 
 
-default: conditional_subdirs
+default: dri_subdirs
 
 
-# depending on $DRIVER_DIRS...
+# (UNUSED) depending on $DRIVER_DIRS...
 conditional_subdirs:
 	@if [ "${DRIVER_DIRS}" = "dri" ] ; then \
 		$(MAKE) dri_subdirs ; \
-- 
cgit v1.2.3