From 7b4ccad33dfb42e93d89ff60a33cc329c38b9dc7 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sun, 2 Mar 2014 20:13:54 +0000 Subject: automake: use install-lib-links.mk across all classic mesa Use the handy script and minimise the boilerplate in the makefiles. Signed-off-by: Emil Velikov Reviewed-by: Jon TURNEY --- src/mesa/drivers/osmesa/Makefile.am | 8 +------- src/mesa/drivers/x11/Makefile.am | 7 +------ 2 files changed, 2 insertions(+), 13 deletions(-) (limited to 'src/mesa') diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am index 4935335e291..2fdd6fd6be9 100644 --- a/src/mesa/drivers/osmesa/Makefile.am +++ b/src/mesa/drivers/osmesa/Makefile.am @@ -48,13 +48,7 @@ lib@OSMESA_LIB@_la_LIBADD = \ $(OSMESA_LIB_DEPS) if BUILD_SHARED -# Provide compatibility with scripts for the old Mesa build system for -# 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; - ln -f .libs/lib@OSMESA_LIB@.so.@OSMESA_VERSION@ $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so.@OSMESA_VERSION@; - ln -f .libs/lib@OSMESA_LIB@.so.@OSMESA_VERSION@.0.0 $(top_builddir)/$(LIB_DIR)/ +include $(top_srcdir)/install-lib-links.mk endif pkgconfigdir = $(libdir)/pkgconfig diff --git a/src/mesa/drivers/x11/Makefile.am b/src/mesa/drivers/x11/Makefile.am index 32bd385ec86..3f3a24b4eab 100644 --- a/src/mesa/drivers/x11/Makefile.am +++ b/src/mesa/drivers/x11/Makefile.am @@ -65,10 +65,5 @@ lib@GL_LIB@_la_LDFLAGS = \ $(GL_LIB_DEPS) if BUILD_SHARED -# Provide compatibility with scripts for the old Mesa build system for -# 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 +include $(top_srcdir)/install-lib-links.mk endif -- cgit v1.2.3