Mesa (17.2): egl: guard wayland header dep. tracking behind HAVE_PLATFORM_WAYLAND
Emil Velikov
evelikov at kemper.freedesktop.org
Mon Jul 24 13:31:38 UTC 2017
Module: Mesa
Branch: 17.2
Commit: 33236a306d1567dd4a9fee09bbfc48fb8afcd7b2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=33236a306d1567dd4a9fee09bbfc48fb8afcd7b2
Author: Emil Velikov <emil.velikov at collabora.com>
Date: Mon Jul 24 13:22:06 2017 +0100
egl: guard wayland header dep. tracking behind HAVE_PLATFORM_WAYLAND
Otherwise we'll attemt to generate the header even we don't need to.
In that case the dependencies may not be met, leading to build failure.
Fixes: 166852e "configure.ac: rework wayland-protocols handling"
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
---
src/egl/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index f881145c0e..ecaf148aae 100644
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -74,10 +74,10 @@ drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h: $(WL_DMABUF_XML)
$(MKDIR_GEN)
$(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
+if HAVE_PLATFORM_WAYLAND
drivers/dri2/linux-dmabuf-unstable-v1-protocol.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
drivers/dri2/egl_dri2.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
-if HAVE_PLATFORM_WAYLAND
AM_CFLAGS += $(WAYLAND_CFLAGS)
libEGL_common_la_LIBADD += $(WAYLAND_LIBS)
libEGL_common_la_LIBADD += $(LIBDRM_LIBS)
More information about the mesa-commit
mailing list