From 49d7bcea8203a5e5398f3a10b3ac1e63d07128a0 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sun, 2 Mar 2014 21:10:57 +0000 Subject: [PATCH] gallium/targets: use install-gallium-targets.mk Signed-off-by: Emil Velikov Reviewed-by: Jon TURNEY --- 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 50a61222b9a..282fa6682f2 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 3753e8abd5c..7e84ffe1262 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 a94a518660c..20a52476842 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@OPENCL_LIBNAME@.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR) - ln -f .libs/lib@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 8e6aff6c0a6..beb9bbaa7da 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@OSMESA_LIB@.la - $(MKDIR_P) $(top_builddir)/$(LIB_DIR); - $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium; - ln -f .libs/lib@OSMESA_LIB@.so $(top_builddir)/$(LIB_DIR)/gallium/lib@OSMESA_LIB@.so; - ln -f .libs/lib@OSMESA_LIB@.so.@OSMESA_VERSION@ $(top_builddir)/$(LIB_DIR)/gallium/lib@OSMESA_LIB@.so.@OSMESA_VERSION@; - ln -f .libs/lib@OSMESA_LIB@.so.@OSMESA_VERSION@.0.0 $(top_builddir)/$(LIB_DIR)/gallium/ +include $(top_srcdir)/install-gallium-links.mk endif pkgconfigdir = $(libdir)/pkgconfig -- 2.30.2