nv50: disable stream output before reconfiguring it

[mesa.git] / src / gallium / drivers / Makefile.am

diff --git a/src/gallium/drivers/Makefile.am b/src/gallium/drivers/Makefile.am
index f2e7da110f9cc49c3594e7254c6d6508599e913d..97c5695fa15f9c5c551d5fbcd6574ec0a6202219 100644 (file)
--- a/src/gallium/drivers/Makefile.am
+++ b/src/gallium/drivers/Makefile.am
@@ -10,6 +10,8 @@ AM_CPPFLAGS = \
 
 noinst_LIBRARIES =
 
+SUBDIRS =
+
 ################################################################################
 
 if HAVE_GALAHAD_GALLIUM
@@ -38,7 +40,30 @@ endif
 
 ################################################################################
 
-SUBDIRS = $(GALLIUM_MAKE_DIRS)
+if HAVE_NOOP_GALLIUM
+
+# Meta-driver which combines whichever software rasterizers have been
+# built into a single convenience library.
+
+noinst_LIBRARIES+= noop/libnoop.a
+
+noop_libnoop_a_SOURCES = \
+       noop/noop_pipe.c \
+       noop/noop_state.c
+
+endif
+
+################################################################################
+
+if NEED_RADEON_GALLIUM
+
+SUBDIRS+= radeon
+
+endif
+
+################################################################################
+
+SUBDIRS+= $(GALLIUM_MAKE_DIRS)
 
 # FIXME: Remove when the rest of Gallium is converted to automake.
 default: all