diff options
author | Emil Velikov <emil.l.velikov@gmail.com> | 2013-09-22 16:14:06 +0100 |
---|---|---|
committer | Tom Stellard <thomas.stellard@amd.com> | 2013-10-01 07:29:51 -0700 |
commit | 921fdf14293f0c417a46f36fd74cfa11e82b3456 (patch) | |
tree | b99f8dcbfcd733d31338318ff45b280d3826fba1 /src | |
parent | 760c1a6e66149f95fa7108e81de46b1dc2ec2f19 (diff) |
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>
Diffstat (limited to 'src')
-rw-r--r-- | src/gallium/state_trackers/Makefile.am | 2 | ||||
-rw-r--r-- | src/gallium/state_trackers/glx/xlib/Makefile.am (renamed from src/gallium/state_trackers/glx/Makefile.am) | 8 | ||||
-rw-r--r-- | src/gallium/state_trackers/glx/xlib/Makefile.sources | 6 | ||||
-rw-r--r-- | src/gallium/state_trackers/glx/xlib/SConscript | 10 | ||||
-rw-r--r-- | src/gallium/targets/libgl-xlib/Makefile.am | 2 |
5 files changed, 11 insertions, 17 deletions
diff --git a/src/gallium/state_trackers/Makefile.am b/src/gallium/state_trackers/Makefile.am index 577459891d7..fabe2711300 100644 --- 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/xlib/Makefile.am index e5b39248b92..7a63594087d 100644 --- a/src/gallium/state_trackers/glx/Makefile.am +++ b/src/gallium/state_trackers/glx/xlib/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 = \ @@ -32,9 +33,4 @@ AM_CPPFLAGS = \ 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 +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') diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am index cca0da48bec..89066c7c06f 100644 --- 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 \ |