From: Eric Engestrom Date: Sun, 28 Oct 2018 13:30:36 +0000 (+0000) Subject: vulkan/wsi: simplify meson file tracking X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=f3a5757eba82641ac3412df05c97715d1779f286 vulkan/wsi: simplify meson file tracking Meson already automatically tracks included headers, so there's no need to add them everywhere; cleans up the code a bit. Signed-off-by: Eric Engestrom Reviewed-by: Dylan Baker --- diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build index d073b23dc25..e9812b663e4 100644 --- a/src/vulkan/wsi/meson.build +++ b/src/vulkan/wsi/meson.build @@ -21,12 +21,8 @@ vulkan_wsi_args = [] vulkan_wsi_deps = [] -files_vulkan_wsi = files( - 'wsi_common.c', - 'wsi_common.h', - 'wsi_common_private.h', - 'wsi_common_queue.h', -) +files_vulkan_wsi = files('wsi_common.c') + if with_platform_x11 vulkan_wsi_args += ['-DVK_USE_PLATFORM_XCB_KHR', '-DVK_USE_PLATFORM_XLIB_KHR'] vulkan_wsi_deps += [ @@ -38,19 +34,13 @@ if with_platform_x11 dep_xcb_sync, dep_xshmfence, ] - files_vulkan_wsi += files( - 'wsi_common_x11.c', - 'wsi_common_x11.h', - ) + files_vulkan_wsi += files('wsi_common_x11.c') endif if with_platform_wayland vulkan_wsi_deps += dep_wayland_client vulkan_wsi_args += ['-DVK_USE_PLATFORM_WAYLAND_KHR'] - files_vulkan_wsi += files( - 'wsi_common_wayland.c', - 'wsi_common_wayland.h', - ) + files_vulkan_wsi += files('wsi_common_wayland.c') files_vulkan_wsi += [ wayland_drm_client_protocol_h, wayland_drm_protocol_c, @@ -61,10 +51,7 @@ endif if with_platform_drm vulkan_wsi_args += '-DVK_USE_PLATFORM_DISPLAY_KHR' - files_vulkan_wsi += files( - 'wsi_common_display.c', - 'wsi_common_display.h', - ) + files_vulkan_wsi += files('wsi_common_display.c') endif if with_xlib_lease