targets/dri-swrast: Convert to static/shared pipe-driver

Convert the final dri target to the single DRI (megadriver) library.
Cleanup all the automake leftovers from the conversion stage and
update the scons build.

v2: Link in llvmpipe, when applicable.

Signed-off-by: Emil Velikov <[email protected]>
Tested-by: Rob Clark <[email protected]>
Tested-by: Thomas Helland <thomashelland90 at gmail.com>
Acked-by: Tom Stellard <[email protected]>

1 files changed, 0 insertions, 49 deletions

diff --git a/src/gallium/targets/dri-swrast/SConscript b/src/gallium/targets/dri-swrast/SConscript
deleted file mode 100644
index 374444be2c6..00000000000
--- a/src/gallium/targets/dri-swrast/SConscript
+++ /dev/null
@@ -1,49 +0,0 @@
-Import('*')
-
-env = drienv.Clone()
-
-env.Append(CPPPATH = [
-    '#/src/loader',
-    '#/src/mapi',
-    '#/src/mesa',
-    '#/src/mesa/drivers/dri/common',
-    '#/src/gallium/state_trackers/dri',
-])
-
-env.Prepend(LIBS = [
-    st_dri,
-    ws_dri,
-    trace,
-    rbug,
-    mesa,
-    glsl,
-    gallium,
-    megadrivers_stub,
-    dri_common,
-])
-
-if True:
-    env.Append(CPPDEFINES = [
-        'GALLIUM_SOFTPIPE',
-        'GALLIUM_RBUG',
-        'GALLIUM_TRACE',
-    ])
-    env.Prepend(LIBS = [softpipe])
-
-if env['llvm']:
-    env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
-    env.Prepend(LIBS = [llvmpipe])
-
-swrast_sources = [
-    'swrast_drm_api.c'
-]
-
-module = env.LoadableModule(
-    target ='swrast_dri.so',
-    source = swrast_sources,
-    SHLIBPREFIX = '',
-)
-
-module = env.InstallSharedLibrary(module)
-
-env.Alias('dri-swrast', module)