[Mesa-dev] [PATCH 04/29] r600: use NEED_RADEON_LLVM over R600_NEED_RADEON_GALLIUM

[Tom Stellard]

On Sun, Sep 22, 2013 at 09:29:27PM +0100, Emil Velikov wrote:
> libllvmradeon.la is available whenever NEED_RADEON_LLVM is set, using
> R600_NEED_RADEON_GALLIUM is rather ambiguous and unnecessary. Drop it
> in favour of NEED_RADEON_LLVM.
> 
Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
>  configure.ac                         | 2 --
>  src/gallium/drivers/r600/Makefile.am | 2 +-
>  2 files changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index a14e791..cf3ffd8 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1773,7 +1773,6 @@ if test "x$with_gallium_drivers" != x; then
>              GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600"
>              if test "x$enable_r600_llvm" = xyes -o "x$enable_opencl" = xyes; then
>                  radeon_llvm_check
> -                R600_NEED_RADEON_GALLIUM=yes;
>                  LLVM_COMPONENTS="${LLVM_COMPONENTS} bitreader asmparser"
>              fi
>              if test "x$enable_r600_llvm" = xyes; then
> @@ -1929,7 +1928,6 @@ AM_CONDITIONAL(NEED_WINSYS_WRAPPER, test "x$HAVE_GALLIUM_I915" = xyes -o \
>                                           "x$HAVE_GALLIUM_SVGA" = xyes)
>  AM_CONDITIONAL(NEED_WINSYS_XLIB, test "x$NEED_WINSYS_XLIB" = xyes)
>  AM_CONDITIONAL(NEED_RADEON_LLVM, test x$NEED_RADEON_LLVM = xyes)
> -AM_CONDITIONAL(R600_NEED_RADEON_GALLIUM, test x$R600_NEED_RADEON_GALLIUM = xyes)
>  AM_CONDITIONAL(USE_R600_LLVM_COMPILER, test x$USE_R600_LLVM_COMPILER = xyes)
>  AM_CONDITIONAL(HAVE_LOADER_GALLIUM, test x$enable_gallium_loader = xyes)
>  AM_CONDITIONAL(HAVE_DRM_LOADER_GALLIUM, test x$enable_gallium_drm_loader = xyes)
> diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
> index 9203d03..cbe4a09 100644
> --- a/src/gallium/drivers/r600/Makefile.am
> +++ b/src/gallium/drivers/r600/Makefile.am
> @@ -24,7 +24,7 @@ libr600_la_SOURCES = \
>  
>  libr600_la_LIBADD = ../radeon/libradeon.la
>  
> -if R600_NEED_RADEON_GALLIUM
> +if NEED_RADEON_LLVM
>  
>  libr600_la_SOURCES += \
>  	$(LLVM_C_SOURCES)
> -- 
> 1.8.4
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev