summaryrefslogtreecommitdiffstats
path: root/src/gallium/Automake.inc
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-06-17 14:34:52 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2014-07-10 01:06:49 +0100
commit29ca7d2c9488d13e496ec65b6e1e1bf1d53042c5 (patch)
tree1e3c805a280ff354539fd82d33946b2b8cc90bd0 /src/gallium/Automake.inc
parentf6483aa6947437c42928c879dd28d758b7d12901 (diff)
downloadexternal_mesa3d-29ca7d2c9488d13e496ec65b6e1e1bf1d53042c5.zip
external_mesa3d-29ca7d2c9488d13e496ec65b6e1e1bf1d53042c5.tar.gz
external_mesa3d-29ca7d2c9488d13e496ec65b6e1e1bf1d53042c5.tar.bz2
st/dri: merge dri/drm and dri/sw backends
Move the driver_name to dri2/drisw and remove all the SPLIT_TAGETS mayhem. In the next step we'll unify the dri and dri-swrast targets, completing the gallium DRI megadriver. v2: Remove leftover st/dri Makefiles from CONFIG_FILES. Spotted by Thomas Helland. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Tested-by: Rob Clark <robclark@freedesktop.org> Tested-by: Thomas Helland <thomashelland90 at gmail.com> Acked-by: Tom Stellard <thomas.stellard@amd.com>
Diffstat (limited to 'src/gallium/Automake.inc')
-rw-r--r--src/gallium/Automake.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 1a21cad..bef16c8 100644
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -28,7 +28,7 @@ GALLIUM_DRIVER_CXXFLAGS = \
GALLIUM_DRI_CFLAGS = \
-I$(top_srcdir)/include \
- -I$(top_srcdir)/src/gallium/state_trackers/dri/common \
+ -I$(top_srcdir)/src/gallium/state_trackers/dri \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \