From 22a13f5b09b62557fcbc72f38421bbd9328bcb37 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sat, 16 Aug 2014 20:37:30 +0100 Subject: [PATCH] winsys/svga: build: cleanup the includes gallium/drivers is already part fo GALLIUM_WINSYS_CFLAGS. Signed-off-by: Emil Velikov --- src/gallium/winsys/svga/drm/Makefile.am | 1 - src/gallium/winsys/svga/drm/SConscript | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/gallium/winsys/svga/drm/Makefile.am b/src/gallium/winsys/svga/drm/Makefile.am index 69398b85759..48d93e54276 100644 --- a/src/gallium/winsys/svga/drm/Makefile.am +++ b/src/gallium/winsys/svga/drm/Makefile.am @@ -26,7 +26,6 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ -I$(top_srcdir)/src/gallium/drivers/svga \ -I$(top_srcdir)/src/gallium/drivers/svga/include \ - -I$(top_srcdir)/src/gallium/drivers \ $(GALLIUM_WINSYS_CFLAGS) \ $(LIBDRM_CFLAGS) diff --git a/src/gallium/winsys/svga/drm/SConscript b/src/gallium/winsys/svga/drm/SConscript index fea9df36824..099acdac8c0 100644 --- a/src/gallium/winsys/svga/drm/SConscript +++ b/src/gallium/winsys/svga/drm/SConscript @@ -11,16 +11,12 @@ if env['gcc'] or env['clang'] or env['icc']: 'HAVE_SYS_TYPES_H', '-D_FILE_OFFSET_BITS=64', ]) - + env.Prepend(CPPPATH = [ - 'include', '#/src/gallium/drivers/svga', '#/src/gallium/drivers/svga/include', ]) -env.Append(CPPDEFINES = [ -]) - sources = env.ParseSourceList('Makefile.sources', 'C_SOURCES') svgadrm = env.ConvenienceLibrary( -- 2.30.2