diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2013-09-22 16:25:28 +0100 |
|---|---|---|
| committer | Tom Stellard <thomas.stellard@amd.com> | 2013-10-01 07:29:52 -0700 |
| commit | 0d36f5c3be59c9357916097b6f328ac13b0eca77 (patch) | |
| tree | 9c3d75792fe30139a2433ae9bb145e5daa6e65b9 /src | |
| parent | 56dfbbd24afc10c659224bdce075cfdd72582afb (diff) | |
winsys/i915/sw: 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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/winsys/i915/sw/Makefile.am | 7 | ||||
| -rw-r--r-- | src/gallium/winsys/i915/sw/Makefile.sources | 5 | ||||
| -rw-r--r-- | src/gallium/winsys/i915/sw/SConscript | 7 |
3 files changed, 8 insertions, 11 deletions
diff --git a/src/gallium/winsys/i915/sw/Makefile.am b/src/gallium/winsys/i915/sw/Makefile.am index 2276f0d8c65..186fee3963c 100644 --- a/src/gallium/winsys/i915/sw/Makefile.am +++ b/src/gallium/winsys/i915/sw/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 = \ @@ -30,8 +31,4 @@ AM_CFLAGS = \ noinst_LTLIBRARIES = libi915sw.la -libi915sw_la_SOURCES = \ - i915_sw_batchbuffer.c \ - i915_sw_buffer.c \ - i915_sw_fence.c \ - i915_sw_winsys.c +libi915sw_la_SOURCES = $(C_SOURCES) diff --git a/src/gallium/winsys/i915/sw/Makefile.sources b/src/gallium/winsys/i915/sw/Makefile.sources new file mode 100644 index 00000000000..89a38c6c63b --- /dev/null +++ b/src/gallium/winsys/i915/sw/Makefile.sources @@ -0,0 +1,5 @@ +C_SOURCES := \ + i915_sw_batchbuffer.c \ + i915_sw_buffer.c \ + i915_sw_fence.c \ + i915_sw_winsys.c diff --git a/src/gallium/winsys/i915/sw/SConscript b/src/gallium/winsys/i915/sw/SConscript index 84f427a128a..9d785191d54 100644 --- a/src/gallium/winsys/i915/sw/SConscript +++ b/src/gallium/winsys/i915/sw/SConscript @@ -2,12 +2,7 @@ Import('*') env = env.Clone() -i915_sw_sources = [ - 'i915_sw_batchbuffer.c', - 'i915_sw_buffer.c', - 'i915_sw_winsys.c', - 'i915_sw_fence.c', -] +i915_sw_sources = env.ParseSourceList('Makefile.sources', 'C_SOURCES') i915sw = env.ConvenienceLibrary( target ='i915sw', |