diff options
| author | Emil Velikov <[email protected]> | 2017-03-04 21:42:18 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-03-04 23:44:14 +0000 |
| commit | eaf4a106bdcf476078ef4f84c81329034a226650 (patch) | |
| tree | 39079f9b4b43308b19d541faeb4ead24d5947ed8 | |
| parent | 6facb0c08fa16e08939504aa8e5ac1462c7a6071 (diff) | |
automake: move wayland-drm prior to Vulkan
Earlier commit was picked from a larger series, but did not consider
that it removed the vulkan <> wayland-drm interdependency.
Rather than reverting everything, temporarily move wayland-drm further
up to resolve the issue. Since it [wayland-drm] does not have any
in-mesa dependencies that's perfectly safe.
Cc: Vedran Miletić <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100060
Fixes: e135ce6f088 ("vulkan: Build common Vulkan code earlier")
Signed-off-by: Emil Velikov <[email protected]>
Tested-by: Javier Jardón <[email protected]>
| -rw-r--r-- | src/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index cab68b72d6a..25b9253fc39 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -75,6 +75,11 @@ endif # include only conditionally ? SUBDIRS += compiler +## Optionally required by GBM, EGL and Vulkan +if HAVE_PLATFORM_WAYLAND +SUBDIRS += egl/wayland/wayland-drm +endif + if HAVE_VULKAN_COMMON SUBDIRS += vulkan endif @@ -98,11 +103,6 @@ if HAVE_DRI_GLX SUBDIRS += glx endif -## Optionally required by GBM and EGL -if HAVE_PLATFORM_WAYLAND -SUBDIRS += egl/wayland/wayland-drm -endif - ## Optionally required by EGL (aka PLATFORM_GBM) if HAVE_GBM SUBDIRS += gbm |