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>
This commit is contained in:
Emil Velikov 2013-09-22 16:14:06 +01:00 committed by Tom Stellard
parent 760c1a6e66
commit 921fdf1429
6 changed files with 12 additions and 18 deletions

View File

@ -2025,7 +2025,7 @@ AC_CONFIG_FILES([Makefile
src/gallium/state_trackers/dri/sw/Makefile
src/gallium/state_trackers/egl/Makefile
src/gallium/state_trackers/gbm/Makefile
src/gallium/state_trackers/glx/Makefile
src/gallium/state_trackers/glx/xlib/Makefile
src/gallium/state_trackers/osmesa/Makefile
src/gallium/state_trackers/vdpau/Makefile
src/gallium/state_trackers/vega/Makefile

View File

@ -22,7 +22,7 @@
SUBDIRS =
if HAVE_X11_DRIVER
SUBDIRS += glx
SUBDIRS += glx/xlib
endif
if HAVE_GALLIUM_OSMESA

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

View File

@ -0,0 +1,6 @@
C_SOURCES := \
glx_api.c \
glx_getproc.c \
glx_usefont.c \
xm_api.c \
xm_st.c

View File

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

View File

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