Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

[mesa.git] / src / egl / drivers / Makefile

diff --git a/src/egl/drivers/Makefile b/src/egl/drivers/Makefile
index a2d67ca5a8a4f55d8a5a49736de015a8f57e69c9..dde4ee22551d231d69db0931d52313d52faba2a3 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: conditional_subdirs
-
-
-# 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:
@@ -33,6 +16,12 @@ subdirs:
                fi \
        done
 
+install:
+       @ for dir in $(SUBDIRS) ; do \
+               if [ -d $$dir ] ; then \
+                       (cd $$dir ; $(MAKE) install) || exit 1 ; \
+               fi \
+       done
 
 clean:
        @for dir in $(SUBDIRS) ; do \