[vlc-devel] [PATCH] opengl: Makefile.am: fix distcheck with libvlc_opengl*.la

[Thomas Guillem]

On Thu, Jun 25, 2020, at 16:51, Alexandre Janniaux wrote:
> Hi,
> 
> Actually it doesn't work since it would compile gles2
> on windows.
> 
> I pushed force the previous state of the repository
> without those commits since nobody has pushed anything
> and it was blocking Windows devs.
> 
> Sorry to have messed up the `make distcheck`. I'll send
> a new version later.

One with commit access will always mess up with the distcheck. By the time, you will do it less frequently but it will still happen.

> 
> Regards,
> --
> Alexandre Janniaux
> Videolabs
> 
> On Thu, Jun 25, 2020 at 03:05:43PM +0200, Thomas Guillem wrote:
> > I did the same mistake recently ;)
> >
> > LGTM, please put it now to fix CIs.
> >
> > On Thu, Jun 25, 2020, at 14:46, Alexandre Janniaux wrote:
> > > ---
> > >  modules/video_output/opengl/Makefile.am | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/modules/video_output/opengl/Makefile.am
> > > b/modules/video_output/opengl/Makefile.am
> > > index d0b62101930..5626b175042 100644
> > > --- a/modules/video_output/opengl/Makefile.am
> > > +++ b/modules/video_output/opengl/Makefile.am
> > > @@ -31,7 +31,7 @@ libvlc_opengl_la_LDFLAGS = \
> > >      -version-info 0:0:0
> > >
> > >  if HAVE_GL
> > > -EXTRA_LTLIBRARIES += libvlc_opengl.la
> > > +noinst_LTLIBRARIES += libvlc_opengl.la
> > >  endif
> > >
> > >  # Convenience library for OpenGL components -- OpenGL ES only
> > > @@ -46,7 +46,7 @@ libvlc_opengles_la_LDFLAGS = \
> > >
> > >  libvlc_opengles_la_CFLAGS += $(GLES2_CFLAGS)
> > >  libvlc_opengles_la_LIBADD += $(GLES2_LIBS)
> > > -EXTRA_LTLIBRARIES += libvlc_opengles.la
> > > +noinst_LTLIBRARIES += libvlc_opengles.la
> > >
> > >  ### OpenGL ###
> > >  libgles2_plugin_la_SOURCES = video_output/opengl/display.c
> > > --
> > > 2.27.0
> > >
> > > _______________________________________________
> > > vlc-devel mailing list
> > > To unsubscribe or modify your subscription options:
> > > https://mailman.videolan.org/listinfo/vlc-devel
> > _______________________________________________
> > vlc-devel mailing list
> > To unsubscribe or modify your subscription options:
> > https://mailman.videolan.org/listinfo/vlc-devel
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel