st/nine: NineBaseTexture9: update sampler view creation

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

diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index 3cefb2ff6f927aa6ff8c14a41dc5315147315299..6a2a866549c706262cd802fcb34db80fbaabf0b7 100644 (file)
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -68,11 +68,11 @@ SUBDIRS += winsys/radeon/drm
 endif
 
 ## swrast/softpipe
-if NEED_GALLIUM_SOFTPIPE_DRIVER
+if HAVE_GALLIUM_SOFTPIPE
 SUBDIRS += drivers/softpipe
 
 ## swrast/llvmpipe
-if NEED_GALLIUM_LLVMPIPE_DRIVER
+if HAVE_GALLIUM_LLVMPIPE
 SUBDIRS += drivers/llvmpipe
 endif
 endif
@@ -112,7 +112,13 @@ SUBDIRS += winsys/sw/wrapper
 ##
 
 EXTRA_DIST = \
-       winsys/sw/android \
+       docs \
+       README.portability \
+       SConscript \
+       state_trackers/egl \
+       state_trackers/gbm \
+       targets/egl-static \
+       targets/gbm \
        winsys/sw/gdi \
        winsys/sw/hgl
 
@@ -121,7 +127,7 @@ EXTRA_DIST = \
 ## Gallium state trackers and their users (targets)
 ##
 
-if NEED_GALLIUM_LOADER
+if HAVE_LOADER_GALLIUM
 SUBDIRS += targets/pipe-loader
 endif
 
@@ -138,14 +144,6 @@ if HAVE_OPENVG
 SUBDIRS += state_trackers/vega
 endif
 
-if HAVE_GALLIUM_EGL
-SUBDIRS += state_trackers/egl targets/egl-static
-endif
-
-if HAVE_GALLIUM_GBM
-SUBDIRS += state_trackers/gbm targets/gbm
-endif
-
 if HAVE_X11_DRIVER
 SUBDIRS += state_trackers/glx/xlib targets/libgl-xlib
 endif
@@ -158,6 +156,10 @@ if HAVE_GALLIUM_OSMESA
 SUBDIRS += state_trackers/osmesa targets/osmesa
 endif
 
+if HAVE_ST_VA
+SUBDIRS += state_trackers/va targets/va
+endif
+
 if HAVE_ST_VDPAU
 SUBDIRS += state_trackers/vdpau targets/vdpau
 endif
@@ -170,11 +172,16 @@ if HAVE_ST_XVMC
 SUBDIRS += state_trackers/xvmc targets/xvmc
 endif
 
+if HAVE_ST_NINE
+SUBDIRS += state_trackers/nine targets/d3dadapter9
+endif
+
 ##
 ## Don't forget to bundle the remaining (non autotools) state-trackers/targets
 ##
 
 EXTRA_DIST += \
+       include \
        state_trackers/README \
        state_trackers/wgl targets/libgl-gdi \
        targets/graw-gdi targets/graw-null  targets/graw-xlib \