diff options
| author | Emil Velikov <[email protected]> | 2014-03-02 20:13:54 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-03-11 12:50:42 +0000 |
| commit | 7b4ccad33dfb42e93d89ff60a33cc329c38b9dc7 (patch) | |
| tree | 47b47c82cfdaf55008b1926f42735be6a0a9cf4b /src | |
| parent | b496ab05677d8ffecca416d4f34ffb06435d9509 (diff) | |
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]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/egl/wayland/wayland-egl/Makefile.am | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/osmesa/Makefile.am | 8 | ||||
| -rw-r--r-- | 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 6e92b2960d8..c8d01967f08 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 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@[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 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@[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 |