diff options
| author | Jason Ekstrand <[email protected]> | 2017-03-01 19:03:17 -0800 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-03-13 11:16:33 +0000 |
| commit | 12f348bc987991f7014996841c5e37887bcae228 (patch) | |
| tree | 7f922d2d848bd0c44218751b0cd5f36b90a2b4ef /src/vulkan/Makefile.am | |
| parent | 1d135e25617b2e321b7ebe5c443d3d6d191dee90 (diff) | |
vulkan/wsi: Generate wayland protocol headers separately from EGL
Previously, we were depending on EGL for generating the headers and
providing the protocol symbols. However, since neither Vulkan driver
actually wants to link against EGL, this is kind of pointless. It also
creates a weird build dependency.
v2 [Jason]
- Add missing wsi/ prefix, MKDIR_GEN
v3 [Emil Velikov]
- include BUILT_SOURCES/generation rules outside of conditional
Reviewed-by: Emil Velikov <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/vulkan/Makefile.am')
| -rw-r--r-- | src/vulkan/Makefile.am | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am index f7aca8e9371..f8d6fae40b4 100644 --- a/src/vulkan/Makefile.am +++ b/src/vulkan/Makefile.am @@ -48,17 +48,29 @@ VULKAN_WSI_SOURCES += $(VULKAN_WSI_X11_FILES) VULKAN_LIB_DEPS += $(XCB_DRI3_LIBS) -lX11-xcb endif +BUILT_SOURCES += $(VULKAN_WSI_WAYLAND_GENERATED_FILES) +CLEANFILES = $(BUILT_SOURCES) + +WL_DRM_XML = $(top_srcdir)/src/egl/wayland/wayland-drm/wayland-drm.xml + +wsi/wayland-drm-protocol.c : $(WL_DRM_XML) + $(MKDIR_GEN) + $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@ + +wsi/wayland-drm-client-protocol.h : $(WL_DRM_XML) + $(MKDIR_GEN) + $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ + if HAVE_PLATFORM_WAYLAND AM_CPPFLAGS += \ - -I$(top_builddir)/src/egl/wayland/wayland-drm \ - -I$(top_srcdir)/src/egl/wayland/wayland-drm \ $(WAYLAND_CFLAGS) \ -DVK_USE_PLATFORM_WAYLAND_KHR -VULKAN_WSI_SOURCES += $(VULKAN_WSI_WAYLAND_FILES) +VULKAN_WSI_SOURCES += \ + $(VULKAN_WSI_WAYLAND_FILES) \ + $(VULKAN_WSI_WAYLAND_GENERATED_FILES) VULKAN_LIB_DEPS += \ - $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la \ $(WAYLAND_LIBS) endif |