path: root/src/mesa/drivers/osmesa/
diff options
authorJon TURNEY <>2012-07-08 23:26:11 +0100
committerJon TURNEY <>2012-07-13 12:44:44 +0100
commit99728076ec1a8bd3feb0f23e41198d8d5e56d0c9 (patch)
tree78da932e2a9fe1ea36d27b3ec438b607fdd87d99 /src/mesa/drivers/osmesa/
parentb2a37e242ea60fde6d616814a30b89325875d0df (diff)
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 <>
Diffstat (limited to 'src/mesa/drivers/osmesa/')
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/drivers/osmesa/ b/src/mesa/drivers/osmesa/
index 9989c92620f..7c151bf705f 100644
--- a/src/mesa/drivers/osmesa/
+++ b/src/mesa/drivers/osmesa/
@@ -40,8 +40,7 @@ lib@OSMESA_LIB@_la_SOURCES = osmesa.c
lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@ -shared
$(top_builddir)/src/mesa/ \
- $(top_builddir)/src/mapi/glapi/ \
- $(top_builddir)/src/glsl/
+ $(top_builddir)/src/mapi/glapi/
# 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.