From 5a68432f04e5d6b5492840e5a14e40a00a8d01b8 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sun, 21 Sep 2014 17:01:30 +0100 Subject: [PATCH] targets/egl: fold in target LDFLAGS variables Both variables are identical thus we can fold them into AM_LDFLAGS. Signed-off-by: Emil Velikov Acked-by: Matt Turner --- src/gallium/targets/egl-static/Makefile.am | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am index ed9847dffe5..7e6de811013 100644 --- a/src/gallium/targets/egl-static/Makefile.am +++ b/src/gallium/targets/egl-static/Makefile.am @@ -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 -- 2.30.2