Mesa (master): Don't explicitly link libOsmesa with libmesa' s dependency libglsl

[Jon TURNEY]

Module: Mesa
Branch: master
Commit: 99728076ec1a8bd3feb0f23e41198d8d5e56d0c9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=99728076ec1a8bd3feb0f23e41198d8d5e56d0c9

Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Sun Jul  8 23:26:11 2012 +0100

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 <jon.turney at dronecode.org.uk>
Reviewed-by: Eric Anholt <eric at anholt.net>
Tested-by: Matt Turner <mattst88 at gmail.com>

---

 src/mesa/drivers/osmesa/Makefile.am |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am
index 9989c92..7c151bf 100644
--- a/src/mesa/drivers/osmesa/Makefile.am
+++ b/src/mesa/drivers/osmesa/Makefile.am
@@ -40,8 +40,7 @@ lib at OSMESA_LIB@_la_SOURCES = osmesa.c
 lib at OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@ -shared
 lib at 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.