[Mesa-dev] [PATCH 1/8] add megadriver_stub_FILES

[Emil Velikov]

Hi Adrian,

I seem to recall seeing this patch although it seems like it never got pushed.

Note sure how the Android development process goes but imho these should be
safe to go in stable.

Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>

Let me know if you need someone to push these for you.

In your next series can you please cleanup (remove)
 - src/mesa/Android.libmesa_dricore.mk
 - src/mesa/program/Android.mk

They stand alone with no automake/scons counterparts and can be folded in
their users. Keeping them as is makes things harder for people to correctly
update the all build systems when they add new files/local static libs.

Cheers,
Emil

On 06/06/14 10:16, Adrian Negreanu wrote:
> From: Adrian Negreanu <adrian.m.negreanu at intel.com>
> 
> So that android part can also use $(megadriver_stub_FILES)
> 
> Signed-off-by: Adrian Negreanu <adrian.m.negreanu at intel.com>
> ---
>  src/mesa/drivers/dri/common/Makefile.am      | 2 +-
>  src/mesa/drivers/dri/common/Makefile.sources | 3 +++
>  2 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/src/mesa/drivers/dri/common/Makefile.am b/src/mesa/drivers/dri/common/Makefile.am
> index c98ccf7..7222a96 100644
> --- a/src/mesa/drivers/dri/common/Makefile.am
> +++ b/src/mesa/drivers/dri/common/Makefile.am
> @@ -42,7 +42,7 @@ libdricommon_la_SOURCES = $(DRI_COMMON_FILES)
>  libdri_test_stubs_la_SOURCES = $(test_stubs_FILES)
>  libdri_test_stubs_la_CFLAGS = $(AM_CFLAGS) -DNO_MAIN
>  
> -libmegadriver_stub_la_SOURCES = megadriver_stub.c
> +libmegadriver_stub_la_SOURCES = $(megadriver_stub_FILES)
>  
>  sysconf_DATA = drirc
>  
> diff --git a/src/mesa/drivers/dri/common/Makefile.sources b/src/mesa/drivers/dri/common/Makefile.sources
> index 8469b49..43b289e 100644
> --- a/src/mesa/drivers/dri/common/Makefile.sources
> +++ b/src/mesa/drivers/dri/common/Makefile.sources
> @@ -14,3 +14,6 @@ mesa_dri_common_INCLUDES := \
>  
>  test_stubs_FILES := \
>  	dri_test.c
> +
> +megadriver_stub_FILES := \
> +	megadriver_stub.c
>