commit 3447619a3a51b3c5e0d7b110169c3a1f56140846
author Armin Krezović <krezovic.armin@gmail.com> Mon Nov 21 18:42:42 2016 +0100
committer Daniel Stone <daniels@collabora.com> Mon Nov 21 18:00:19 2016 +0000
tree 03b15796b6902c5575e0a555e6a8c89e236ffb64
parent e5732c78669b7c15064902fea0cd10dcd2a0f710

compositor-wayland: Port to xdg-shell-v6

v2:

 - Keep wl_shell code around until xdg_shell is declared stable.

Signed-off-by: Armin Krezović <krezovic.armin@gmail.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>

Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b08ce71..b90c4c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -391,9 +391,11 @@
 	$(CAIRO_CFLAGS)				\
 	$(WAYLAND_COMPOSITOR_CFLAGS)		\
 	$(AM_CFLAGS)
-wayland_backend_la_SOURCES = 			\
-	libweston/compositor-wayland.c		\
-	libweston/compositor-wayland.h		\
+wayland_backend_la_SOURCES = 					\
+	libweston/compositor-wayland.c				\
+	libweston/compositor-wayland.h				\
+	protocol/xdg-shell-unstable-v6-protocol.c		\
+	protocol/xdg-shell-unstable-v6-client-protocol.h	\
 	shared/helpers.h
 nodist_wayland_backend_la_SOURCES =			\
 	protocol/fullscreen-shell-unstable-v1-protocol.c		\