It's always constant anyway.
---
Makefile.am | 7 ++++++-
configure.ac | 4 ----
src/gallium/Makefile.am | 22 ----------------------
3 files changed, 6 insertions(+), 27 deletions(-)
delete mode 100644 src/gallium/Makefile.am
diff --git a/Makefile.am b/Makefile.am
index c3e2baa..6eabe90 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,7 +58,12 @@ SUBDIRS += src/egl
endif
if HAVE_GALLIUM
-SUBDIRS += src/gallium src/gallium/winsys src/gallium/targets
+SUBDIRS += \
+ src/gallium/auxiliary \
+ src/gallium/drivers \
+ src/gallium/state_trackers \
+ src/gallium/winsys \
+ src/gallium/targets
if HAVE_GALLIUM_TESTS
SUBDIRS += src/gallium/tests/trivial src/gallium/tests/unit
diff --git a/configure.ac b/configure.ac
index f25d488..854e616 100644
--- a/configure.ac
+++ b/configure.ac
@@ -759,7 +759,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"
@@ -788,7 +787,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])
@@ -2035,7 +2033,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
@@ -2238,7 +2235,6 @@ fi
echo ""
if test -n "x$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/gallium/Makefile.am b/src/gallium/Makefile.am
deleted file mode 100644
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)
--
1.7.8.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
