diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2015-11-17 16:00:28 +0800 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2015-11-19 12:58:58 +0200 |
| commit | 57e48f023c1b1fbef174b6c0c17394debc066ab1 (patch) | |
| tree | 222da82eba871bc6ce318ab5db1261daa61813fa /Makefile.am | |
| parent | 496adb3bb3e2b762155aaa80a52b91874ba6b715 (diff) | |
| download | weston-57e48f023c1b1fbef174b6c0c17394debc066ab1.tar.gz | |
Use linux-dmabuf 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>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 2524591d..9f7cc9df 100644 --- a/Makefile.am +++ b/Makefile.am @@ -127,8 +127,8 @@ nodist_weston_SOURCES = \ protocol/presentation_timing-server-protocol.h \ protocol/scaler-protocol.c \ protocol/scaler-server-protocol.h \ - protocol/linux-dmabuf-protocol.c \ - protocol/linux-dmabuf-server-protocol.h + protocol/linux-dmabuf-unstable-v1-protocol.c \ + protocol/linux-dmabuf-unstable-v1-server-protocol.h BUILT_SOURCES += $(nodist_weston_SOURCES) @@ -533,11 +533,11 @@ nodist_weston_simple_dmabuf_SOURCES = \ protocol/xdg-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 + protocol/linux-dmabuf-unstable-v1-protocol.c \ + protocol/linux-dmabuf-unstable-v1-client-protocol.h weston_simple_dmabuf_CFLAGS = $(AM_CFLAGS) $(SIMPLE_DMABUF_CLIENT_CFLAGS) weston_simple_dmabuf_LDADD = $(SIMPLE_DMABUF_CLIENT_LIBS) libshared.la -BUILT_SOURCES += protocol/linux-dmabuf-client-protocol.h +BUILT_SOURCES += protocol/linux-dmabuf-unstable-v1-client-protocol.h endif noinst_LTLIBRARIES += libtoytoolkit.la @@ -1351,8 +1351,7 @@ EXTRA_DIST += \ protocol/presentation_timing.xml \ protocol/scaler.xml \ protocol/ivi-application.xml \ - protocol/ivi-hmi-controller.xml \ - protocol/linux-dmabuf.xml + protocol/ivi-hmi-controller.xml # # manual test modules in tests subdirectory |