From 0cdebea90cf0d1148a248503fc95694f23d528e2 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 28 Jul 2014 19:45:09 +0100 Subject: automake: gallium/freedreno: drop spurious include dirs Rather than including two extra folders only for two headers, just prefix the headers and be done with it. Cc: "10.1 10.2" Cc: Rob Clark Cc: freedreno@lists.freedesktop.org Signed-off-by: Emil Velikov Reviewed-by: Rob Clark (cherry picked from commit 458d03a4a4cebe7b9e9ea265d18bfc547bc4b49c) Conflicts: src/gallium/drivers/freedreno/Makefile.am --- src/gallium/drivers/freedreno/Makefile.am | 2 -- src/gallium/drivers/freedreno/freedreno_screen.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/gallium/drivers') diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am index 7947dd1a56e..f110bad0c1f 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 332501ecd78..936b381a1f2 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" -- cgit v1.2.3