Browse Source

st/xorg: 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>
tags/mesa-10.1-devel
Emil Velikov 12 years ago
parent
commit
10bd3a3f71

+ 3
- 11
src/gallium/state_trackers/xorg/Makefile.am View File

@@ -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)

+ 11
- 0
src/gallium/state_trackers/xorg/Makefile.sources View File

@@ -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

+ 1
- 14
src/gallium/state_trackers/xorg/SConscript View File

@@ -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')

Loading…
Cancel
Save