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

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

Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Tom Stellard <[email protected]>

3 files changed, 43 insertions, 9 deletions

diff --git a/src/gallium/state_trackers/glx/xlib/Makefile.am b/src/gallium/state_trackers/glx/xlib/Makefile.am
new file mode 100644
index 00000000000..7a63594087d
--- /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
index 00000000000..a77a8955047
--- /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 9e7ebf3fc91..88e81b85582 100644
--- 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')