i965/vec4: Don't coalesce registers with overlapping writes not matching the MOV...

[mesa.git] / src / mesa / drivers / dri / common / SConscript

diff --git a/src/mesa/drivers/dri/common/SConscript b/src/mesa/drivers/dri/common/SConscript
index 2763380cd8ac799418812f2e810a176d50f409b1..52d201f891324c13d32fc07eda63222b40d21664 100644 (file)
--- a/src/mesa/drivers/dri/common/SConscript
+++ b/src/mesa/drivers/dri/common/SConscript
@@ -10,6 +10,7 @@ drienv.Replace(CPPPATH = [
     xmlpool_options.dir.dir, # Dir to generated xmlpool/options.h
     '#include',
     '#include/GL/internal',
+    '#src',
     '#src/mapi',
     '#src/gallium/include',
     '#src/gallium/auxiliary',
@@ -27,54 +28,16 @@ drienv.Replace(CPPPATH = [
     '#src/egl/drivers/dri',
 ])
 
-driswenv = drienv.Clone()
-driswenv.Append(CPPDEFINES = [
-    '__NOT_HAVE_DRM_H',
-    'HAVE_DLADDR',
-])
-
-drienv.PkgUseModules('DRM')
-
-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'
-)
-
-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'
-)
-
-
-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',
-])
+sources = drienv.ParseSourceList('Makefile.sources', ['DRI_COMMON_FILES', 'XMLCONFIG_FILES' ])
+
+dri_common = drienv.ConvenienceLibrary(
+       target = 'dri_common',
+       source = sources,
+)
 
 #
 # megadrivers_stub
@@ -89,7 +52,6 @@ env.Append(CPPPATH = [
 ])
 
 env.Append(CPPDEFINES = [
-    '__NOT_HAVE_DRM_H',
     'HAVE_DLADDR',
 ])
 
@@ -104,8 +66,6 @@ env.Alias('megadrivers_stub', megadrivers_stub)
 
 Export([
     'drienv',
-    'driswenv',
-    'COMMON_DRI_SW_OBJECTS',
-    'COMMON_DRI_DRM_OBJECTS',
+    'dri_common',
     'megadrivers_stub',
 ])