st/xorg: consolidate C sources list into Makefile.sources

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>

diff --git a/src/gallium/state_trackers/xorg/Makefile.am b/src/gallium/state_trackers/xorg/Makefile.am
index e3bad1f0ebcbfc0bf7ba1b8026b10469fe508ec0..ffc1ad07ffe1a1c6384a513bc3159fee5c227131 100644 (file)
--- a/src/gallium/state_trackers/xorg/Makefile.am
+++ b/src/gallium/state_trackers/xorg/Makefile.am
@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
+include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
@@ -28,6 +29,7 @@ AM_CFLAGS = \
        $(LIBKMS_XORG_CFLAGS) \
        $(LIBDRM_XORG_CFLAGS) \
        $(shell $(PKG_CONFIG) --cflags-only-I xorg-server)
+
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/mesa \
@@ -38,14 +40,4 @@ AM_CPPFLAGS = \
 
 noinst_LTLIBRARIES = libxorgtracker.la
 
-libxorgtracker_la_SOURCES =    \
-       xorg_composite.c        \
-       xorg_crtc.c             \
-       xorg_dri2.c             \
-       xorg_driver.c           \
-       xorg_exa.c              \
-       xorg_exa_tgsi.c         \
-       xorg_output.c           \
-       xorg_renderer.c         \
-       xorg_xv.c               \
-       xorg_xvmc.c
+libxorgtracker_la_SOURCES = $(C_SOURCES)

diff --git a/src/gallium/state_trackers/xorg/Makefile.sources b/src/gallium/state_trackers/xorg/Makefile.sources
new file mode 100644 (file)
index 0000000..7b07356
--- /dev/null
+++ b/src/gallium/state_trackers/xorg/Makefile.sources
@@ -0,0 +1,11 @@
+C_SOURCES := \
+       xorg_composite.c \
+       xorg_crtc.c \
+       xorg_dri2.c \
+       xorg_driver.c \
+       xorg_exa.c \
+       xorg_exa_tgsi.c \
+       xorg_output.c \
+       xorg_renderer.c \
+       xorg_xv.c \
+       xorg_xvmc.c

diff --git a/src/gallium/state_trackers/xorg/SConscript b/src/gallium/state_trackers/xorg/SConscript
index 1768f701e480c1d95d3e6e06f6bf5850e5692012..88990d589a92c17c39660b45d3f54390cbecee81 100644 (file)
--- a/src/gallium/state_trackers/xorg/SConscript
+++ b/src/gallium/state_trackers/xorg/SConscript
@@ -22,21 +22,8 @@ if conf.CheckHeader('X11/extensions/dpmsconst.h'):
 
 conf.Finish()
 
-sources = [
-    'xorg_composite.c',
-    'xorg_crtc.c',
-    'xorg_dri2.c',
-    'xorg_driver.c',
-    'xorg_exa.c',
-    'xorg_exa_tgsi.c',
-    'xorg_output.c',
-    'xorg_renderer.c',
-    'xorg_xv.c',
-    'xorg_xvmc.c',
-]
-
 st_xorg = env.ConvenienceLibrary(
     target = 'st_xorg',
-    source = sources,
+    source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
 )
 Export('st_xorg')