From e9dc58e8fd91d3bd0a414cc42aa7b7a8644f7248 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 25 Jul 2012 23:48:28 +0100 Subject: [PATCH] Fix static library build failures. --- src/mesa/drivers/osmesa/Makefile.am | 10 ++++++++-- src/mesa/drivers/x11/Makefile.am | 8 ++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am index 7c151bf..217d2bc 100644 --- a/src/mesa/drivers/osmesa/Makefile.am +++ b/src/mesa/drivers/osmesa/Makefile.am @@ -37,7 +37,7 @@ endif lib@OSMESA_LIB@_la_SOURCES = osmesa.c -lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@ -shared +lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@ #-shared lib@OSMESA_LIB@_la_LIBADD = \ $(top_builddir)/src/mesa/libmesa.la \ $(top_builddir)/src/mapi/glapi/libglapi.la @@ -46,4 +46,10 @@ lib@OSMESA_LIB@_la_LIBADD = \ # a while by putting a link to the driver into /lib of the build tree. all-local: lib@OSMESA_LIB@.la $(MKDIR_P) $(top_builddir)/$(LIB_DIR); - ln -f .libs/lib@OSMESA_LIB@.so $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so; + if test -f .libs/lib@OSMESA_LIB@.a; then \ + ln -f .libs/lib@OSMESA_LIB@.a $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.a; \ + else \ + ln -f .libs/lib@OSMESA_LIB@.so $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so; \ + fi + + diff --git a/src/mesa/drivers/x11/Makefile.am b/src/mesa/drivers/x11/Makefile.am index 726a9c6..fd48b220 100644 --- a/src/mesa/drivers/x11/Makefile.am +++ b/src/mesa/drivers/x11/Makefile.am @@ -70,5 +70,9 @@ endif # a while by putting a link to the driver into /lib of the build tree. all-local: lib@GL_LIB@.la $(MKDIR_P) $(top_builddir)/$(LIB_DIR); - ln -f .libs/lib@GL_LIB@.so.$(GL_MAJOR).$(GL_MINOR).$(GL_PATCH) $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so.$(GL_MAJOR) - ln -sf lib@GL_LIB@.so.$(GL_MAJOR) $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so + if test -f .libs/lib@GL_LIB@.a; then \ + ln -f .libs/lib@GL_LIB@.a $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.a; \ + else \ + ln -f .libs/lib@GL_LIB@.so.$(GL_MAJOR).$(GL_MINOR).$(GL_PATCH) $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so.1; \ + ln -sf lib@GL_LIB@.so.1 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so; \ + fi -- 1.7.10.4