[Mesa-dev] [PATCH 1/7] mesa: Add gallium include dirs to more parts of the tree.

[Jose Fonseca]

Thanks for doing this. I appreciate it.

I have no objection with the series.  I'm happy to see more reuse.  We 
can always move things around later, and it will be much easier when 
then are less entangled/duplicated.

We'll need to update SCons include paths too.  If you have a git repos 
with your series that I can pull from I'll give it a go tomorrow and 
provide a patch for it.

Jose

On 12/02/15 00:48, Eric Anholt wrote:
> ---
>   src/glsl/Makefile.am                     | 2 ++
>   src/mesa/drivers/dri/common/Makefile.am  | 2 ++
>   src/mesa/drivers/dri/i915/Makefile.am    | 2 ++
>   src/mesa/drivers/dri/i965/Makefile.am    | 2 ++
>   src/mesa/drivers/dri/nouveau/Makefile.am | 2 ++
>   src/mesa/drivers/dri/r200/Makefile.am    | 2 ++
>   src/mesa/drivers/dri/radeon/Makefile.am  | 2 ++
>   src/mesa/drivers/dri/swrast/Makefile.am  | 2 ++
>   src/util/Makefile.am                     | 2 ++
>   9 files changed, 18 insertions(+)
>
> diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
> index e89a9ad..75a5b13 100644
> --- a/src/glsl/Makefile.am
> +++ b/src/glsl/Makefile.am
> @@ -26,6 +26,8 @@ AM_CPPFLAGS = \
>   	-I$(top_srcdir)/src \
>   	-I$(top_srcdir)/src/mapi \
>   	-I$(top_srcdir)/src/mesa/ \
> +	-I$(top_srcdir)/src/gallium/include \
> +	-I$(top_srcdir)/src/gallium/auxiliary \
>   	-I$(top_srcdir)/src/glsl/glcpp \
>   	-I$(top_srcdir)/src/glsl/nir \
>   	-I$(top_srcdir)/src/gtest/include \
> diff --git a/src/mesa/drivers/dri/common/Makefile.am b/src/mesa/drivers/dri/common/Makefile.am
> index af6f742..da8f97a 100644
> --- a/src/mesa/drivers/dri/common/Makefile.am
> +++ b/src/mesa/drivers/dri/common/Makefile.am
> @@ -30,6 +30,8 @@ AM_CFLAGS = \
>   	-I$(top_srcdir)/src/ \
>   	-I$(top_srcdir)/src/mapi \
>   	-I$(top_srcdir)/src/mesa/ \
> +	-I$(top_srcdir)/src/gallium/include \
> +	-I$(top_srcdir)/src/gallium/auxiliary \
>   	$(DEFINES) \
>   	$(EXPAT_CFLAGS) \
>   	$(VISIBILITY_CFLAGS)
> diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am
> index ac49360..822f74c 100644
> --- a/src/mesa/drivers/dri/i915/Makefile.am
> +++ b/src/mesa/drivers/dri/i915/Makefile.am
> @@ -28,6 +28,8 @@ AM_CFLAGS = \
>   	-I$(top_srcdir)/src/ \
>   	-I$(top_srcdir)/src/mapi \
>   	-I$(top_srcdir)/src/mesa/ \
> +	-I$(top_srcdir)/src/gallium/include \
> +	-I$(top_srcdir)/src/gallium/auxiliary \
>   	-I$(top_srcdir)/src/mesa/drivers/dri/common \
>   	-I$(top_srcdir)/src/mesa/drivers/dri/intel/server \
>   	-I$(top_builddir)/src/mesa/drivers/dri/common \
> diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
> index 07eefce..5d33159 100644
> --- a/src/mesa/drivers/dri/i965/Makefile.am
> +++ b/src/mesa/drivers/dri/i965/Makefile.am
> @@ -28,6 +28,8 @@ AM_CFLAGS = \
>   	-I$(top_srcdir)/src/ \
>   	-I$(top_srcdir)/src/mapi \
>   	-I$(top_srcdir)/src/mesa/ \
> +	-I$(top_srcdir)/src/gallium/include \
> +	-I$(top_srcdir)/src/gallium/auxiliary \
>   	-I$(top_srcdir)/src/mesa/drivers/dri/common \
>   	-I$(top_srcdir)/src/mesa/drivers/dri/intel/server \
>   	-I$(top_srcdir)/src/gtest/include \
> diff --git a/src/mesa/drivers/dri/nouveau/Makefile.am b/src/mesa/drivers/dri/nouveau/Makefile.am
> index f302864..61af95a 100644
> --- a/src/mesa/drivers/dri/nouveau/Makefile.am
> +++ b/src/mesa/drivers/dri/nouveau/Makefile.am
> @@ -33,6 +33,8 @@ AM_CFLAGS = \
>   	-I$(top_srcdir)/src/ \
>   	-I$(top_srcdir)/src/mapi \
>   	-I$(top_srcdir)/src/mesa/ \
> +	-I$(top_srcdir)/src/gallium/include \
> +	-I$(top_srcdir)/src/gallium/auxiliary \
>   	-I$(top_srcdir)/src/mesa/drivers/dri/common \
>   	$(DEFINES) \
>   	$(VISIBILITY_CFLAGS) \
> diff --git a/src/mesa/drivers/dri/r200/Makefile.am b/src/mesa/drivers/dri/r200/Makefile.am
> index a156728..137d3c8 100644
> --- a/src/mesa/drivers/dri/r200/Makefile.am
> +++ b/src/mesa/drivers/dri/r200/Makefile.am
> @@ -32,6 +32,8 @@ AM_CFLAGS = \
>   	-I$(top_srcdir)/src/ \
>   	-I$(top_srcdir)/src/mapi \
>   	-I$(top_srcdir)/src/mesa/ \
> +	-I$(top_srcdir)/src/gallium/include \
> +	-I$(top_srcdir)/src/gallium/auxiliary \
>   	-I$(top_srcdir)/src/mesa/drivers/dri/common \
>   	-I$(top_srcdir)/src/mesa/drivers/dri/r200/server \
>   	-I$(top_builddir)/src/mesa/drivers/dri/common \
> diff --git a/src/mesa/drivers/dri/radeon/Makefile.am b/src/mesa/drivers/dri/radeon/Makefile.am
> index 25c4884..b236aa6 100644
> --- a/src/mesa/drivers/dri/radeon/Makefile.am
> +++ b/src/mesa/drivers/dri/radeon/Makefile.am
> @@ -33,6 +33,8 @@ AM_CFLAGS = \
>   	-I$(top_srcdir)/src/ \
>   	-I$(top_srcdir)/src/mapi \
>   	-I$(top_srcdir)/src/mesa/ \
> +	-I$(top_srcdir)/src/gallium/include \
> +	-I$(top_srcdir)/src/gallium/auxiliary \
>   	-I$(top_srcdir)/src/mesa/drivers/dri/common \
>   	-I$(top_srcdir)/src/mesa/drivers/dri/radeon/server \
>   	-I$(top_builddir)/src/mesa/drivers/dri/common \
> diff --git a/src/mesa/drivers/dri/swrast/Makefile.am b/src/mesa/drivers/dri/swrast/Makefile.am
> index 0837b45..bfc3c10 100644
> --- a/src/mesa/drivers/dri/swrast/Makefile.am
> +++ b/src/mesa/drivers/dri/swrast/Makefile.am
> @@ -29,6 +29,8 @@ AM_CFLAGS = \
>   	-I$(top_srcdir)/src/ \
>   	-I$(top_srcdir)/src/mapi \
>   	-I$(top_srcdir)/src/mesa/ \
> +	-I$(top_srcdir)/src/gallium/include \
> +	-I$(top_srcdir)/src/gallium/auxiliary \
>   	-I$(top_srcdir)/src/mesa/drivers/dri/common \
>   	-I$(top_builddir)/src/mesa/drivers/dri/common \
>   	$(DEFINES) \
> diff --git a/src/util/Makefile.am b/src/util/Makefile.am
> index 7512138..9af2330 100644
> --- a/src/util/Makefile.am
> +++ b/src/util/Makefile.am
> @@ -31,6 +31,8 @@ libmesautil_la_CPPFLAGS = \
>   	-I$(top_srcdir)/src \
>   	-I$(top_srcdir)/src/mapi \
>   	-I$(top_srcdir)/src/mesa \
> +	-I$(top_srcdir)/src/gallium/include \
> +	-I$(top_srcdir)/src/gallium/auxiliary \
>   	$(SHA1_CFLAGS) \
>   	$(VISIBILITY_CFLAGS)
>
>