SUBDIRS =
+##
+## Gallium auxiliary module
+##
+
+SUBDIRS += auxiliary
+
##
## Gallium pipe drivers and their respective winsys'
##
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
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 = \
+ docs \
+ README.portability \
+ SConscript \
+ state_trackers/egl \
+ state_trackers/gbm \
+ targets/egl-static \
+ targets/gbm \
+ winsys/sw/gdi \
+ winsys/sw/hgl
##
-## Gallium state trackers
+## Gallium state trackers and their users (targets)
##
-if HAVE_CLOVER
-SUBDIRS += state_trackers/clover
+if HAVE_LOADER_GALLIUM
+SUBDIRS += targets/pipe-loader
endif
-if HAVE_DRICOMMON
-SUBDIRS += state_trackers/dri
+if HAVE_CLOVER
+SUBDIRS += state_trackers/clover targets/opencl
endif
-if HAVE_GALLIUM_EGL
-SUBDIRS += state_trackers/egl
+if HAVE_DRICOMMON
+SUBDIRS += state_trackers/dri targets/dri
endif
-if HAVE_GALLIUM_GBM
-SUBDIRS += state_trackers/gbm
+## the egl target depends on vega
+if HAVE_OPENVG
+SUBDIRS += state_trackers/vega
endif
if HAVE_X11_DRIVER
-SUBDIRS += state_trackers/glx/xlib
+SUBDIRS += state_trackers/glx/xlib targets/libgl-xlib
endif
if HAVE_ST_OMX
-SUBDIRS += state_trackers/omx
+SUBDIRS += state_trackers/omx targets/omx
endif
if HAVE_GALLIUM_OSMESA
-SUBDIRS += state_trackers/osmesa
+SUBDIRS += state_trackers/osmesa targets/osmesa
endif
-if HAVE_ST_VDPAU
-SUBDIRS += state_trackers/vdpau
+if HAVE_ST_VA
+SUBDIRS += state_trackers/va targets/va
endif
-if HAVE_OPENVG
-SUBDIRS += state_trackers/vega
+if HAVE_ST_VDPAU
+SUBDIRS += state_trackers/vdpau targets/vdpau
endif
if HAVE_ST_XA
-SUBDIRS += state_trackers/xa
+SUBDIRS += state_trackers/xa targets/xa
endif
if HAVE_ST_XVMC
-SUBDIRS += state_trackers/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 \
+ tools
+
+
+##
+## Gallium tests
+##
+
+if HAVE_GALLIUM_TESTS
+SUBDIRS += \
+ tests/trivial \
+ tests/unit
endif
+
+EXTRA_DIST += \
+ tests/graw \
+ tests/python