[Mesa-stable] [PATCH 06/14] gallium/freedreno: automake: drop spurious include dirs

[Rob Clark]

On Mon, Jul 21, 2014 at 6:40 AM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> Rather than including two extra folders only for two headers,
> correctly prefix the headers.
>
> Cc: "10.1 10.2" <mesa-stable at lists.freedesktop.org>
> Cc: Rob Clark <robclark at freedesktop.org>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>

Reviewed-by: Rob Clark <robdclark at gmail.com>

> ---
>  src/gallium/drivers/freedreno/Makefile.am        | 2 --
>  src/gallium/drivers/freedreno/freedreno_screen.c | 4 ++--
>  2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am
> index 7947dd1..f110bad 100644
> --- a/src/gallium/drivers/freedreno/Makefile.am
> +++ b/src/gallium/drivers/freedreno/Makefile.am
> @@ -5,8 +5,6 @@ include $(top_srcdir)/src/gallium/Automake.inc
>
>  AM_CFLAGS = \
>         -Wno-packed-bitfield-compat \
> -       -I$(top_srcdir)/src/gallium/drivers/freedreno/a3xx \
> -       -I$(top_srcdir)/src/gallium/drivers/freedreno/a2xx \
>         $(GALLIUM_DRIVER_CFLAGS) \
>         $(FREEDRENO_CFLAGS)
>
> diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c
> index 05426dc..063b505 100644
> --- a/src/gallium/drivers/freedreno/freedreno_screen.c
> +++ b/src/gallium/drivers/freedreno/freedreno_screen.c
> @@ -50,8 +50,8 @@
>  #include "freedreno_query.h"
>  #include "freedreno_util.h"
>
> -#include "fd2_screen.h"
> -#include "fd3_screen.h"
> +#include "a2xx/fd2_screen.h"
> +#include "a3xx/fd3_screen.h"
>
>  /* XXX this should go away */
>  #include "state_tracker/drm_driver.h"
> --
> 2.0.0
>