path: root/src/mesa/drivers/osmesa/
diff options
authorJon TURNEY <>2012-06-29 18:09:37 +0100
committerJon TURNEY <>2012-07-13 12:44:07 +0100
commitb2a37e242ea60fde6d616814a30b89325875d0df (patch)
treee1b3080f675b836e6d8eab38259f0354accb788e /src/mesa/drivers/osmesa/
parent1e48dfeee6007b87b45cb3817aa375aa46e9c249 (diff)
automake: convert libglapi
* "configure substitutions are not allowed in _SOURCES variables" in automake, so remove the AC_SUBST'ed GLAPI_ASM_SOURCES and instead use some AM_CONDITIONALS to choose which asm sources are used * Change GLAPI_LIB to point to the .la file in other files, and make a link to the .a file for the convenience of other Makefiles which have not yet been converted to automake v2: - Use AM_CPPFLAGS for cleaner build output - EXTRA_SOURCES is not needed - Remove libglapi.a compatibility link on clean 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, 1 deletions
diff --git a/src/mesa/drivers/osmesa/ b/src/mesa/drivers/osmesa/
index 6dadf4614fc..9989c92620f 100644
--- a/src/mesa/drivers/osmesa/
+++ b/src/mesa/drivers/osmesa/
@@ -40,7 +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/libglapi.a \
+ $(top_builddir)/src/mapi/glapi/ \
# Provide compatibility with scripts for the old Mesa build system for