Mesa (master): automake: Honor GL_LIB for gallium libgl-xlib

[Emil Velikov]

Module: Mesa
Branch: master
Commit: 6aac2637a675060c79c62bcc01550a6cad08a37f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6aac2637a675060c79c62bcc01550a6cad08a37f

Author: Brad King <brad.king at kitware.com>
Date:   Tue May  6 11:06:47 2014 -0400

automake: Honor GL_LIB for gallium libgl-xlib

Use "@GL_LIB@" in src/gallium/targets/libgl-xlib/Makefile.am to produce
the library name specified by the configure --with-gl-lib-name option.

Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>

---

 src/gallium/targets/libgl-xlib/Makefile.am |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am
index 4ee364e..7651333 100644
--- a/src/gallium/targets/libgl-xlib/Makefile.am
+++ b/src/gallium/targets/libgl-xlib/Makefile.am
@@ -40,17 +40,17 @@ AM_CPPFLAGS = \
 	-DGALLIUM_GALAHAD
 AM_CFLAGS = $(X11_INCLUDES)
 
-lib_LTLIBRARIES = libGL.la
+lib_LTLIBRARIES = lib at GL_LIB@.la
 
-nodist_EXTRA_libGL_la_SOURCES = dummy.cpp
-libGL_la_SOURCES = xlib.c
-libGL_la_LDFLAGS = \
+nodist_EXTRA_lib at GL_LIB@_la_SOURCES = dummy.cpp
+lib at GL_LIB@_la_SOURCES = xlib.c
+lib at GL_LIB@_la_LDFLAGS = \
 	-no-undefined \
 	-version-number $(GL_MAJOR):$(GL_MINOR):$(GL_TINY) \
 	$(GC_SECTIONS) \
 	$(LD_NO_UNDEFINED)
 
-libGL_la_LIBADD = \
+lib at GL_LIB@_la_LIBADD = \
 	$(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 \
@@ -64,9 +64,9 @@ libGL_la_LIBADD = \
 	$(CLOCK_LIB)
 
 if HAVE_MESA_LLVM
-libGL_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
+lib at GL_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
 AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
-libGL_la_LDFLAGS += $(LLVM_LDFLAGS)
+lib at GL_LIB@_la_LDFLAGS += $(LLVM_LDFLAGS)
 endif
 
 include $(top_srcdir)/install-gallium-links.mk