[Mesa-stable] [PATCH 1/2] vl/dri3: get Makefile properly

[Leo Liu]

in order to accommodate scons build

Signed-off-by: Leo Liu <leo.liu at amd.com>
Cc: "12.0" <mesa-stable at lists.freedesktop.org>
---
 src/gallium/auxiliary/Makefile.am         | 7 +++++++
 src/gallium/auxiliary/Makefile.sources    | 4 +++-
 src/gallium/auxiliary/vl/vl_winsys_dri3.c | 4 ----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index 296ed59..d971a2b 100644
--- a/src/gallium/auxiliary/Makefile.am
+++ b/src/gallium/auxiliary/Makefile.am
@@ -82,6 +82,13 @@ libgalliumvlwinsys_la_CFLAGS = \
 libgalliumvlwinsys_la_SOURCES = \
 	$(VL_WINSYS_SOURCES)
 
+if HAVE_DRI3
+
+libgalliumvlwinsys_la_SOURCES += \
+	$(VL_WINSYS_DRI3_SOURCES)
+
+endif
+
 endif
 
 endif
diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index 26a06b2..7b3853e 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -350,9 +350,11 @@ VL_SOURCES := \
 # XXX: Nuke this as our dri targets no longer depend on VL.
 VL_WINSYS_SOURCES := \
 	vl/vl_winsys_dri.c \
-	vl/vl_winsys_dri3.c \
 	vl/vl_winsys_drm.c
 
+VL_WINSYS_DRI3_SOURCES := \
+	vl/vl_winsys_dri3.c
+
 VL_STUB_SOURCES := \
 	vl/vl_stubs.c
 
diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri3.c b/src/gallium/auxiliary/vl/vl_winsys_dri3.c
index e438db3..c69e677 100644
--- a/src/gallium/auxiliary/vl/vl_winsys_dri3.c
+++ b/src/gallium/auxiliary/vl/vl_winsys_dri3.c
@@ -25,8 +25,6 @@
  *
  **************************************************************************/
 
-#if defined(HAVE_DRI3)
-
 #include <fcntl.h>
 
 #include <X11/Xlib-xcb.h>
@@ -706,5 +704,3 @@ free_screen:
    FREE(scrn);
    return NULL;
 }
-
-#endif // defined(HAVE_DRI3)
-- 
2.7.4