fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

targets/egl-static: move the common LDFLAGS into AM_LDFLAGS

Browse source 
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Emil Velikov 2014-03-11 16:05:53 +00:00
parent c323273201
commit 6c8d8119ca
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,8 +30,6 @@
#
include $(top_srcdir)/src/gallium/Automake.inc
LDFLAGS += -Wl,--version-script=$(top_srcdir)/src/gallium/targets/egl-static/egl.link
AM_CFLAGS = $(PTHREAD_CFLAGS)
AM_CPPFLAGS = \
$(GALLIUM_CFLAGS) \
@ -46,6 +44,12 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/egl/main \
-D_EGL_MAIN=_eglMain
AM_LDFLAGS = \
-module \
-avoid-version \
-Wl,--no-undefined \
-Wl,--version-script=$(top_srcdir)/src/gallium/targets/egl-static/egl.link
egldir = $(EGL_DRIVER_INSTALL_DIR)
egl_LTLIBRARIES = egl_gallium.la
@ -68,7 +72,13 @@ egl_gallium_la_LIBADD = \
$(PTHREAD_LIBS) \
-lm
egl_gallium_la_LDFLAGS = -Wl,--no-undefined -Wl,--allow-multiple-definition -avoid-version -module
if HAVE_MESA_LLVM
AM_LDFLAGS += $(LLVM_LDFLAGS)
endif
egl_gallium_la_LDFLAGS = \
$(AM_LDFLAGS) \
-Wl,--allow-multiple-definition
if HAVE_EGL_PLATFORM_X11
AM_CPPFLAGS += $(LIBDRM_CFLAGS)
@ -121,7 +131,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 = -Wl,--no-undefined -avoid-version -module
# st_GL, built only when shared glapi is not enabled
st_GL_la_LIBADD = \
@ -232,12 +241,10 @@ endif
if HAVE_MESA_LLVM
egl_gallium_la_LIBADD += $(LLVM_LIBS)
egl_gallium_la_LDFLAGS += $(LLVM_LDFLAGS)
if HAVE_OPENGL
if !HAVE_SHARED_GLAPI
st_GL_la_LIBADD += $(LLVM_LIBS)
st_GL_la_LDFLAGS += $(LLVM_LDFLAGS)
endif
endif
endif