From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Wed, 20 Apr 2016 22:28:15 +0000 (+0100)
Subject: anv: refactor wayland build handling
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9bc99f56682721261fec90568255dc9b937faa7c;p=mesa.git

anv: refactor wayland build handling

Rather than having things split out in multiple places, consolidate it
and add all the missing bits. Also ensure that we use the already built
static library libwayland-drm.la.

v2 Add missing '\' in the CFLAGS.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Jason Ekstrand <jason@jlekstrand.net> (v1)
---

diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index 89d7a07fbf9..fc221705657 100644
--- a/src/intel/vulkan/Makefile.am
+++ b/src/intel/vulkan/Makefile.am
@@ -92,29 +92,26 @@ libanv_gen9_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=90
 libanv_gen9_la_SOURCES = $(GEN9_FILES)
 
 if HAVE_EGL_PLATFORM_WAYLAND
-BUILT_SOURCES += \
-	wayland-drm-protocol.c \
-	wayland-drm-client-protocol.h
-
-%-protocol.c : $(top_srcdir)/src/egl/wayland/wayland-drm/%.xml
-	$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
+VULKAN_ENTRYPOINT_CPPFLAGS += -DVK_USE_PLATFORM_WAYLAND_KHR
 
-%-client-protocol.h : $(top_srcdir)/src/egl/wayland/wayland-drm/%.xml
-	$(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
+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 \
+	-DHAVE_WAYLAND_PLATFORM
 
-AM_CPPFLAGS += -I$(top_srcdir)/src/egl/wayland/wayland-drm
-VULKAN_SOURCES += \
-	wayland-drm-protocol.c \
-	$(VULKAN_WSI_WAYLAND_FILES)
-AM_CFLAGS += -DHAVE_WAYLAND_PLATFORM -DVK_USE_PLATFORM_WAYLAND_KHR
+VULKAN_SOURCES += $(VULKAN_WSI_WAYLAND_FILES)
 
-VULKAN_ENTRYPOINT_CPPFLAGS += -DVK_USE_PLATFORM_WAYLAND_KHR
+VULKAN_LIB_DEPS += \
+	$(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la \
+	$(WAYLAND_LIBS)
 endif
 
 noinst_LTLIBRARIES += libvulkan_common.la
 libvulkan_common_la_SOURCES = $(VULKAN_SOURCES)
 
-VULKAN_LIB_DEPS += $(WAYLAND_LIBS) \
+VULKAN_LIB_DEPS += \
 	libvulkan_common.la \
 	-lxcb -lxcb-dri3 -lxcb-present -lxcb-sync -lxshmfence \
 	$(top_builddir)/src/intel/isl/libisl.la \