summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/libgl-xlib/Makefile.am
diff options
context:
space:
mode:
authorBrad King <[email protected]>2014-05-06 11:06:47 -0400
committerEmil Velikov <[email protected]>2014-05-14 23:44:08 +0100
commit6aac2637a675060c79c62bcc01550a6cad08a37f (patch)
treef0e3d7684bd90e98f26f539972746c75066cd02f /src/gallium/targets/libgl-xlib/Makefile.am
parentf57d092199318f03f6522d0ca616f1f8220b2e6e (diff)
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 <[email protected]>
Diffstat (limited to 'src/gallium/targets/libgl-xlib/Makefile.am')
-rw-r--r--src/gallium/targets/libgl-xlib/Makefile.am14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am
index 4ee364e7366..76513332a5b 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@[email protected]
-nodist_EXTRA_libGL_la_SOURCES = dummy.cpp
-libGL_la_SOURCES = xlib.c
-libGL_la_LDFLAGS = \
+nodist_EXTRA_lib@GL_LIB@_la_SOURCES = dummy.cpp
+lib@GL_LIB@_la_SOURCES = xlib.c
+lib@GL_LIB@_la_LDFLAGS = \
-no-undefined \
-version-number $(GL_MAJOR):$(GL_MINOR):$(GL_TINY) \
$(GC_SECTIONS) \
$(LD_NO_UNDEFINED)
-libGL_la_LIBADD = \
+lib@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@GL_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
-libGL_la_LDFLAGS += $(LLVM_LDFLAGS)
+lib@GL_LIB@_la_LDFLAGS += $(LLVM_LDFLAGS)
endif
include $(top_srcdir)/install-gallium-links.mk