From 2785090a2ae9d959ce87e40629281a8079fd2f49 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Fri, 1 Sep 2017 17:39:36 +0100 Subject: configure.ac: split the wayland client/server confusion At the moment wayland-clients, such as the Vulkan drivers were over-linking against libwayland-server.so. That went unnoticed, since both client and server code uses the wl*interface symbols, which are present in both libwayland-client.so and libwayland-server.so. I've looked at correcting that, although that's orthogonal to this fix. Note: wayland-egl does _not_ depend on wayland-client, although it does need wayland-egl.h. There's no distinct package that provides it (I have a WIP on the topic) so current solution will do for now. v2: Rebase with the "...inline wayland_drm_buffer_get" patch removed. Signed-off-by: Emil Velikov Reviewed-by: Daniel Stone --- src/amd/vulkan/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/amd/vulkan/Makefile.am') diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am index 3350f545403..438872bbb48 100644 --- a/src/amd/vulkan/Makefile.am +++ b/src/amd/vulkan/Makefile.am @@ -90,13 +90,13 @@ endif if HAVE_PLATFORM_WAYLAND AM_CPPFLAGS += \ - $(WAYLAND_CFLAGS) \ + $(WAYLAND_CLIENT_CFLAGS) \ -DVK_USE_PLATFORM_WAYLAND_KHR VULKAN_SOURCES += $(VULKAN_WSI_WAYLAND_FILES) VULKAN_LIB_DEPS += \ - $(WAYLAND_LIBS) + $(WAYLAND_CLIENT_LIBS) endif noinst_LTLIBRARIES = libvulkan_common.la -- cgit v1.2.3