scons: build and use a single dri_common library

Rather than building two identical ones for dri-vmwgfx and dri-swrast
build a single library, and drop some duplication in the build.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Tested-by: Rob Clark <robclark@freedesktop.org>
Tested-by: Thomas Helland <thomashelland90 at gmail.com>
Acked-by: Tom Stellard <thomas.stellard@amd.com>

diff --git a/src/gallium/targets/dri-swrast/SConscript b/src/gallium/targets/dri-swrast/SConscript
index ab71b7d0f79e7da5ba37ae52c163ae59c9ef8f4d..029bb033e43b0862544a91c6dc635a98966d1caf 100644 (file)
--- a/src/gallium/targets/dri-swrast/SConscript
+++ b/src/gallium/targets/dri-swrast/SConscript
@@ -1,6 +1,6 @@
 Import('*')
 
-env = driswenv.Clone()
+env = drienv.Clone()
 
 env.Prepend(LIBS = [
     st_drisw,
@@ -10,7 +10,7 @@ env.Prepend(LIBS = [
     mesa,
     glsl,
     gallium,
-    COMMON_DRI_SW_OBJECTS
+    dri_common,
 ])
 
 if True:

diff --git a/src/gallium/targets/dri/SConscript b/src/gallium/targets/dri/SConscript
index a78a1b11793c917626aaf401f101a6b93aca1f06..6f01234406669978a4425c072c1b7067e5e11801 100644 (file)
--- a/src/gallium/targets/dri/SConscript
+++ b/src/gallium/targets/dri/SConscript
@@ -35,7 +35,7 @@ env.Prepend(LIBS = [
     glsl,
     gallium,
     megadrivers_stub,
-    COMMON_DRI_DRM_OBJECTS
+    dri_common,
 ])
 
 module = env.LoadableModule(

diff --git a/src/mesa/drivers/dri/common/SConscript b/src/mesa/drivers/dri/common/SConscript
index 2763380cd8ac799418812f2e810a176d50f409b1..d003139bfdbb71d69b28f3cd1898208b1028798e 100644 (file)
--- a/src/mesa/drivers/dri/common/SConscript
+++ b/src/mesa/drivers/dri/common/SConscript
@@ -27,55 +27,22 @@ drienv.Replace(CPPPATH = [
     '#src/egl/drivers/dri',
 ])
 
-driswenv = drienv.Clone()
-driswenv.Append(CPPDEFINES = [
-    '__NOT_HAVE_DRM_H',
-    'HAVE_DLADDR',
+drienv.AppendUnique(LIBS = [
+    'expat',
 ])
 
+# if HAVE_DRI2
 drienv.PkgUseModules('DRM')
+# else
+#env.Append(CPPDEFINES = ['__NOT_HAVE_DRM_H'])
 
-dri_common_utils = drienv.SharedObject(
-    target = 'utils.o',
-    source = '#src/mesa/drivers/dri/common/utils.c'
-)
-
-dri_common_xmlconfig = drienv.SharedObject(
-    target = 'xmlconfig.o',
-    source = '#src/mesa/drivers/dri/common/xmlconfig.c'
-)
+sources = drienv.ParseSourceList('Makefile.sources', 'DRI_COMMON_FILES')
 
-dri_common_dri_util = drienv.SharedObject(
-    target = 'dri_util.o',
-    source = '#src/mesa/drivers/dri/common/dri_util.c'
-)
-
-dri_common_drisw_util = driswenv.SharedObject(
-    target = 'drisw_util.o',
-    source = '#src/mesa/drivers/dri/common/dri_util.c'
+dri_common = drienv.ConvenienceLibrary(
+       target = 'dri_common',
+       source = sources,
 )
 
-
-COMMON_DRI_SW_OBJECTS = [
-    dri_common_utils,
-    dri_common_xmlconfig,
-    dri_common_drisw_util,
-]
-
-COMMON_DRI_DRM_OBJECTS = [
-    dri_common_utils,
-    dri_common_xmlconfig,
-    dri_common_dri_util,
-]
-
-drienv.AppendUnique(LIBS = [
-    'expat',
-])
-
-driswenv.AppendUnique(LIBS = [
-    'expat',
-])
-
 #
 # megadrivers_stub
 #
@@ -104,8 +71,6 @@ env.Alias('megadrivers_stub', megadrivers_stub)
 
 Export([
     'drienv',
-    'driswenv',
-    'COMMON_DRI_SW_OBJECTS',
-    'COMMON_DRI_DRM_OBJECTS',
+    'dri_common',
     'megadrivers_stub',
 ])