From 57e48f023c1b1fbef174b6c0c17394debc066ab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Tue, 17 Nov 2015 16:00:28 +0800 Subject: Use linux-dmabuf protocol from wayland-protocols MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jonas Ådahl Reviewed-by: Mariusz Ceier Reviewed-by: Pekka Paalanen --- Makefile.am | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'Makefile.am') 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 -- cgit v1.2.1