[Mesa-dev] [PATCH 2/2] egl: add linux-dmabuf-unstable-v1-protocol.c to "nodist"

[Andres Gomez]

I'll be pushing already 1/2 and keep this on hold to see whether we
favor instead:
https://lists.freedesktop.org/archives/mesa-dev/2017-July/163730.html


On Thu, 2017-07-20 at 01:44 +0300, Andres Gomez wrote:
> This fixes `make distcheck`
> 
> > make[3]: *** No rule to make target 'drivers/dri2/linux-dmabuf-unstable-v1-protocol.c', needed by 'distdir'.  Stop.
> > make[3]: Entering directory '/home/local/mesa/src/egl'
> > make[3]: Leaving directory '/home/local/mesa/src/egl'
> > make[2]: *** [distdir] Error 1
> > make[1]: *** [distdir] Error 1
> > make: *** [dist] Error 2
> 
> Fixes: 02cc359372 ("egl/wayland: Use linux-dmabuf interface for buffers")
> Cc: Emil Velikov <emil.velikov at collabora.com>
> Signed-off-by: Andres Gomez <agomez at igalia.com>
> ---
>  src/egl/Makefile.am | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
> index 7c1a4929b8..6ee1fb9be8 100644
> --- a/src/egl/Makefile.am
> +++ b/src/egl/Makefile.am
> @@ -44,10 +44,13 @@ noinst_LTLIBRARIES = libEGL_common.la
>  libEGL_common_la_SOURCES = \
>  	$(LIBEGL_C_FILES)
>  
> +nodist_libEGL_common_la_SOURCES =
> +
>  libEGL_common_la_LIBADD = \
>  	$(EGL_LIB_DEPS)
>  
>  dri2_backend_FILES =
> +nodist_dri2_backend_FILES =
>  dri3_backend_FILES =
>  
>  if HAVE_PLATFORM_X11
> @@ -84,8 +87,8 @@ libEGL_common_la_LIBADD += $(WAYLAND_LIBS)
>  libEGL_common_la_LIBADD += $(LIBDRM_LIBS)
>  libEGL_common_la_LIBADD += $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la
>  libEGL_common_la_LIBADD += $(top_builddir)/src/util/libmesautil.la
> -dri2_backend_FILES += drivers/dri2/platform_wayland.c	\
> -	drivers/dri2/linux-dmabuf-unstable-v1-protocol.c
> +dri2_backend_FILES += drivers/dri2/platform_wayland.c
> +nodist_dri2_backend_FILES += drivers/dri2/linux-dmabuf-unstable-v1-protocol.c
>  endif
>  
>  if HAVE_PLATFORM_DRM
> @@ -119,6 +122,9 @@ libEGL_common_la_SOURCES += \
>  	$(dri2_backend_FILES) \
>  	$(dri3_backend_FILES)
>  
> +nodist_libEGL_common_la_SOURCES += \
> +	$(nodist_dri2_backend_FILES)
> +
>  libEGL_common_la_LIBADD += $(top_builddir)/src/loader/libloader.la
>  libEGL_common_la_LIBADD += $(DLOPEN_LIBS) $(LIBDRM_LIBS) $(CLOCK_LIB)
>  
-- 
Br,

Andres