[Mesa-dev] [PATCH 4/8] make: Remove duplicate occurence of driverfuncs.c

[Ian Romanick]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 08/26/2011 06:53 PM, Chad Versace wrote:
> Stop building driverfuncs.c twice for each DRI driver. driverfuncs.c is
> included in both libmesa.a and in
> src/mesa/drivers/dri/Makefiles.defines:COMMON_SOURCES, so remove it from
> COMMON_SOURCES.

It only actually gets built once, but the linker has to wrestle with it
twice.

> Signed-off-by: Chad Versace <chad at chad-versace.us>
> ---
>  src/mesa/drivers/dri/Makefile.defines |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/Makefile.defines b/src/mesa/drivers/dri/Makefile.defines
> index 19b6de8..90ae551 100644
> --- a/src/mesa/drivers/dri/Makefile.defines
> +++ b/src/mesa/drivers/dri/Makefile.defines
> @@ -7,7 +7,6 @@ COMMON_GALLIUM_SOURCES = \
>          ../common/xmlconfig.c
>  
>  COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \
> -        ../../common/driverfuncs.c \
>          ../common/texmem.c \
>          ../common/drirenderbuffer.c

It also appears in a some of dri/*/Makefile.  Those should probably get
cleaned up too.  It looks like the COMMON_SOURCES lines in r300/Makefile
and r600/Makefile can just be deleted.  swrast/Makefile could get some
cleaning too.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/

iEYEARECAAYFAk5YmeUACgkQX1gOwKyEAw88EQCdGlmTlKYwhdsAlFbspgQdKp71
qOoAoJyMqVTEDdSEvbOVDOKY5JcxCBgV
=JK1H
-----END PGP SIGNATURE-----