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

2017-07-24 Thread Emil Velikov 
On 24 July 2017 at 13:25, Luke A. Guest  wrote:
> master currently fails when enabling egl because
> drivers/dri2/linux-dmabuf-unstable-v1-protocol.c doesn't exist, should it?
>
Please ensure you've got a clean repo. If it persists share your
configure line and a snippet of the issue in question.

Thanks
Emil
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

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

2017-07-24 Thread Tapani Pälli 

I sent attempt to fix this here:
https://patchwork.freedesktop.org/patch/168609/

On 07/24/2017 03:25 PM, Luke A. Guest wrote:

master currently fails when enabling egl because
drivers/dri2/linux-dmabuf-unstable-v1-protocol.c doesn't exist, should it?

Luke.


On 19/07/17 23:44, 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 
Signed-off-by: Andres Gomez 
---
  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)
  


___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

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

2017-07-24 Thread Luke A. Guest 
master currently fails when enabling egl because
drivers/dri2/linux-dmabuf-unstable-v1-protocol.c doesn't exist, should it?

Luke.


On 19/07/17 23:44, 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 
> Signed-off-by: Andres Gomez 
> ---
>  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)
>  

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

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

2017-07-23 Thread 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 
> Signed-off-by: Andres Gomez 
> ---
>  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
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

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

2017-07-20 Thread Emil Velikov 
On 20 July 2017 at 15:42, Andres Gomez  wrote:
> On Thu, 2017-07-20 at 14:37 +0100, Emil Velikov wrote:
>> On 20 July 2017 at 13:54, Daniel Stone  wrote:
>> > Hi Emil,
>> >
>> > On 20 July 2017 at 13:51, Emil Velikov  wrote:
>> > > On 19 July 2017 at 23:44, Andres Gomez  wrote:
>> > > > -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)
>> > > > +
>> > >
>> > > Just add the files two generated file to BUILT_SOURCES. That's the way
>> > > we handle it through the tree.
>> >
>> > They're already in BUILT_SOURCES (line 78 in master), so I guess
>> > something else is wrong.
>> >
>>
>> Thanks for the correction Dan.
>>
>> Upon a second look - BUILT_SOURCES line is in a conditional which is
>> causing the issue. Moving it outside solves the problem on my system.
>
> Mmmm ... the BUILT_SOURCES is in the same conditional in which the
> linux-dmabuf-unstable-v1-protocol.c target is define so I don't think
> that would be solving the problem and it doesn't seem to be doing so in
> my travis:
> https://travis-ci.org/Igalia/release-mesa/jobs/255687844
>

Moved the HAVE_PLATFORM_WAYLAND guard after the BUILT_SOURCES and
checked the generated file.
Which seemingly is not enough... I have an idea - let's seen how well
it pans out.

-Emil
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

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

2017-07-20 Thread Andres Gomez 
On Thu, 2017-07-20 at 14:37 +0100, Emil Velikov wrote:
> On 20 July 2017 at 13:54, Daniel Stone  wrote:
> > Hi Emil,
> > 
> > On 20 July 2017 at 13:51, Emil Velikov  wrote:
> > > On 19 July 2017 at 23:44, Andres Gomez  wrote:
> > > > -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)
> > > > +
> > > 
> > > Just add the files two generated file to BUILT_SOURCES. That's the way
> > > we handle it through the tree.
> > 
> > They're already in BUILT_SOURCES (line 78 in master), so I guess
> > something else is wrong.
> > 
> 
> Thanks for the correction Dan.
> 
> Upon a second look - BUILT_SOURCES line is in a conditional which is
> causing the issue. Moving it outside solves the problem on my system.

Mmmm ... the BUILT_SOURCES is in the same conditional in which the
linux-dmabuf-unstable-v1-protocol.c target is define so I don't think
that would be solving the problem and it doesn't seem to be doing so in
my travis:
https://travis-ci.org/Igalia/release-mesa/jobs/255687844

-- 
Br,

Andres

signature.asc
Description: This is a digitally signed message part
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

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

2017-07-20 Thread Emil Velikov 
On 20 July 2017 at 13:54, Daniel Stone  wrote:
> Hi Emil,
>
> On 20 July 2017 at 13:51, Emil Velikov  wrote:
>> On 19 July 2017 at 23:44, Andres Gomez  wrote:
>>> -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)
>>> +
>> Just add the files two generated file to BUILT_SOURCES. That's the way
>> we handle it through the tree.
>
> They're already in BUILT_SOURCES (line 78 in master), so I guess
> something else is wrong.
>
Thanks for the correction Dan.

Upon a second look - BUILT_SOURCES line is in a conditional which is
causing the issue. Moving it outside solves the problem on my system.

-Emil
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

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

2017-07-20 Thread Eric Engestrom 
On Thursday, 2017-07-20 09:09:37 +0100, Daniel Stone wrote:
> On 19 July 2017 at 23:44, 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
> 
> Reviewed-by: Daniel Stone 
> 
> Mark - could you please insert a 'distcheck' run into CI?

Doing this on travis, I'll let someone else figure out if/how appveyor
can do that.

> 
> Cheers,
> Daniel
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

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

2017-07-20 Thread Daniel Stone 
Hi Emil,

On 20 July 2017 at 13:51, Emil Velikov  wrote:
> On 19 July 2017 at 23:44, Andres Gomez  wrote:
>> -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)
>> +
> Just add the files two generated file to BUILT_SOURCES. That's the way
> we handle it through the tree.

They're already in BUILT_SOURCES (line 78 in master), so I guess
something else is wrong.

Cheers,
Daniel
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

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

2017-07-20 Thread Emil Velikov 
On 19 July 2017 at 23:44, 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 
> Signed-off-by: Andres Gomez 
> ---
>  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)
> +
Just add the files two generated file to BUILT_SOURCES. That's the way
we handle it through the tree.

-Emil
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

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

2017-07-20 Thread Daniel Stone 
On 19 July 2017 at 23:44, 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

Reviewed-by: Daniel Stone 

Mark - could you please insert a 'distcheck' run into CI?

Cheers,
Daniel
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

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

2017-07-19 Thread Andres Gomez 
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 
Signed-off-by: Andres Gomez 
---
 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)
 
-- 
2.13.2

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev