On 06/05/14 16:06, Brad King wrote: > 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. Hi Brad, I was planning on doing the same thing for ages but kind of forgot :)
Reviewed-by: Emil Velikov <emil.l.veli...@gmail.com> FWIW unless someone has further feedback I'll push this ~mid of the upcoming week. Thanks Emil > --- > 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@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 > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
