diff options
| author | Jon TURNEY <[email protected]> | 2012-07-07 00:51:52 +0100 |
|---|---|---|
| committer | Jon TURNEY <[email protected]> | 2012-07-13 12:43:58 +0100 |
| commit | a112ca5d5f8504310bf157d440c859676aae7753 (patch) | |
| tree | 2a8c019f4e9804aac52725eb5bc9e1b0dfe886fa /src/mesa/drivers | |
| parent | 8676890018a94b475dd0bb7389f3b77f37e36fdb (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 Makefile.am 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 <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Tested-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/osmesa/Makefile.am | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am index 2c4ce2c33d2..6dadf4614fc 100644 --- a/src/mesa/drivers/osmesa/Makefile.am +++ b/src/mesa/drivers/osmesa/Makefile.am @@ -39,7 +39,7 @@ lib@OSMESA_LIB@_la_SOURCES = osmesa.c lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@ -shared lib@OSMESA_LIB@_la_LIBADD = \ - $(top_builddir)/src/mesa/libmesa.a \ + $(top_builddir)/src/mesa/libmesa.la \ $(top_builddir)/src/mapi/glapi/libglapi.a \ $(top_builddir)/src/glsl/libglsl.la diff --git a/src/mesa/drivers/x11/Makefile.am b/src/mesa/drivers/x11/Makefile.am index cced2388491..4948e8f9c76 100644 --- a/src/mesa/drivers/x11/Makefile.am +++ b/src/mesa/drivers/x11/Makefile.am @@ -56,7 +56,7 @@ GL_MINOR = 6 GL_PATCH = 0 libGL_la_LIBADD = \ - $(top_builddir)/src/mesa/libmesa.a \ + $(top_builddir)/src/mesa/libmesa.la \ $(top_builddir)/src/mapi/glapi/libglapi.a libGL_la_LDFLAGS = \ -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_PATCH) \ |