diff options
| author | Daniel Stone <[email protected]> | 2018-02-23 11:15:11 +0000 |
|---|---|---|
| committer | Daniel Stone <[email protected]> | 2018-02-26 10:43:12 +0000 |
| commit | d8f19d9aa03b50feaf8583b26ff5561ea2a56101 (patch) | |
| tree | 415e121e7f86792dd21140b0c63a7f9137b52626 /src/vulkan | |
| parent | 0cc5be7741aa77bd65046d627370c18839e0da25 (diff) | |
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 <[email protected]>
Fixes: bfa22266cd4d ("vulkan/wsi/wayland: Add support for zwp_dmabuf")
Cc: Emil Velikov <[email protected]>
Reported-by: Dieter Nützel <[email protected]>
Tested-by: Dieter Nützel <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105211
Diffstat (limited to 'src/vulkan')
| -rw-r--r-- | src/vulkan/Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am index c7813ce05e3..cbffd769fa4 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) \ |