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

Move glx/{,xlib/}Makefile.am to preserve file list

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

diff --git a/configure.ac b/configure.ac
index 8ccbc287025176704fbd59d4a5c1d1945389c826..e7c8223383e731ab2ea14fd4c5c12c760dba0d88 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2025,7 +2025,7 @@ AC_CONFIG_FILES([Makefile
                src/gallium/state_trackers/dri/sw/Makefile
                src/gallium/state_trackers/egl/Makefile
                src/gallium/state_trackers/gbm/Makefile
-               src/gallium/state_trackers/glx/Makefile
+               src/gallium/state_trackers/glx/xlib/Makefile
                src/gallium/state_trackers/osmesa/Makefile
                src/gallium/state_trackers/vdpau/Makefile
                src/gallium/state_trackers/vega/Makefile

diff --git a/src/gallium/state_trackers/Makefile.am b/src/gallium/state_trackers/Makefile.am
index 577459891d7933bdd81d4b01d9520d0d2492785d..fabe271130043598c33cea0ef12a073695e53ba2 100644 (file)
--- a/src/gallium/state_trackers/Makefile.am
+++ b/src/gallium/state_trackers/Makefile.am
@@ -22,7 +22,7 @@
 SUBDIRS =
 
 if HAVE_X11_DRIVER
-SUBDIRS += glx
+SUBDIRS += glx/xlib
 endif
 
 if HAVE_GALLIUM_OSMESA

diff --git a/src/gallium/state_trackers/glx/Makefile.am b/src/gallium/state_trackers/glx/Makefile.am
deleted file mode 100644 (file)
index e5b3924..0000000
--- a/src/gallium/state_trackers/glx/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-       $(GALLIUM_CFLAGS) \
-       $(X11_CFLAGS)
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/include \
-       -I$(top_srcdir)/src/mapi \
-       -I$(top_srcdir)/src/mesa
-
-noinst_LTLIBRARIES = libxlib.la
-
-libxlib_la_SOURCES = \
-       xlib/glx_api.c \
-       xlib/glx_getproc.c \
-       xlib/glx_usefont.c \
-       xlib/xm_api.c \
-       xlib/xm_st.c

diff --git a/src/gallium/state_trackers/glx/xlib/Makefile.am b/src/gallium/state_trackers/glx/xlib/Makefile.am
new file mode 100644 (file)
index 0000000..7a63594
--- /dev/null
+++ b/src/gallium/state_trackers/glx/xlib/Makefile.am
@@ -0,0 +1,36 @@
+# Copyright © 2012 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# 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 = \
+       $(GALLIUM_CFLAGS) \
+       $(X11_CFLAGS)
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src/mapi \
+       -I$(top_srcdir)/src/mesa
+
+noinst_LTLIBRARIES = libxlib.la
+
+libxlib_la_SOURCES = $(C_SOURCES)

diff --git a/src/gallium/state_trackers/glx/xlib/Makefile.sources b/src/gallium/state_trackers/glx/xlib/Makefile.sources
new file mode 100644 (file)
index 0000000..a77a895
--- /dev/null
+++ b/src/gallium/state_trackers/glx/xlib/Makefile.sources
@@ -0,0 +1,6 @@
+C_SOURCES := \
+       glx_api.c \
+       glx_getproc.c \
+       glx_usefont.c \
+       xm_api.c \
+       xm_st.c

diff --git a/src/gallium/state_trackers/glx/xlib/SConscript b/src/gallium/state_trackers/glx/xlib/SConscript
index 9e7ebf3fc912dcbe156055abbd94e064b7d1773e..88e81b85582539cfe01da83b7a8f5a1c85d284a3 100644 (file)
--- a/src/gallium/state_trackers/glx/xlib/SConscript
+++ b/src/gallium/state_trackers/glx/xlib/SConscript
@@ -11,16 +11,8 @@ env.Append(CPPPATH = [
     '#/src/mesa/main',
 ])
 
-sources = [
-    'glx_api.c',
-    'glx_getproc.c',
-    'glx_usefont.c',
-    'xm_api.c',
-    'xm_st.c',
-]
-
 st_xlib = env.ConvenienceLibrary(
     target = 'st_xlib',
-    source = sources,
+    source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
 )
 Export('st_xlib')

diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am
index cca0da48becd87b255ad4d21c341a734e8fdd73f..89066c7c06fa6db963687783efccbb6f3050e069 100644 (file)
--- a/src/gallium/targets/libgl-xlib/Makefile.am
+++ b/src/gallium/targets/libgl-xlib/Makefile.am
@@ -45,7 +45,7 @@ libGL_la_SOURCES = xlib.c
 libGL_la_LDFLAGS = -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_TINY) -no-undefined
 
 libGL_la_LIBADD = \
-       $(top_builddir)/src/gallium/state_trackers/glx/libxlib.la \
+       $(top_builddir)/src/gallium/state_trackers/glx/xlib/libxlib.la \
        $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \
        $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
        $(top_builddir)/src/gallium/drivers/trace/libtrace.la \