summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2012-01-27 00:02:47 -0500
committerMatt Turner <[email protected]>2012-01-30 21:09:38 -0500
commit9947656168d09f9019600fccc42ca8e0de49b83a (patch)
tree5bbd368e7d613e3970581beb0c0f9fa5e2dbe026 /src/mesa
parentdfb6142548df0dccbe6eed2c57986e208eb0d437 (diff)
automake: src/glsl and src/glsl/glcpp
Reviewed-by: Eric Anholt <[email protected]> Tested-by: Eric Anholt <[email protected]> Signed-off-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/osmesa/Makefile.am2
-rw-r--r--src/mesa/sources.mak2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am
index 514e95d0013..e765d02e7c6 100644
--- a/src/mesa/drivers/osmesa/Makefile.am
+++ b/src/mesa/drivers/osmesa/Makefile.am
@@ -36,7 +36,7 @@ AM_CPPFLAGS = \
LIBADD = \
$(top_srcdir)/src/mesa/libmesa.a \
$(top_srcdir)/src/mapi/glapi/libglapi.a \
- $(top_srcdir)/src/glsl/libglsl.a \
+ $(top_srcdir)/src/glsl/libglsl.la \
$(OSMESA_LIB_DEPS)
if BUILD_SHARED
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index b57a10e4d1c..07688906faa 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -368,7 +368,7 @@ COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
### Other archives/libraries
GLSL_LIBS = \
- $(TOP)/src/glsl/libglsl.a
+ $(TOP)/src/glsl/libglsl.la
### Include directories