fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-07 21:40:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

targets/egl: fold in target LDFLAGS variables

Browse source 
Both variables are identical thus we can fold them into AM_LDFLAGS.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Emil Velikov 2014-09-21 17:01:30 +01:00
parent a37b9bb555
commit 5a68432f04
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/targets/egl-static/Makefile.am
View file

@ -123,7 +123,6 @@ egl_LTLIBRARIES += st_GL.la
nodist_EXTRA_st_GL_la_SOURCES = dummy.cpp
st_GL_la_SOURCES = st_GL.c
st_GL_la_LDFLAGS = $(AM_LDFLAGS)
# st_GL, built only when shared glapi is not enabled
st_GL_la_LIBADD = \
$(top_builddir)/src/mesa/libmesagallium.la \
@ -175,7 +174,6 @@ include $(top_srcdir)/src/gallium/drivers/freedreno/Automake.inc
include $(top_srcdir)/src/gallium/drivers/softpipe/Automake.inc
include $(top_srcdir)/src/gallium/drivers/llvmpipe/Automake.inc
egl_gallium_la_LDFLAGS = $(AM_LDFLAGS)
egl_gallium_la_CPPFLAGS = $(AM_CPPFLAGS) $(TARGET_CPPFLAGS)
egl_gallium_la_LIBADD += $(TARGET_LIB_DEPS) \
$(TARGET_RADEON_WINSYS) $(TARGET_RADEON_COMMON)
@ -191,12 +189,12 @@ egl_gallium_la_LIBADD += $(TARGET_LIB_DEPS) \
if HAVE_MESA_LLVM
egl_gallium_la_LDFLAGS += $(LLVM_LDFLAGS)
AM_LDFLAGS += $(LLVM_LDFLAGS)
egl_gallium_la_LIBADD += $(LLVM_LIBS)
if HAVE_OPENGL
if !HAVE_SHARED_GLAPI
st_GL_la_LDFLAGS += $(LLVM_LDFLAGS)
st_GL_la_LIBADD += $(LLVM_LIBS)
endif
endif