Fine by me. Jose
----- Original Message ----- > One build system for linux/unix only drivers should be enough. > Additionally the nouveau target was disabled anyway. > --- > src/gallium/SConscript | 15 --------------- > src/gallium/drivers/nouveau/SConscript | 10 ---------- > src/gallium/drivers/nv30/SConscript | 11 ----------- > src/gallium/drivers/nv50/SConscript | 11 ----------- > src/gallium/drivers/nvc0/SConscript | 11 ----------- > 5 files changed, 58 deletions(-) > delete mode 100644 src/gallium/drivers/nouveau/SConscript > delete mode 100644 src/gallium/drivers/nv30/SConscript > delete mode 100644 src/gallium/drivers/nv50/SConscript > delete mode 100644 src/gallium/drivers/nvc0/SConscript > > diff --git a/src/gallium/SConscript b/src/gallium/SConscript > index c53cd39..a3edc65 100644 > --- a/src/gallium/SConscript > +++ b/src/gallium/SConscript > @@ -27,19 +27,6 @@ if not env['msvc']: > 'drivers/i915/SConscript', > ]) > > -if env['drm']: > - # These drivers depend on drm headers > - # XXX: nouveau drivers have a tight dependency on libdrm, so to enable > - # we need some version logic before we enable them. Also, ATM there is > - # no nouveau target in scons > - # if env['drm_nouveau']: > - # SConscript([ > - # 'drivers/nouveau/SConscript', > - # 'drivers/nv50/SConscript', > - # 'drivers/nvc0/SConscript', > - # 'drivers/nvfx/SConscript', > - # ]) > - > # > # State trackers > # > @@ -132,7 +119,6 @@ if not env['embedded']: > 'targets/SConscript.dri', > 'targets/dri-swrast/SConscript', > 'targets/dri-vmwgfx/SConscript', > - #'targets/dri-nouveau/SConscript', > ]) > if env['drm_intel']: > SConscript([ > @@ -142,7 +128,6 @@ if not env['embedded']: > if env['xorg'] and env['drm']: > SConscript([ > #'targets/xorg-i915/SConscript', > - #'targets/xorg-nouveau/SConscript', > ]) > > > diff --git a/src/gallium/drivers/nouveau/SConscript > b/src/gallium/drivers/nouveau/SConscript > deleted file mode 100644 > index 418744c..0000000 > --- a/src/gallium/drivers/nouveau/SConscript > +++ /dev/null > @@ -1,10 +0,0 @@ > -Import('*') > - > -env = env.Clone() > - > -nouveau = env.ConvenienceLibrary( > - target = 'nouveau', > - source = env.ParseSourceList('Makefile.sources', 'C_SOURCES') > - ) > - > -Export('nouveau') > diff --git a/src/gallium/drivers/nv30/SConscript > b/src/gallium/drivers/nv30/SConscript > deleted file mode 100644 > index 3c2ff03..0000000 > --- a/src/gallium/drivers/nv30/SConscript > +++ /dev/null > @@ -1,11 +0,0 @@ > -Import('*') > - > -env = env.Clone() > - > -nv30 = env.ConvenienceLibrary( > - target = 'nv30', > - source = env.ParseSourceList('Makefile.sources', > - ['C_SOURCES', 'CPP_SOURCES']) > - ) > - > -Export('nv30') > diff --git a/src/gallium/drivers/nv50/SConscript > b/src/gallium/drivers/nv50/SConscript > deleted file mode 100644 > index 3baaa8a..0000000 > --- a/src/gallium/drivers/nv50/SConscript > +++ /dev/null > @@ -1,11 +0,0 @@ > -Import('*') > - > -env = env.Clone() > - > -nv50 = env.ConvenienceLibrary( > - target = 'nv50', > - source = env.ParseSourceList('Makefile.sources', > - ['C_SOURCES', 'CPP_SOURCES']) > - ) > - > -Export('nv50') > diff --git a/src/gallium/drivers/nvc0/SConscript > b/src/gallium/drivers/nvc0/SConscript > deleted file mode 100644 > index 4e456d1..0000000 > --- a/src/gallium/drivers/nvc0/SConscript > +++ /dev/null > @@ -1,11 +0,0 @@ > -Import('*') > - > -env = env.Clone() > - > -nvc0 = env.ConvenienceLibrary( > - target = 'nvc0', > - source = env.ParseSourceList('Makefile.sources', > - ['C_SOURCES', 'CPP_SOURCES']) > - ) > - > -Export('nvc0') > -- > 1.7.10.4 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev