Module: Mesa Branch: master Commit: 7b4ccad33dfb42e93d89ff60a33cc329c38b9dc7 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7b4ccad33dfb42e93d89ff60a33cc329c38b9dc7
Author: Emil Velikov <[email protected]> Date: Sun Mar 2 20:13:54 2014 +0000 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 <[email protected]> Reviewed-by: Jon TURNEY <[email protected]> --- src/egl/wayland/wayland-egl/Makefile.am | 2 ++ src/mesa/drivers/osmesa/Makefile.am | 8 +------- src/mesa/drivers/x11/Makefile.am | 7 +------ 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/egl/wayland/wayland-egl/Makefile.am b/src/egl/wayland/wayland-egl/Makefile.am index 6e92b29..c8d0196 100644 --- a/src/egl/wayland/wayland-egl/Makefile.am +++ b/src/egl/wayland/wayland-egl/Makefile.am @@ -11,3 +11,5 @@ libwayland_egl_la_SOURCES = wayland-egl.c libwayland_egl_la_LDFLAGS = -version-info 1 TESTS = wayland-egl-symbols-check + +include $(top_srcdir)/install-lib-links.mk diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am index 4935335..2fdd6fd 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@[email protected] - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); - ln -f .libs/lib@[email protected] $(top_builddir)/$(LIB_DIR)/lib@[email protected]; - ln -f .libs/lib@[email protected].@OSMESA_VERSION@ $(top_builddir)/$(LIB_DIR)/lib@[email protected].@OSMESA_VERSION@; - ln -f .libs/lib@[email protected].@[email protected] $(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 32bd385..3f3a24b 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@[email protected] - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); - ln -f .libs/lib@[email protected].$(GL_MAJOR).$(GL_MINOR).$(GL_PATCH) $(top_builddir)/$(LIB_DIR)/lib@[email protected].$(GL_MAJOR) - ln -sf lib@[email protected].$(GL_MAJOR) $(top_builddir)/$(LIB_DIR)/lib@[email protected] +include $(top_srcdir)/install-lib-links.mk endif _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
