5 files changed, 13 insertions, 8 deletions
diff --git a/configs/default b/configs/default
index 13bda58f18..3a49c5a969 100644
--- a/configs/default
+++ b/configs/default
@@ -89,11 +89,14 @@ PROGRAM_DIRS = demos redbook samples glsl xdemos
 EGL_DRIVERS_DIRS = demo
 
 # Gallium directories and 
+GALLIUM_DIRS = auxiliary drivers state_trackers
 GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util indices
 GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
 GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv20 nv30 nv40 nv50 failover trace
 GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
 GALLIUM_WINSYS_DIRS = xlib egl_xlib
+GALLIUM_WINSYS_DRM_DIRS =
+GALLIUM_STATE_TRACKERS_DIRS = glx
 
 
 # Library dependencies
diff --git a/configs/linux-dri b/configs/linux-dri
index dc2ab4f9d9..8632170408 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -59,7 +59,9 @@ EGL_DRIVERS_DIRS = demo glx
 
 DRIVER_DIRS = dri
 WINDOW_SYSTEM = dri
-GALLIUM_WINSYS_DIRS = drm 
+GALLIUM_WINSYS_DIRS = drm
+GALLIUM_WINSYS_DRM_DIRS = intel nouveau
+GALLIUM_STATE_TRACKERS_DIRS = egl
 
 DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
 	savage sis tdfx trident unichrome ffb
diff --git a/src/gallium/Makefile b/src/gallium/Makefile
index c7b594d084..875314f6c3 100644
--- a/src/gallium/Makefile
+++ b/src/gallium/Makefile
@@ -2,7 +2,7 @@ TOP = ../..
 include $(TOP)/configs/current
 
 
-SUBDIRS = auxiliary drivers state_trackers
+SUBDIRS = $(GALLIUM_DIRS)
 # Note winsys/ needs to be built after src/mesa
 
 
diff --git a/src/gallium/state_trackers/Makefile b/src/gallium/state_trackers/Makefile
index 07b3fbf311..265ca468c2 100644
--- a/src/gallium/state_trackers/Makefile
+++ b/src/gallium/state_trackers/Makefile
@@ -2,7 +2,7 @@ TOP = ../../..
 include $(TOP)/configs/current
 
 
-SUBDIRS = glx
+SUBDIRS = $(GALLIUM_STATE_TRACKERS_DIRS)
 
 
 default: subdirs
diff --git a/src/gallium/winsys/drm/Makefile b/src/gallium/winsys/drm/Makefile
index f466ce6c3c..d2af5705f0 100644
--- a/src/gallium/winsys/drm/Makefile
+++ b/src/gallium/winsys/drm/Makefile
@@ -1,10 +1,10 @@
-# src/mesa/drivers/dri/Makefile
+# src/gallium/winsys/drm/Makefile
 
 TOP = ../../../..
 
 include $(TOP)/configs/current
 
-
+SUBDIRS = $(GALLIUM_WINSYS_DRM_DIRS)
 
 default: $(TOP)/$(LIB_DIR) subdirs
 
@@ -14,7 +14,7 @@ $(TOP)/$(LIB_DIR):
 
 
 subdirs:
-	@for dir in $(DRI_DIRS) ; do \
+	@for dir in $(SUBDIRS) ; do \
 		if [ -d $$dir ] ; then \
 			(cd $$dir && $(MAKE)) || exit 1 ; \
 		fi \
@@ -22,7 +22,7 @@ subdirs:
 
 
 install:
-	@for dir in $(DRI_DIRS) ; do \
+	@for dir in $(SUBDIRS) ; do \
 		if [ -d $$dir ] ; then \
 			(cd $$dir && $(MAKE) install) || exit 1 ; \
 		fi \
@@ -30,7 +30,7 @@ install:
 
 
 clean:
-	@for dir in $(DRI_DIRS) ; do \
+	@for dir in $(SUBDIRS) ; do \
 		if [ -d $$dir ] ; then \
 			(cd $$dir && $(MAKE) clean) ; \
 		fi \