The respective HAVE_{SOFT,LLVM}PIPE are already descriptive
enough. Additionally the svga modules does not really use either
one, but the auxiliary draw & gallivm modules.
Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
---
configure.ac | 5 -----
src/gallium/Makefile.am | 4 ++--
src/gallium/targets/dri/Makefile.am | 2 +-
src/gallium/targets/egl-static/Makefile.am | 2 +-
4 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7e15911..760a374 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2075,11 +2075,6 @@ AM_CONDITIONAL(HAVE_GALLIUM_SOFTPIPE, test
"x$HAVE_GALLIUM_SOFTPIPE" = xyes)
AM_CONDITIONAL(HAVE_GALLIUM_LLVMPIPE, test "x$HAVE_GALLIUM_LLVMPIPE" = xyes)
AM_CONDITIONAL(HAVE_GALLIUM_VC4, test "x$HAVE_GALLIUM_VC4" = xyes)
-AM_CONDITIONAL(NEED_GALLIUM_SOFTPIPE_DRIVER, test "x$HAVE_GALLIUM_SVGA" = xyes
-o \
- "x$HAVE_GALLIUM_SOFTPIPE" =
xyes)
-AM_CONDITIONAL(NEED_GALLIUM_LLVMPIPE_DRIVER, test "x$HAVE_GALLIUM_SOFTPIPE" =
xyes \
- && test "x$MESA_LLVM" = x1)
-
AM_CONDITIONAL(HAVE_GALLIUM_STATIC_TARGETS, test
"x$enable_shared_pipe_drivers" = xno)
# NOTE: anything using xcb or other client side libs ends up in separate
diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
index 6018e9f..26ed817 100644
--- a/src/gallium/Makefile.am
+++ b/src/gallium/Makefile.am
@@ -68,11 +68,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
diff --git a/src/gallium/targets/dri/Makefile.am
b/src/gallium/targets/dri/Makefile.am
index 2451358..fe9624f 100644
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -98,7 +98,7 @@ STATIC_TARGET_LIB_DEPS += \
endif
endif
-if NEED_GALLIUM_LLVMPIPE_DRIVER
+if HAVE_GALLIUM_LLVMPIPE
STATIC_TARGET_CPPFLAGS += -DGALLIUM_LLVMPIPE
STATIC_TARGET_LIB_DEPS += \
$(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la
diff --git a/src/gallium/targets/egl-static/Makefile.am
b/src/gallium/targets/egl-static/Makefile.am
index 472eea7..fdb1ba2 100644
--- a/src/gallium/targets/egl-static/Makefile.am
+++ b/src/gallium/targets/egl-static/Makefile.am
@@ -181,7 +181,7 @@ egl_gallium_la_LIBADD += \
$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la
endif
-if NEED_GALLIUM_LLVMPIPE_DRIVER
+if HAVE_GALLIUM_LLVMPIPE
egl_gallium_la_CPPFLAGS += -DGALLIUM_LLVMPIPE
egl_gallium_la_LIBADD += \
$(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la
--
2.1.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
