diff options
| -rw-r--r-- | src/gallium/state_trackers/dri/drm/Makefile.am | 7 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/drm/Makefile.sources | 5 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/drm/SConscript | 9 |
3 files changed, 8 insertions, 13 deletions
diff --git a/src/gallium/state_trackers/dri/drm/Makefile.am b/src/gallium/state_trackers/dri/drm/Makefile.am index f8916b1b554..c90c4634e0b 100644 --- a/src/gallium/state_trackers/dri/drm/Makefile.am +++ b/src/gallium/state_trackers/dri/drm/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_CPPFLAGS = \ @@ -34,8 +35,4 @@ AM_CPPFLAGS = \ noinst_LTLIBRARIES = libdridrm.la -libdridrm_la_SOURCES = \ - dri_context.c \ - dri_screen.c \ - dri_drawable.c \ - dri2.c +libdridrm_la_SOURCES = $(C_SOURCES) diff --git a/src/gallium/state_trackers/dri/drm/Makefile.sources b/src/gallium/state_trackers/dri/drm/Makefile.sources new file mode 100644 index 00000000000..b9b93a24e8a --- /dev/null +++ b/src/gallium/state_trackers/dri/drm/Makefile.sources @@ -0,0 +1,5 @@ +C_SOURCES := \ + dri_context.c \ + dri_screen.c \ + dri_drawable.c \ + dri2.c diff --git a/src/gallium/state_trackers/dri/drm/SConscript b/src/gallium/state_trackers/dri/drm/SConscript index a996f50bf2d..07eaa0ae1b5 100644 --- a/src/gallium/state_trackers/dri/drm/SConscript +++ b/src/gallium/state_trackers/dri/drm/SConscript @@ -15,15 +15,8 @@ env.Append(CPPPATH = [ xmlpool_options.dir.dir, # Dir to generated xmlpool/options.h ]) -sources = [ - 'dri_context.c', - 'dri_drawable.c', - 'dri_screen.c', - 'dri2.c', -] - st_dri = env.ConvenienceLibrary( target = 'st_dri', - source = sources, + source = env.ParseSourceList('Makefile.sources', 'C_SOURCES') ) Export('st_dri') |