From: Jon TURNEY Date: Sun, 8 Jul 2012 22:26:11 +0000 (+0100) Subject: Don't explicitly link libOsmesa with libmesa's dependency libglsl X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=99728076ec1a8bd3feb0f23e41198d8d5e56d0c9;p=mesa.git Don't explicitly link libOsmesa with libmesa's dependency libglsl The libmesa convenience library is linked with the libglsl convenience library. libOsmesa is linked with libmesa, and also directly with libglsl. When using libtool, this gives rise to duplicate symbol errors. Signed-off-by: Jon TURNEY Reviewed-by: Eric Anholt Tested-by: Matt Turner --- diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am index 9989c92620f..7c151bf705f 100644 --- a/src/mesa/drivers/osmesa/Makefile.am +++ b/src/mesa/drivers/osmesa/Makefile.am @@ -40,8 +40,7 @@ lib@OSMESA_LIB@_la_SOURCES = osmesa.c lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@ -shared lib@OSMESA_LIB@_la_LIBADD = \ $(top_builddir)/src/mesa/libmesa.la \ - $(top_builddir)/src/mapi/glapi/libglapi.la \ - $(top_builddir)/src/glsl/libglsl.la + $(top_builddir)/src/mapi/glapi/libglapi.la # Provide compatibility with scripts for the old Mesa build system for # a while by putting a link to the driver into /lib of the build tree.