From 0a543996132fb809faa550a3e3914452c0bbda0a Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sun, 7 Jan 2018 12:09:27 +0100 Subject: [PATCH] =?UTF-8?q?Unconditionally=20add=20linux-dmabuf=E2=80=99s?= =?UTF-8?q?=20protocol=20to=20BUILT=5FSOURCES?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was preventing weston-info from building if both weston-simple-dmabuf-drm and weston-simple-dmabuf-v4l2 were disabled at build-time. Signed-off-by: Emmanuel Gil Peyrot Reported-by: Cedric Sodhi Tested-by: Cedric Sodhi Reviewed-by: Quentin Glidic --- Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 883249c0b..64cceec47 100644 --- a/Makefile.am +++ b/Makefile.am @@ -638,7 +638,6 @@ nodist_weston_simple_dmabuf_drm_SOURCES = \ protocol/linux-dmabuf-unstable-v1-client-protocol.h weston_simple_dmabuf_drm_CFLAGS = $(AM_CFLAGS) $(SIMPLE_DMABUF_DRM_CLIENT_CFLAGS) weston_simple_dmabuf_drm_LDADD = $(SIMPLE_DMABUF_DRM_CLIENT_LIBS) $(LIBDRM_PLATFORM_LIBS) libshared.la -BUILT_SOURCES += protocol/linux-dmabuf-unstable-v1-client-protocol.h endif if BUILD_SIMPLE_DMABUF_V4L_CLIENT @@ -653,7 +652,6 @@ nodist_weston_simple_dmabuf_v4l_SOURCES = \ protocol/linux-dmabuf-unstable-v1-client-protocol.h weston_simple_dmabuf_v4l_CFLAGS = $(AM_CFLAGS) $(SIMPLE_DMABUF_V4L_CLIENT_CFLAGS) weston_simple_dmabuf_v4l_LDADD = $(SIMPLE_DMABUF_V4L_CLIENT_LIBS) libshared.la -BUILT_SOURCES += protocol/linux-dmabuf-unstable-v1-client-protocol.h endif noinst_LTLIBRARIES += libtoytoolkit.la @@ -894,7 +892,9 @@ BUILT_SOURCES += \ protocol/ivi-hmi-controller-protocol.c \ protocol/ivi-hmi-controller-client-protocol.h \ protocol/ivi-application-protocol.c \ - protocol/ivi-application-client-protocol.h + protocol/ivi-application-client-protocol.h \ + protocol/linux-dmabuf-unstable-v1-protocol.c \ + protocol/linux-dmabuf-unstable-v1-client-protocol.h westondatadir = $(datadir)/weston dist_westondata_DATA = \