[Mesa-dev] [PATCH 09/20] gallium/targets: use install-gallium-targets.mk

[Emil Velikov]

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/gallium/targets/egl-static/Makefile.am | 20 +-------------------
 src/gallium/targets/libgl-xlib/Makefile.am |  6 +-----
 src/gallium/targets/opencl/Makefile.am     |  6 +-----
 src/gallium/targets/osmesa/Makefile.am     |  9 +--------
 4 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
index 50a6122..282fa66 100644
--- a/src/gallium/targets/egl-static/Makefile.am
+++ b/src/gallium/targets/egl-static/Makefile.am
@@ -242,22 +242,4 @@ endif
 endif
 endif
 
-# 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.
-if HAVE_OPENGL
-if !HAVE_SHARED_GLAPI
-all-local: egl_gallium.la st_GL.la
-	$(MKDIR_P) $(top_builddir)/$(LIB_DIR)/egl
-	ln -f .libs/egl_gallium.so $(top_builddir)/$(LIB_DIR)/egl/egl_gallium.so
-	ln -f .libs/st_GL.so $(top_builddir)/$(LIB_DIR)/egl/st_GL.so
-else
-all-local: egl_gallium.la
-	$(MKDIR_P) $(top_builddir)/$(LIB_DIR)/egl
-	ln -f .libs/egl_gallium.so $(top_builddir)/$(LIB_DIR)/egl/egl_gallium.so
-
-endif
-else
-all-local: egl_gallium.la
-	$(MKDIR_P) $(top_builddir)/$(LIB_DIR)/egl
-	ln -f .libs/egl_gallium.so $(top_builddir)/$(LIB_DIR)/egl/egl_gallium.so
-endif
+include $(top_srcdir)/install-gallium-links.mk
diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am
index 3753e8a..7e84ffe 100644
--- a/src/gallium/targets/libgl-xlib/Makefile.am
+++ b/src/gallium/targets/libgl-xlib/Makefile.am
@@ -72,8 +72,4 @@ libGL_la_LINK = $(CXXLINK) $(libGL_la_LDFLAGS)
 nodist_EXTRA_libGL_la_SOURCES = dummy-c.c
 endif
 
-# 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: libGL.la
-	$(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
-	ln -f .libs/libGL.so* $(top_builddir)/$(LIB_DIR)/gallium/
+include $(top_srcdir)/install-gallium-links.mk
diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
index a94a518..20a5247 100644
--- a/src/gallium/targets/opencl/Makefile.am
+++ b/src/gallium/targets/opencl/Makefile.am
@@ -51,8 +51,4 @@ icddir = /etc/OpenCL/vendors/
 icd_DATA = mesa.icd
 endif
 
-# 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 at OPENCL_LIBNAME@.la
-	$(MKDIR_P) $(top_builddir)/$(LIB_DIR)
-	ln -f .libs/lib at OPENCL_LIBNAME@.so* $(top_builddir)/$(LIB_DIR)/
+include $(top_srcdir)/install-gallium-links.mk
diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am
index 8e6aff6..beb9bba 100644
--- a/src/gallium/targets/osmesa/Makefile.am
+++ b/src/gallium/targets/osmesa/Makefile.am
@@ -68,14 +68,7 @@ endif
 
 
 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 at OSMESA_LIB@.la
-	$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
-	$(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium;
-	ln -f .libs/lib at OSMESA_LIB@.so $(top_builddir)/$(LIB_DIR)/gallium/lib at OSMESA_LIB@.so;
-	ln -f .libs/lib at OSMESA_LIB@.so. at OSMESA_VERSION@ $(top_builddir)/$(LIB_DIR)/gallium/lib at OSMESA_LIB@.so. at OSMESA_VERSION@;
-	ln -f .libs/lib at OSMESA_LIB@.so. at OSMESA_VERSION@.0.0 $(top_builddir)/$(LIB_DIR)/gallium/
+include $(top_srcdir)/install-gallium-links.mk
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
-- 
1.9.0