path: root/src/mesa/drivers/osmesa/
diff options
authorJon TURNEY <>2012-07-07 00:51:52 +0100
committerJon TURNEY <>2012-07-13 12:43:58 +0100
commita112ca5d5f8504310bf157d440c859676aae7753 (patch)
tree2a8c019f4e9804aac52725eb5bc9e1b0dfe886fa /src/mesa/drivers/osmesa/
parent8676890018a94b475dd0bb7389f3b77f37e36fdb (diff)
automake: convert libmesa and libmesagallium
* "configure substitutions are not allowed in _SOURCES variables" in automake, so instead of MESA_ASM_FILES, use some AM_CONDITIONALS to choose which architecture's asm sources are used in libmesa_la_SOURCES. (Can't remove MESA_ASM_FILES autoconf variable as it's still used in sources.mak) * Update to link with 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: Remove stray -static from LDFLAGS v3: Remove .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 2c4ce2c33d2..6dadf4614fc 100644
--- a/src/mesa/drivers/osmesa/
+++ b/src/mesa/drivers/osmesa/
@@ -39,7 +39,7 @@ lib@OSMESA_LIB@_la_SOURCES = osmesa.c
lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@ -shared
- $(top_builddir)/src/mesa/libmesa.a \
+ $(top_builddir)/src/mesa/ \
$(top_builddir)/src/mapi/glapi/libglapi.a \