vk/device: Remove unneeded checks for NULL

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

diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index f6c06eddd84cb6268d929ef9eb6f20b437293aab..ede6e21233a8612bbd8a5be841b7c1b2a61695ea 100644 (file)
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -11,8 +11,6 @@ SUBDIRS += auxiliary
 ##
 
 SUBDIRS += \
-       drivers/galahad \
-       drivers/identity \
        drivers/noop \
        drivers/trace \
        drivers/rbug
@@ -68,11 +66,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
@@ -97,24 +95,16 @@ if HAVE_DRI2
 SUBDIRS += winsys/sw/kms-dri
 endif
 
-if HAVE_EGL_PLATFORM_FBDEV
-SUBDIRS += winsys/sw/fbdev
-endif
-
-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'
 ##
 
 EXTRA_DIST = \
-       winsys/sw/android \
+       docs \
+       README.portability \
+       SConscript \
        winsys/sw/gdi \
        winsys/sw/hgl
 
@@ -123,7 +113,7 @@ EXTRA_DIST = \
 ## Gallium state trackers and their users (targets)
 ##
 
-if NEED_GALLIUM_LOADER
+if HAVE_LOADER_GALLIUM
 SUBDIRS += targets/pipe-loader
 endif
 
@@ -135,19 +125,6 @@ if HAVE_DRICOMMON
 SUBDIRS += state_trackers/dri targets/dri
 endif
 
-## the egl target depends on vega
-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
@@ -160,6 +137,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
@@ -172,15 +153,21 @@ 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 \
-       state_trackers/hgl targets/haiku-softpipe
+       state_trackers/hgl targets/haiku-softpipe \
+       tools
 
 
 ##