[Mesa-dev] Finishing make distcheck

[Jose Fonseca]

On 12/12/14 20:38, Matt Turner wrote:
> José,
>
> As it is now, since we're not building the gbm or egl state trackers
> via autotools, they're not included in the tarball created by make
> dist. That is, the files in
>
> src/gallium/state_trackers/egl
> src/gallium/state_trackers/gbm
>
> wouldn't be distributed.

Why does src/gallium/state_trackers/egl/Makefile.am still exists then? 
Is it dangling?

 > I notice that there are SConscripts though.
> Would you like these directories distributed?
>
> Thanks,
> Matt
>

Yes, src/gallium/state_trackers/egl definetely.

src/gallium/state_trackers/gbm is half dead. It can go away.

Jose

diff --git a/src/gallium/state_trackers/egl/SConscript 
b/src/gallium/state_trackers/egl/SConscript
index 3727fb2..fdc00ff 100644
--- a/src/gallium/state_trackers/egl/SConscript
+++ b/src/gallium/state_trackers/egl/SConscript
@@ -42,18 +42,6 @@ else:
          if env['drm']:
              env.Append(CPPDEFINES = ['GLX_DIRECT_RENDERING'])
              sources.append(env.ParseSourceList('Makefile.sources', 
'x11_drm_FILES'))
-    if env['drm'] and False:
-        # XXX: Disabled as it depends on gbm, which is not yet built 
with scons
-        env.Append(CPPDEFINES = ['HAVE_DRM_BACKEND'])
-        env.Append(CPPPATH = [
-            '#/src/loader',
-            '#/src/gbm/main',
-            '#/src/gallium/state_trackers/gbm',
-        ])
-        env.Prepend(LIBS = [
-            libloader
-        ])
-        sources.append(env.ParseSourceList('Makefile.sources', 
'drm_FILES'))

  st_egl = env.ConvenienceLibrary(
      target = 'st_egl',