[Mesa-dev] Mesa (master): gtest: Build it only for 'make check'.

[Ian Romanick]

On 01/13/2013 03:43 AM, Andreas Boll wrote:
> Module: Mesa
> Branch: master
> Commit: 40a9b0f5d2498d86e2e6a8e61c0737938559d6db
> URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=40a9b0f5d2498d86e2e6a8e61c0737938559d6db
>
> Author: Johannes Obermayr <johannesobermayr at gmx.de>
> Date:   Fri Dec 28 07:04:26 2012 +0100
>
> gtest: Build it only for 'make check'.
>
> Reviewed-by: Andreas Boll <andreas.boll.dev at gmail.com>
> Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

This appears to break 'make check' in the i965 driver:

gmake  test_eu_compact test_vec4_register_coalesce
gmake[7]: Entering directory 
`/home/idr/devel/graphics/Mesa/BUILD/master-64/src/mesa/drivers/dri/i965'
gmake[7]: *** No rule to make target 
`../../../../../src/gtest/libgtest.la', needed by 
`test_vec4_register_coalesce'.  Stop.

>
> ---
>
>   src/gtest/Makefile.am |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/src/gtest/Makefile.am b/src/gtest/Makefile.am
> index 7defa34..4188c6b 100644
> --- a/src/gtest/Makefile.am
> +++ b/src/gtest/Makefile.am
> @@ -22,7 +22,7 @@
>   AM_CFLAGS = $(DEFINES) -I$(top_srcdir)/src/gtest/include
>   AM_CXXFLAGS = $(DEFINES) -I$(top_srcdir)/src/gtest/include
>
> -noinst_LTLIBRARIES = libgtest.la
> +check_LTLIBRARIES = libgtest.la
>
>   libgtest_la_SOURCES = \
>   	src/gtest-all.cc \
>
> _______________________________________________
> mesa-commit mailing list
> mesa-commit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-commit
>