build: Remove GALLIUM_DIRS

It's always constant anyway.

Tested-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-and-Tested-by: Andreas Boll <andreas.boll.dev@gmail.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

diff --git a/configure.ac b/configure.ac
index 160ee9d825bcc969dfea6d222c60913810a1892e..e76469b0de82ba46174828eae3a735e53b641c86 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -752,7 +752,6 @@ AM_CONDITIONAL(HAVE_SHARED_GLAPI, test "x$enable_shared_glapi" = xyes)
 dnl
 dnl Driver specific build directories
 dnl
-GALLIUM_DIRS="auxiliary drivers state_trackers"
 GALLIUM_TARGET_DIRS=""
 GALLIUM_WINSYS_DIRS="sw"
 GALLIUM_DRIVERS_DIRS="galahad trace rbug noop identity"
@@ -783,7 +782,6 @@ if test "x$enable_osmesa" = xyes; then
 fi
 
 AC_SUBST([DRIVER_DIRS])
-AC_SUBST([GALLIUM_DIRS])
 AC_SUBST([GALLIUM_TARGET_DIRS])
 AC_SUBST([GALLIUM_WINSYS_DIRS])
 AC_SUBST([GALLIUM_DRIVERS_DIRS])
@@ -2020,7 +2018,6 @@ AC_CONFIG_FILES([Makefile
                src/egl/wayland/wayland-drm/Makefile
                src/egl/wayland/wayland-egl/Makefile
                src/egl/wayland/wayland-egl/wayland-egl.pc
-               src/gallium/Makefile
                src/gallium/auxiliary/Makefile
                src/gallium/auxiliary/pipe-loader/Makefile
                src/gallium/drivers/Makefile
@@ -2229,7 +2226,6 @@ fi
 echo ""
 if test -n "$with_gallium_drivers"; then
     echo "        Gallium:         yes"
-    echo "        Gallium dirs:    $GALLIUM_DIRS"
     echo "        Target dirs:     $GALLIUM_TARGET_DIRS"
     echo "        Winsys dirs:     $GALLIUM_WINSYS_DIRS"
     echo "        Driver dirs:     $GALLIUM_DRIVERS_DIRS"

diff --git a/src/Makefile.am b/src/Makefile.am
index b6449b967b38238aa0f0c5b217b430e4682b82bc..b3dc44d6fd66382f0901122850c7ff68478d80bc 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,7 +39,9 @@ endif
 
 if HAVE_GALLIUM
 SUBDIRS +=                     \
-       gallium                 \
+       gallium/auxiliary       \
+       gallium/drivers         \
+       gallium/state_trackers  \
        gallium/winsys          \
        gallium/targets
 

diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
deleted file mode 100644 (file)
index e7cff89..0000000
--- a/src/gallium/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright © 2012 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 = $(GALLIUM_DIRS)