diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2015-11-17 16:00:27 +0800 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2015-11-19 12:50:56 +0200 |
| commit | 496adb3bb3e2b762155aaa80a52b91874ba6b715 (patch) | |
| tree | 0b88d6cb4d4751d448841e01759366dc8717fb8f /Makefile.am | |
| parent | 4bcc54d1a56057293d3a7a34e9592707406a6c9a (diff) | |
| download | weston-496adb3bb3e2b762155aaa80a52b91874ba6b715.tar.gz | |
Use fullscreen-shell.xml from wayland-protocols
Use the fullscreen-shell protocol XML from the wayland-protocols
installation, and remove the one we provide ourself.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Mariusz Ceier <mceier+wayland@gmail.com>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 44 |
1 files changed, 27 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index 55e3bcb4..2524591d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -309,8 +309,8 @@ wayland_backend_la_SOURCES = \ src/compositor-wayland.c \ shared/helpers.h nodist_wayland_backend_la_SOURCES = \ - protocol/fullscreen-shell-protocol.c \ - protocol/fullscreen-shell-client-protocol.h + protocol/fullscreen-shell-unstable-v1-protocol.c \ + protocol/fullscreen-shell-unstable-v1-client-protocol.h endif if ENABLE_RPI_COMPOSITOR @@ -475,8 +475,8 @@ 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/fullscreen-shell-protocol.c \ - protocol/fullscreen-shell-client-protocol.h \ + protocol/fullscreen-shell-unstable-v1-protocol.c \ + protocol/fullscreen-shell-unstable-v1-client-protocol.h \ protocol/ivi-application-protocol.c \ protocol/ivi-application-client-protocol.h weston_simple_shm_CFLAGS = $(AM_CFLAGS) $(SIMPLE_CLIENT_CFLAGS) @@ -488,8 +488,8 @@ nodist_weston_simple_damage_SOURCES = \ protocol/scaler-client-protocol.h \ protocol/xdg-shell-protocol.c \ protocol/xdg-shell-client-protocol.h \ - protocol/fullscreen-shell-protocol.c \ - protocol/fullscreen-shell-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) weston_simple_damage_LDADD = $(SIMPLE_CLIENT_LIBS) libshared.la @@ -531,8 +531,8 @@ 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/fullscreen-shell-protocol.c \ - protocol/fullscreen-shell-client-protocol.h \ + protocol/fullscreen-shell-unstable-v1-protocol.c \ + protocol/fullscreen-shell-unstable-v1-client-protocol.h \ protocol/linux-dmabuf-protocol.c \ protocol/linux-dmabuf-client-protocol.h weston_simple_dmabuf_CFLAGS = $(AM_CFLAGS) $(SIMPLE_DMABUF_CLIENT_CFLAGS) @@ -649,8 +649,8 @@ weston_transformed_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS) weston_fullscreen_SOURCES = clients/fullscreen.c nodist_weston_fullscreen_SOURCES = \ - protocol/fullscreen-shell-protocol.c \ - protocol/fullscreen-shell-client-protocol.h + protocol/fullscreen-shell-unstable-v1-protocol.c \ + protocol/fullscreen-shell-unstable-v1-client-protocol.h weston_fullscreen_LDADD = libtoytoolkit.la weston_fullscreen_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS) @@ -763,8 +763,8 @@ BUILT_SOURCES += \ protocol/scaler-protocol.c \ protocol/workspaces-client-protocol.h \ protocol/workspaces-protocol.c \ - protocol/fullscreen-shell-protocol.c \ - protocol/fullscreen-shell-client-protocol.h \ + 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/ivi-hmi-controller-protocol.c \ @@ -865,8 +865,8 @@ fullscreen_shell_la_SOURCES = \ fullscreen-shell/fullscreen-shell.c \ shared/helpers.h nodist_fullscreen_shell_la_SOURCES = \ - protocol/fullscreen-shell-protocol.c \ - protocol/fullscreen-shell-server-protocol.h + protocol/fullscreen-shell-unstable-v1-protocol.c \ + protocol/fullscreen-shell-unstable-v1-server-protocol.h BUILT_SOURCES += $(nodist_fullscreen_shell_la_SOURCES) endif @@ -931,8 +931,8 @@ screen_share_la_SOURCES = \ src/screen-share.c \ shared/helpers.h nodist_screen_share_la_SOURCES = \ - protocol/fullscreen-shell-protocol.c \ - protocol/fullscreen-shell-client-protocol.h + protocol/fullscreen-shell-unstable-v1-protocol.c \ + protocol/fullscreen-shell-unstable-v1-client-protocol.h endif @@ -1348,7 +1348,6 @@ EXTRA_DIST += \ protocol/text-cursor-position.xml \ protocol/weston-test.xml \ protocol/xdg-shell.xml \ - protocol/fullscreen-shell.xml \ protocol/presentation_timing.xml \ protocol/scaler.xml \ protocol/ivi-application.xml \ @@ -1417,6 +1416,17 @@ $(DOCDIRS): doc: $(DOXYGEN_INDICES) +.SECONDEXPANSION: + +protocol/%-unstable-v1-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/$$*/$$*-unstable-v1.xml + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) code < $< > $@ + +protocol/%-unstable-v1-server-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/$$*/$$*-unstable-v1.xml + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) server-header < $< > $@ + +protocol/%-unstable-v1-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/$$*/$$*-unstable-v1.xml + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) client-header < $< > $@ + protocol/%-protocol.c : $(top_srcdir)/protocol/%.xml $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) code < $< > $@ |