build egl subdirs

diff --git a/configs/linux-dri b/configs/linux-dri
index 9fd3721265661f1eb50626d0e087f661ae727782..380cd3812ff377b505410bd593e050cbdb274df4 100644 (file)
--- 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 a2d67ca5a8a4f55d8a5a49736de015a8f57e69c9..6ce0e6b66d155eeb4db8a4098349861b841c5cd4 100644 (file)
--- 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 ; \