[Mesa-dev] [PATCH 12/14] scons: rework the EGL build

[Matt Turner]

On Jul 14, 2015 9:03 AM, "Emil Velikov" <emil.l.velikov at gmail.com> wrote:
>
> On 14 July 2015 at 16:20, Matt Turner <mattst88 at gmail.com> wrote:
> > On Tue, Jul 14, 2015 at 8:02 AM, Emil Velikov <emil.l.velikov at gmail.com>
wrote:
> >> The scons equivalent of the previous commit - just fold the almost
> >> identical driver + main Sconscripts.
> >>
> >> Cc: Alexander von Gluck IV <kallisti5 at unixzen.com>
> >> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> >> ---
> >>  src/SConscript                   |  3 +--
> >>  src/egl/Makefile.am              |  5 ++---
> >>  src/egl/SConscript               | 33
+++++++++++++++++++++++++++++++++
> >>  src/egl/drivers/haiku/SConscript | 25 -------------------------
> >>  src/egl/main/SConscript          | 32 --------------------------------
> >>  5 files changed, 36 insertions(+), 62 deletions(-)
> >>  create mode 100644 src/egl/SConscript
> >>  delete mode 100644 src/egl/drivers/haiku/SConscript
> >>  delete mode 100644 src/egl/main/SConscript
> >>
> >> diff --git a/src/SConscript b/src/SConscript
> >> index 46482fb..106b87d 100644
> >> --- a/src/SConscript
> >> +++ b/src/SConscript
> >> @@ -32,8 +32,7 @@ if not env['embedded']:
> >>      if env['platform'] not in ('cygwin', 'darwin', 'freebsd',
'haiku', 'windows'):
> >>          SConscript('glx/SConscript')
> >>      if env['platform'] == 'haiku':
> >> -        SConscript('egl/drivers/haiku/SConscript')
> >> -        SConscript('egl/main/SConscript')
> >> +        SConscript('egl/SConscript')
> >>
> >>      if env['gles']:
> >>          SConscript('mapi/shared-glapi/SConscript')
> >> diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
> >> index e6862d2..767bb53 100644
> >> --- a/src/egl/Makefile.am
> >> +++ b/src/egl/Makefile.am
> >> @@ -111,10 +111,9 @@ egl_HEADERS = \
> >>         $(top_srcdir)/include/EGL/eglplatform.h
> >>
> >>  EXTRA_DIST = \
> >> +       SConscript \
> >>         drivers/haiku \
> >>         docs \
> >>         main/egl.def \
> >>         main/README.txt \
> >> -       main/SConscript \
> >> -       main/Makefile.sources \
> >> -       drivers/dri2/SConscript
> >> +       main/Makefile.sources
> >
> > I was going to say that main/Makefile.sources should be added in the
> > previous commit, but I don't think you need to list it in EXTRA_DIST
> > since it's included by Makefile.am. At least I don't see that we list
> > it anywhere else and make dist seems to work. :)
> Commit 11, adds a top level Makefile.sources but keeps
> main/Makefile.sources around (via EXTRA_DIST) so that we don't break
> SCons/Android. As only the former is included in Makefile.am we need
> the EXTRA_DIST workaround.

Ahh, I see.

> I'm guessing that one of us is getting confused in these ugly diffs
> that git has produced. If it makes things easier I can resend some/all
> with -M which will make things easier ?
>
> -Emil
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20150714/e5988de3/attachment.html>