diff options
| author | Emil Velikov <[email protected]> | 2013-06-06 00:16:38 +0100 |
|---|---|---|
| committer | Tom Stellard <[email protected]> | 2013-10-01 07:29:52 -0700 |
| commit | 10bd3a3f712d3b53eb08e902eccb9fa1201fd16f (patch) | |
| tree | a48599fe78f9dc6d7e41fd66c50c76a1af3172a0 | |
| parent | 556207e57983cd2770524464cd8df6abd1193dd3 (diff) | |
st/xorg: consolidate C sources list into Makefile.sources
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Tom Stellard <[email protected]>
| -rw-r--r-- | src/gallium/state_trackers/xorg/Makefile.am | 14 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xorg/Makefile.sources | 11 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xorg/SConscript | 15 |
3 files changed, 15 insertions, 25 deletions
diff --git a/src/gallium/state_trackers/xorg/Makefile.am b/src/gallium/state_trackers/xorg/Makefile.am index e3bad1f0ebc..ffc1ad07ffe 100644 --- 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 index 00000000000..7b07356978e --- /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 1768f701e48..88990d589a9 100644 --- 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') |