diff options
| author | Matt Turner <[email protected]> | 2012-01-31 21:33:07 -0500 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2012-01-31 21:33:07 -0500 |
| commit | 8c436b4ea670d4630767a742dac5aad14e18aef9 (patch) | |
| tree | 2277e45aa833a5008b3524b31fbe98c97a8753aa | |
| parent | f6cc4347de259f7e9834b5dbaac4d453e86757ef (diff) | |
Revert "Make sure libGL.so links with libglsl"
This reverts commit f53e7e981ef35ab64a084c8da6c67bd2d230fe33.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/mesa/sources.mak | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 0e03af756a3..8af24562646 100644 --- a/configure.ac +++ b/configure.ac @@ -401,7 +401,6 @@ GLESv1_CM_LIB_NAME='lib$(GLESv1_CM_LIB).'${LIB_EXTENSION} GLESv2_LIB_NAME='lib$(GLESv2_LIB).'${LIB_EXTENSION} VG_LIB_NAME='lib$(VG_LIB).'${LIB_EXTENSION} GLAPI_LIB_NAME='lib$(GLAPI_LIB).'${LIB_EXTENSION} -GLSL_LIB_NAME='libglsl.'${LIB_EXTENSION} GL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*' GLU_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLU_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*' @@ -421,7 +420,6 @@ AC_SUBST([GLESv1_CM_LIB_NAME]) AC_SUBST([GLESv2_LIB_NAME]) AC_SUBST([VG_LIB_NAME]) AC_SUBST([GLAPI_LIB_NAME]) -AC_SUBST([GLSL_LIB_NAME]) AC_SUBST([GL_LIB_GLOB]) AC_SUBST([GLU_LIB_GLOB]) diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak index aadbf41550a..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/.libs/$(GLSL_LIB_NAME) + $(TOP)/src/glsl/libglsl.la ### Include directories |