From: Emil Velikov <emil.velikov@collabora.com>
Date: Fri, 29 Apr 2016 17:41:08 +0000 (+0100)
Subject: automake: include vulkan subdir after wayland-drm
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3a2d09dd654fffb17a50699ac5fb293cb6be6e84;p=mesa.git

automake: include vulkan subdir after wayland-drm

We'll reuse the existing wayland-drm static library with next commit.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 1471fa0e48a..9a1fddfacbc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,11 +32,6 @@ if NEED_OPENGL_COMMON
 SUBDIRS += mesa
 endif
 
-# This explicitly comes after mesa because it depends on the i965 compiler
-if HAVE_INTEL_VULKAN
-SUBDIRS += intel/vulkan
-endif
-
 SUBDIRS += loader
 
 if HAVE_DRI_GLX
@@ -55,6 +50,11 @@ if HAVE_EGL
 SUBDIRS += egl
 endif
 
+## Requires the i965 compiler (part of mesa) and wayland-drm
+if HAVE_INTEL_VULKAN
+SUBDIRS += intel/vulkan
+endif
+
 if HAVE_GALLIUM
 SUBDIRS += gallium
 endif