Module: Mesa
Branch: master
Commit: d8f19d9aa03b50feaf8583b26ff5561ea2a56101
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d8f19d9aa03b50feaf8583b26ff5561ea2a56101
Author: Daniel Stone <dani...@collabora.com>
Date: Fri Feb 23 11:15:11 2018 +0000
vulkan/wsi/wayland: Move Wayland protocol from BUILT_SOURCES
autotools wants to have the BUILT_SOURCES ready as soon as it enters the
directory, even if they are not used. This meant the build failed if
wayland-protocols was not available on the system, even if it was not
enabled.
As BUILT_SOURCES cannot be used in a conditional (cf. 166852ee957f), do
the same thing as EGL and manually encode the dependencies in the
Makefile.
Signed-off-by: Daniel Stone <dani...@collabora.com>
Fixes: bfa22266cd4d ("vulkan/wsi/wayland: Add support for zwp_dmabuf")
Cc: Emil Velikov <emil.veli...@collabora.co.uk>
Reported-by: Dieter Nützel <die...@nuetzel-hh.de>
Tested-by: Dieter Nützel <die...@nuetzel-hh.de>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105211
---
src/vulkan/Makefile.am | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am
index c7813ce05e..cbffd769fa 100644
--- a/src/vulkan/Makefile.am
+++ b/src/vulkan/Makefile.am
@@ -58,7 +58,6 @@ AM_CPPFLAGS += \
VULKAN_WSI_SOURCES += $(VULKAN_WSI_X11_FILES)
endif
-BUILT_SOURCES += $(VULKAN_WSI_WAYLAND_GENERATED_FILES)
CLEANFILES = $(BUILT_SOURCES)
WL_DRM_XML = $(top_srcdir)/src/egl/wayland/wayland-drm/wayland-drm.xml
@@ -82,6 +81,10 @@ wsi/linux-dmabuf-unstable-v1-client-protocol.h :
$(WL_DMABUF_XML)
$(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
if HAVE_PLATFORM_WAYLAND
+wsi/linux-dmabuf-unstable-v1-protocol.lo:
wsi/linux-dmabuf-unstable-v1-client-protocol.h
+wsi/wayland-drm-protocol.lo: wsi/wayland-drm-client-protocol.h
+wsi/wsi_common_wayland.lo: wsi/linux-dmabuf-unstable-v1-client-protocol.h
wsi/wayland-drm-client-protocol.h
+
AM_CPPFLAGS += \
-I$(top_builddir)/src/vulkan/wsi \
$(WAYLAND_CLIENT_CFLAGS) \
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
