clover: Require libelf

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

diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index fd205d79bfb5c26cd9e238e8a17dfce50e0f798b..21595a1aaf0901698708a8ffb5106a644fd88f8d 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
@@ -105,9 +105,7 @@ if HAVE_EGL_PLATFORM_WAYLAND
 SUBDIRS += winsys/sw/wayland
 endif
 
-if NEED_WINSYS_WRAPPER
 SUBDIRS += winsys/sw/wrapper
-endif
 
 ##
 ## Don't forget to bundle the remaining (non autotools) winsys'
@@ -123,7 +121,7 @@ EXTRA_DIST = \
 ## Gallium state trackers and their users (targets)
 ##
 
-if NEED_GALLIUM_LOADER
+if HAVE_LOADER_GALLIUM
 SUBDIRS += targets/pipe-loader
 endif
 
@@ -160,6 +158,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
@@ -177,9 +179,11 @@ endif
 ##
 
 EXTRA_DIST += \
+       state_trackers/README \
        state_trackers/wgl targets/libgl-gdi \
        targets/graw-gdi targets/graw-null  targets/graw-xlib \
-       state_trackers/hgl targets/haiku-softpipe
+       state_trackers/hgl targets/haiku-softpipe \
+       tools
 
 
 ##
@@ -191,3 +195,7 @@ SUBDIRS += \
        tests/trivial \
        tests/unit
 endif
+
+EXTRA_DIST += \
+       tests/graw \
+       tests/python