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

automake: Honor GL_LIB for gallium libgl-xlib

Browse source 
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@gmail.com>
This commit is contained in:
Brad King 2014-05-06 11:06:47 -04:00 • committed by Emil Velikov
parent f57d092199
commit 6aac2637a6
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gallium/targets/libgl-xlib/Makefile.am
View file

@ -40,17 +40,17 @@ AM_CPPFLAGS = \
-DGALLIUM_GALAHAD
AM_CFLAGS = $(X11_INCLUDES)
lib_LTLIBRARIES = libGL.la
lib_LTLIBRARIES = lib@GL_LIB@.la
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