summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/x11
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2012-06-29 18:09:37 +0100
committerJon TURNEY <jon.turney@dronecode.org.uk>2012-07-13 12:44:07 +0100
commitb2a37e242ea60fde6d616814a30b89325875d0df (patch)
treee1b3080f675b836e6d8eab38259f0354accb788e /src/mesa/drivers/x11
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 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: - Use AM_CPPFLAGS for cleaner build output - EXTRA_SOURCES is not needed - Remove libglapi.a compatibility link on clean Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Eric Anholt <eric@anholt.net> Tested-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/mesa/drivers/x11')
-rw-r--r--src/mesa/drivers/x11/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/x11/Makefile.am b/src/mesa/drivers/x11/Makefile.am
index 4948e8f9c7..52febbb8d1 100644
--- a/src/mesa/drivers/x11/Makefile.am
+++ b/src/mesa/drivers/x11/Makefile.am
@@ -57,7 +57,7 @@ GL_PATCH = 0
libGL_la_LIBADD = \
$(top_builddir)/src/mesa/libmesa.la \
- $(top_builddir)/src/mapi/glapi/libglapi.a
+ $(top_builddir)/src/mapi/glapi/libglapi.la
libGL_la_LDFLAGS = \
-version-number $(GL_MAJOR):$(GL_MINOR):$(GL_PATCH) \
$(GL_LIB_DEPS)