diff options
| author | Emil Velikov <[email protected]> | 2014-03-11 16:05:53 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-03-31 12:56:25 +0100 |
| commit | 6c8d8119caf99fffcfb2f50763267ae0a9ed8738 (patch) | |
| tree | 830219cf5222078afed17d719c20f73c715796e9 /src/gallium/targets | |
| parent | c3232732019703cf0aec419a9ee11dd47ac798e0 (diff) | |
targets/egl-static: move the common LDFLAGS into AM_LDFLAGS
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/gallium/targets')
| -rw-r--r-- | src/gallium/targets/egl-static/Makefile.am | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am index 282fa6682f2..b492496a743 100644 --- a/src/gallium/targets/egl-static/Makefile.am +++ b/src/gallium/targets/egl-static/Makefile.am @@ -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 |