From: Leo Liu <leo.liu@amd.com>
Date: Thu, 9 Jun 2016 17:11:52 +0000 (-0400)
Subject: vl/dri3: get Makefile properly
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0ef8500aabb5430eae76919438fcf61020b7eb8e;p=mesa.git

vl/dri3: get Makefile properly

From original commit, the macro "if HAVE_DRI3" was in Makefile.sources,
this file is shared with SCons, SCons is not able to parse this marco,
the SCons build failed. Jose quickly gave two approaches and quick fix
with his second approach, thanks Jose for the solutions and fixes.

This patch is Jose's first approach, and it's more proper, because the
dri3 c file should not be included to build when DRI3 is not enabled.

Signed-off-by: Leo Liu <leo.liu@amd.com>
Acked-by: Emil Velikov <emil.velikov@collabora.com>
Cc: "12.0" <mesa-stable@lists.freedesktop.org>
---

diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
index 296ed59317b..d971a2b16e2 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 26a06b29f60..7b3853ef2bd 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 e438db3dff8..c69e67796c0 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)