diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2015-11-17 16:00:32 +0800 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2015-11-19 14:49:52 +0200 |
| commit | 2a229338a5d6afc8458061314757f819598c3c04 (patch) | |
| tree | 018efe487dd169da0c6cba9d1b5f704a3b74cd99 /Makefile.am | |
| parent | 08ab0bcb83a75c00d0e541b03892a609fb446e86 (diff) | |
| download | weston-2a229338a5d6afc8458061314757f819598c3c04.tar.gz | |
Use xdg_shell protocol from wayland-protocols
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Mariusz Ceier <mceier+wayland@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Acked-by: Jasper St. Pierre <jstpierre@mecheye.net>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index 04357025..217c7308 100644 --- a/Makefile.am +++ b/Makefile.am @@ -473,8 +473,8 @@ demo_clients += \ weston_simple_shm_SOURCES = clients/simple-shm.c nodist_weston_simple_shm_SOURCES = \ - protocol/xdg-shell-protocol.c \ - protocol/xdg-shell-client-protocol.h \ + protocol/xdg-shell-unstable-v5-protocol.c \ + protocol/xdg-shell-unstable-v5-client-protocol.h \ protocol/fullscreen-shell-unstable-v1-protocol.c \ protocol/fullscreen-shell-unstable-v1-client-protocol.h \ protocol/ivi-application-protocol.c \ @@ -486,8 +486,8 @@ weston_simple_damage_SOURCES = clients/simple-damage.c nodist_weston_simple_damage_SOURCES = \ protocol/scaler-protocol.c \ protocol/scaler-client-protocol.h \ - protocol/xdg-shell-protocol.c \ - protocol/xdg-shell-client-protocol.h \ + protocol/xdg-shell-unstable-v5-protocol.c \ + protocol/xdg-shell-unstable-v5-client-protocol.h \ protocol/fullscreen-shell-unstable-v1-protocol.c \ protocol/fullscreen-shell-unstable-v1-client-protocol.h weston_simple_damage_CFLAGS = $(AM_CFLAGS) $(SIMPLE_CLIENT_CFLAGS) @@ -517,8 +517,8 @@ if BUILD_SIMPLE_EGL_CLIENTS demo_clients += weston-simple-egl weston_simple_egl_SOURCES = clients/simple-egl.c nodist_weston_simple_egl_SOURCES = \ - protocol/xdg-shell-protocol.c \ - protocol/xdg-shell-client-protocol.h \ + protocol/xdg-shell-unstable-v5-protocol.c \ + protocol/xdg-shell-unstable-v5-client-protocol.h \ protocol/ivi-application-protocol.c \ protocol/ivi-application-client-protocol.h weston_simple_egl_CFLAGS = $(AM_CFLAGS) $(SIMPLE_EGL_CLIENT_CFLAGS) @@ -529,8 +529,8 @@ if BUILD_SIMPLE_INTEL_DMABUF_CLIENT demo_clients += weston-simple-dmabuf weston_simple_dmabuf_SOURCES = clients/simple-dmabuf.c nodist_weston_simple_dmabuf_SOURCES = \ - protocol/xdg-shell-protocol.c \ - protocol/xdg-shell-client-protocol.h \ + protocol/xdg-shell-unstable-v5-protocol.c \ + protocol/xdg-shell-unstable-v5-client-protocol.h \ protocol/fullscreen-shell-unstable-v1-protocol.c \ protocol/fullscreen-shell-unstable-v1-client-protocol.h \ protocol/linux-dmabuf-unstable-v1-protocol.c \ @@ -556,8 +556,8 @@ nodist_libtoytoolkit_la_SOURCES = \ protocol/workspaces-client-protocol.h \ protocol/presentation_timing-protocol.c \ protocol/presentation_timing-client-protocol.h \ - protocol/xdg-shell-protocol.c \ - protocol/xdg-shell-client-protocol.h \ + protocol/xdg-shell-unstable-v5-protocol.c \ + protocol/xdg-shell-unstable-v5-client-protocol.h \ protocol/ivi-application-protocol.c \ protocol/ivi-application-client-protocol.h @@ -765,8 +765,8 @@ BUILT_SOURCES += \ protocol/workspaces-protocol.c \ protocol/fullscreen-shell-unstable-v1-protocol.c \ protocol/fullscreen-shell-unstable-v1-client-protocol.h \ - protocol/xdg-shell-protocol.c \ - protocol/xdg-shell-client-protocol.h \ + protocol/xdg-shell-unstable-v5-protocol.c \ + protocol/xdg-shell-unstable-v5-client-protocol.h \ protocol/ivi-hmi-controller-protocol.c \ protocol/ivi-hmi-controller-client-protocol.h \ protocol/ivi-application-protocol.c \ @@ -841,8 +841,8 @@ desktop_shell_la_SOURCES = \ nodist_desktop_shell_la_SOURCES = \ protocol/desktop-shell-protocol.c \ protocol/desktop-shell-server-protocol.h \ - protocol/xdg-shell-protocol.c \ - protocol/xdg-shell-server-protocol.h + protocol/xdg-shell-unstable-v5-protocol.c \ + protocol/xdg-shell-unstable-v5-server-protocol.h BUILT_SOURCES += $(nodist_desktop_shell_la_SOURCES) endif @@ -1345,7 +1345,6 @@ EXTRA_DIST += \ protocol/workspaces.xml \ protocol/text-cursor-position.xml \ protocol/weston-test.xml \ - protocol/xdg-shell.xml \ protocol/presentation_timing.xml \ protocol/scaler.xml \ protocol/ivi-application.xml \ |