From a112ca5d5f8504310bf157d440c859676aae7753 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Sat, 7 Jul 2012 00:51:52 +0100 Subject: automake: convert libmesa and libmesagallium * "configure substitutions are not allowed in _SOURCES variables" in automake, so instead of MESA_ASM_FILES, use some AM_CONDITIONALS to choose which architecture's asm sources are used in libmesa_la_SOURCES. (Can't remove MESA_ASM_FILES autoconf variable as it's still used in sources.mak) * Update to link with the .la file in other Makefile.am files, and make a link to the .a file for the convenience of other Makefiles which have not yet been converted to automake v2: Remove stray -static from LDFLAGS v3: Remove .a compatibility link on clean Signed-off-by: Jon TURNEY Reviewed-by: Eric Anholt Tested-by: Matt Turner --- src/glsl/tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/glsl') diff --git a/src/glsl/tests/Makefile.am b/src/glsl/tests/Makefile.am index 4829fb2..33e634d 100644 --- a/src/glsl/tests/Makefile.am +++ b/src/glsl/tests/Makefile.am @@ -28,7 +28,7 @@ uniform_initializer_test_SOURCES = \ uniform_initializer_test_LDADD = \ $(top_builddir)/src/gtest/libgtest.la \ $(top_builddir)/src/glsl/libglsl.la \ - $(top_builddir)/src/mesa/libmesa.a \ + $(top_builddir)/src/mesa/libmesa.la \ -lpthread ralloc_test_SOURCES = ralloc_test.cpp $(top_builddir)/src/glsl/ralloc.c -- cgit v1.1