summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-01-07 12:09:27 +0100
committerQuentin Glidic <sardemff7+git@sardemff7.net>2018-01-07 12:23:11 +0100
commit0a543996132fb809faa550a3e3914452c0bbda0a (patch)
tree5607fcd3cbec06200041b50d02b3a739772a04d2
parent14a7e371f57fd8dbdddb869296cdb686f4a0e9bc (diff)
Unconditionally add linux-dmabuf’s protocol to BUILT_SOURCESHEADmaster
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 <linkmauve@linkmauve.fr> Reported-by: Cedric Sodhi <manday@openmail.cc> Tested-by: Cedric Sodhi <manday@openmail.cc> Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
-rw-r--r--Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 883249c0..64cceec4 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 = \