[Mesa-dev] [PATCH 17/18] build: Get rid of GALLIUM_TARGET_DIRS

[Matt Turner]

---
 configure.ac                    |    2 +-
 src/gallium/targets/Makefile.am |  142 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 142 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7cc3080..d5ea69a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -774,7 +774,6 @@ if test "x$enable_dri" = xyes; then
     GALLIUM_STATE_TRACKERS_DIRS="dri $GALLIUM_STATE_TRACKERS_DIRS"
 fi
 
-AC_SUBST([GALLIUM_TARGET_DIRS])
 AC_SUBST([GALLIUM_WINSYS_DIRS])
 AC_SUBST([MESA_LLVM])
 
@@ -1667,6 +1666,7 @@ AM_CONDITIONAL(HAVE_GALLIUM_TESTS, test "x$enable_gallium_tests" = xyes)
 if test "x$enable_gallium_loader" = xyes; then
     GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS pipe-loader"
 fi
+AM_CONDITIONAL(NEED_GALLIUM_LOADER, test "x$enable_gallium_loader" = xyes)
 
 dnl Directory for VDPAU libs
 AC_ARG_WITH([vdpau-libdir],
diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am
index deeefbe..c80b56d 100644
--- a/src/gallium/targets/Makefile.am
+++ b/src/gallium/targets/Makefile.am
@@ -1 +1,141 @@
-SUBDIRS = $(GALLIUM_TARGET_DIRS)
+# Copyright © 2013 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+SUBDIRS =
+
+if HAVE_X11_DRIVER
+SUBDIRS += libgl-xlib
+endif
+
+if HAVE_GALLIUM_GBM
+SUBDIRS += gbm
+endif
+
+if HAVE_CLOVER
+SUBDIRS += opencl
+endif
+
+if HAVE_GALLIUM_SVGA
+if HAVE_DRI
+SUBDIRS += dri-vmwgfx
+endif
+
+if HAVE_ST_XA
+SUBDIRS += xa-vmwgfx
+endif
+endif
+
+if HAVE_GALLIUM_I915
+if HAVE_DRI
+SUBDIRS += dri-i915
+endif
+
+if HAVE_ST_XORG
+SUBDIRS += xorg-i915
+endif
+endif
+
+if HAVE_GALLIUM_R300
+if HAVE_DRI
+SUBDIRS += dri-r300
+endif
+
+if HAVE_ST_XVMC
+SUBDIRS += xvmc-r300
+endif
+
+if HAVE_ST_VDPAU
+SUBDIRS += vdpau-r300
+endif
+endif
+
+if HAVE_GALLIUM_R600
+if HAVE_DRI
+SUBDIRS += dri-r600
+endif
+
+if HAVE_ST_XORG
+SUBDIRS += xorg-r600
+endif
+
+if HAVE_ST_XVMC
+SUBDIRS += xvmc-r600
+endif
+
+if HAVE_ST_VDPAU
+SUBDIRS += vdpau-r600
+endif
+endif
+
+if HAVE_GALLIUM_RADEONSI
+if HAVE_DRI
+SUBDIRS += dri-radeonsi
+endif
+
+if HAVE_ST_XORG
+SUBDIRS += xorg-radeonsi
+endif
+
+if HAVE_ST_VDPAU
+SUBDIRS += vdpau-radeonsi
+endif
+endif
+
+if HAVE_GALLIUM_NOUVEAU
+if HAVE_DRI
+SUBDIRS += dri-nouveau
+endif
+
+if HAVE_ST_XORG
+SUBDIRS += xorg-nouveau
+endif
+
+if HAVE_ST_XVMC
+SUBDIRS += xvmc-nouveau
+endif
+
+if HAVE_ST_VDPAU
+SUBDIRS += vdpau-nouveau
+endif
+endif
+
+if HAVE_GALLIUM_SOFTPIPE
+if HAVE_DRI
+SUBDIRS += dri-swrast
+endif
+
+if HAVE_ST_XVMC
+SUBDIRS += xvmc-softpipe
+endif
+
+if HAVE_ST_VDPAU
+SUBDIRS += vdpau-softpipe
+endif
+endif
+
+if NEED_GALLIUM_LOADER
+SUBDIRS += pipe-loader
+endif
+
+if HAVE_GALLIUM_EGL
+SUBDIRS += egl-static
+endif
-- 
1.7.8.6