* "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)
* Up
On 09/07/2012 17:31, Eric Anholt wrote:
> Jon TURNEY writes:
>> diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
>> index bada760..08beaa6 100644
>> --- a/src/mesa/Makefile.am
>> +++ b/src/mesa/Makefile.am
>
>> +libmesa_la_SOURCES = \
>> +$(MESA_FILES) \
>> +$(MESA_CXX_FILES) \
>>
Jon TURNEY writes:
> diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
> index bada760..08beaa6 100644
> --- a/src/mesa/Makefile.am
> +++ b/src/mesa/Makefile.am
> +libmesa_la_SOURCES = \
> + $(MESA_FILES) \
> + $(MESA_CXX_FILES) \
> +$(MESA_ASM_FILES_FOR_ARCH)
> +
> +libmes
Signed-off-by: Jon TURNEY
---
src/glsl/tests/Makefile.am |2 +-
src/mesa/Makefile.am| 45 +--
src/mesa/Makefile.old | 57 +--
src/mesa/drivers/osmesa/Makefile.am |2 +-
src/mesa/drivers/x11/