The symlinks for compatibility with old scripts assumes
sysv shared library versioning and breaks other systems.
For example OpenBSD uses sunos 4 style .so.major.minor
versioning so the targets with ln will fail.
Fixes bug 63269.
Signed-off-by: Jonathan Gray <j...@jsg.id.au>
---
src/egl/main/Makefile.am | 7 -------
src/gallium/targets/dri-freedreno/Makefile.am | 6 ------
src/gallium/targets/dri-i915/Makefile.am | 6 ------
src/gallium/targets/dri-ilo/Makefile.am | 7 -------
src/gallium/targets/dri-nouveau/Makefile.am | 6 ------
src/gallium/targets/dri-r300/Makefile.am | 6 ------
src/gallium/targets/dri-r600/Makefile.am | 6 ------
src/gallium/targets/dri-radeonsi/Makefile.am | 6 ------
src/gallium/targets/dri-swrast/Makefile.am | 6 ------
src/gallium/targets/dri-vmwgfx/Makefile.am | 6 ------
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 | 11 -----------
src/gallium/targets/vdpau-nouveau/Makefile.am | 6 ------
src/gallium/targets/vdpau-r300/Makefile.am | 6 ------
src/gallium/targets/vdpau-r600/Makefile.am | 6 ------
src/gallium/targets/vdpau-radeonsi/Makefile.am | 6 ------
src/gallium/targets/vdpau-softpipe/Makefile.am | 6 ------
src/gallium/targets/xa-vmwgfx/Makefile.am | 6 ------
src/gallium/targets/xorg-i915/Makefile.am | 6 ------
src/gallium/targets/xorg-nouveau/Makefile.am | 6 ------
src/gallium/targets/xorg-r600/Makefile.am | 6 ------
src/gallium/targets/xorg-radeonsi/Makefile.am | 6 ------
src/gallium/targets/xvmc-nouveau/Makefile.am | 6 ------
src/gallium/targets/xvmc-r300/Makefile.am | 6 ------
src/gallium/targets/xvmc-r600/Makefile.am | 6 ------
src/gallium/targets/xvmc-softpipe/Makefile.am | 6 ------
src/gbm/Makefile.am | 4 ----
src/glx/Makefile.am | 7 -------
src/mapi/es1api/Makefile.am | 8 --------
src/mapi/es2api/Makefile.am | 8 --------
src/mapi/shared-glapi/Makefile.am | 6 ------
src/mapi/vgapi/Makefile.am | 8 --------
src/mesa/drivers/dri/i915/Makefile.am | 6 ------
src/mesa/drivers/dri/i965/Makefile.am | 6 ------
src/mesa/drivers/dri/nouveau/Makefile.am | 6 ------
src/mesa/drivers/dri/r200/Makefile.am | 6 ------
src/mesa/drivers/dri/radeon/Makefile.am | 6 ------
src/mesa/drivers/dri/swrast/Makefile.am | 6 ------
src/mesa/drivers/osmesa/Makefile.am | 9 ---------
src/mesa/drivers/x11/Makefile.am | 9 ---------
src/mesa/libdricore/Makefile.am | 7 -------
43 files changed, 291 deletions(-)
diff --git src/egl/main/Makefile.am src/egl/main/Makefile.am
index ca5257a..61192d6 100644
--- src/egl/main/Makefile.am
+++ src/egl/main/Makefile.am
@@ -116,13 +116,6 @@ libEGL_la_LIBADD += ../drivers/dri2/libegl_dri2.la
libEGL_la_LIBADD += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) $(LIBDRM_LIBS)
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: libEGL.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
- ln -f .libs/libEGL.so.1.0.0 $(top_builddir)/$(LIB_DIR)/libEGL.so.1
- ln -sf libEGL.so.1 $(top_builddir)/$(LIB_DIR)/libEGL.so
-
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = egl.pc
diff --git src/gallium/targets/dri-freedreno/Makefile.am
src/gallium/targets/dri-freedreno/Makefile.am
index cfa1f37..b39723e 100644
--- src/gallium/targets/dri-freedreno/Makefile.am
+++ src/gallium/targets/dri-freedreno/Makefile.am
@@ -65,9 +65,3 @@ if HAVE_MESA_LLVM
kgsl_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
kgsl_dri_la_LIBADD += $(LLVM_LIBS)
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: kgsl_dri.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/kgsl_dri.so $(top_builddir)/$(LIB_DIR)/gallium/kgsl_dri.so
diff --git src/gallium/targets/dri-i915/Makefile.am
src/gallium/targets/dri-i915/Makefile.am
index ce6be78..818d340 100644
--- src/gallium/targets/dri-i915/Makefile.am
+++ src/gallium/targets/dri-i915/Makefile.am
@@ -68,9 +68,3 @@ if HAVE_MESA_LLVM
AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
i915_dri_la_LIBADD +=
$(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
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: i915_dri.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/i915_dri.so $(top_builddir)/$(LIB_DIR)/gallium/i915_dri.so
diff --git src/gallium/targets/dri-ilo/Makefile.am
src/gallium/targets/dri-ilo/Makefile.am
index 7761f33..8cf08e4 100644
--- src/gallium/targets/dri-ilo/Makefile.am
+++ src/gallium/targets/dri-ilo/Makefile.am
@@ -68,10 +68,3 @@ if HAVE_MESA_LLVM
ilo_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
ilo_dri_la_LIBADD += $(LLVM_LIBS)
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: ilo_dri.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/ilo_dri.so $(top_builddir)/$(LIB_DIR)/gallium/ilo_dri.so
- ln -sf ilo_dri.so $(top_builddir)/$(LIB_DIR)/gallium/i965_dri.so
diff --git src/gallium/targets/dri-nouveau/Makefile.am
src/gallium/targets/dri-nouveau/Makefile.am
index 69ccf32..37613e4 100644
--- src/gallium/targets/dri-nouveau/Makefile.am
+++ src/gallium/targets/dri-nouveau/Makefile.am
@@ -66,9 +66,3 @@ if HAVE_MESA_LLVM
nouveau_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
nouveau_dri_la_LIBADD += $(LLVM_LIBS)
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: nouveau_dri.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/nouveau_dri.so
$(top_builddir)/$(LIB_DIR)/gallium/nouveau_dri.so
diff --git src/gallium/targets/dri-r300/Makefile.am
src/gallium/targets/dri-r300/Makefile.am
index 8c0215d..5438df1 100644
--- src/gallium/targets/dri-r300/Makefile.am
+++ src/gallium/targets/dri-r300/Makefile.am
@@ -64,9 +64,3 @@ if HAVE_MESA_LLVM
r300_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
r300_dri_la_LIBADD += $(LLVM_LIBS)
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: r300_dri.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/r300_dri.so $(top_builddir)/$(LIB_DIR)/gallium/r300_dri.so
diff --git src/gallium/targets/dri-r600/Makefile.am
src/gallium/targets/dri-r600/Makefile.am
index 2b3524b..6b7c36b 100644
--- src/gallium/targets/dri-r600/Makefile.am
+++ src/gallium/targets/dri-r600/Makefile.am
@@ -66,9 +66,3 @@ if HAVE_MESA_LLVM
r600_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
r600_dri_la_LIBADD += $(LLVM_LIBS)
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: r600_dri.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/r600_dri.so $(top_builddir)/$(LIB_DIR)/gallium/r600_dri.so
diff --git src/gallium/targets/dri-radeonsi/Makefile.am
src/gallium/targets/dri-radeonsi/Makefile.am
index f7d87a6..f2dee1d 100644
--- src/gallium/targets/dri-radeonsi/Makefile.am
+++ src/gallium/targets/dri-radeonsi/Makefile.am
@@ -64,9 +64,3 @@ if HAVE_MESA_LLVM
radeonsi_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
radeonsi_dri_la_LIBADD += $(LLVM_LIBS)
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: radeonsi_dri.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/radeonsi_dri.so
$(top_builddir)/$(LIB_DIR)/gallium/radeonsi_dri.so
diff --git src/gallium/targets/dri-swrast/Makefile.am
src/gallium/targets/dri-swrast/Makefile.am
index 1104379..0324324 100644
--- src/gallium/targets/dri-swrast/Makefile.am
+++ src/gallium/targets/dri-swrast/Makefile.am
@@ -65,9 +65,3 @@ AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
swrast_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
swrast_dri_la_LIBADD +=
$(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
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: swrast_dri.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/swrast_dri.so
$(top_builddir)/$(LIB_DIR)/gallium/swrast_dri.so
diff --git src/gallium/targets/dri-vmwgfx/Makefile.am
src/gallium/targets/dri-vmwgfx/Makefile.am
index ca7df65..f0367c9 100644
--- src/gallium/targets/dri-vmwgfx/Makefile.am
+++ src/gallium/targets/dri-vmwgfx/Makefile.am
@@ -66,9 +66,3 @@ if HAVE_MESA_LLVM
vmwgfx_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
vmwgfx_dri_la_LIBADD += $(LLVM_LIBS)
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: vmwgfx_dri.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/vmwgfx_dri.so
$(top_builddir)/$(LIB_DIR)/gallium/vmwgfx_dri.so
diff --git src/gallium/targets/egl-static/Makefile.am
src/gallium/targets/egl-static/Makefile.am
index e5bf7fc..228a546 100644
--- src/gallium/targets/egl-static/Makefile.am
+++ src/gallium/targets/egl-static/Makefile.am
@@ -241,23 +241,3 @@ st_GL_la_LDFLAGS += $(LLVM_LDFLAGS)
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
diff --git src/gallium/targets/libgl-xlib/Makefile.am
src/gallium/targets/libgl-xlib/Makefile.am
index cca0da4..4817766 100644
--- src/gallium/targets/libgl-xlib/Makefile.am
+++ src/gallium/targets/libgl-xlib/Makefile.am
@@ -70,9 +70,3 @@ libGL_la_LINK = $(CXXLINK) $(libGL_la_LDFLAGS)
# Mention a dummy pure C file to trigger generation of the $(LINK) variable
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/
diff --git src/gallium/targets/opencl/Makefile.am
src/gallium/targets/opencl/Makefile.am
index 46bb29f..6eedca3 100644
--- src/gallium/targets/opencl/Makefile.am
+++ src/gallium/targets/opencl/Makefile.am
@@ -33,9 +33,3 @@ libOpenCL_la_SOURCES =
# Force usage of a C++ linker
nodist_EXTRA_libOpenCL_la_SOURCES = dummy.cpp
-
-# 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: libOpenCL.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)
- ln -f .libs/libOpenCL.so* $(top_builddir)/$(LIB_DIR)/
diff --git src/gallium/targets/osmesa/Makefile.am
src/gallium/targets/osmesa/Makefile.am
index e187a47..fe2a1f5 100644
--- src/gallium/targets/osmesa/Makefile.am
+++ src/gallium/targets/osmesa/Makefile.am
@@ -75,17 +75,6 @@ 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@;
- cp .libs/lib@OSMESA_LIB@.so.@OSMESA_VERSION@.0.0
$(top_builddir)/$(LIB_DIR)/gallium/
-endif
-
# XXX fix-up?
#pkgconfigdir = $(libdir)/pkgconfig
#pkgconfig_DATA = osmesa.pc
diff --git src/gallium/targets/vdpau-nouveau/Makefile.am
src/gallium/targets/vdpau-nouveau/Makefile.am
index 05c29e4..86a8e6a 100644
--- src/gallium/targets/vdpau-nouveau/Makefile.am
+++ src/gallium/targets/vdpau-nouveau/Makefile.am
@@ -62,9 +62,3 @@ if HAVE_MESA_LLVM
libvdpau_nouveau_la_LDFLAGS += $(LLVM_LDFLAGS)
libvdpau_nouveau_la_LIBADD += $(LLVM_LIBS)
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: libvdpau_nouveau.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/libvdpau_nouveau.so* $(top_builddir)/$(LIB_DIR)/gallium/
diff --git src/gallium/targets/vdpau-r300/Makefile.am
src/gallium/targets/vdpau-r300/Makefile.am
index 350f6f8..d28c4a7 100644
--- src/gallium/targets/vdpau-r300/Makefile.am
+++ src/gallium/targets/vdpau-r300/Makefile.am
@@ -62,9 +62,3 @@ if HAVE_MESA_LLVM
libvdpau_r300_la_LDFLAGS += $(LLVM_LDFLAGS)
libvdpau_r300_la_LIBADD += $(LLVM_LIBS)
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: libvdpau_r300.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/libvdpau_r300.so* $(top_builddir)/$(LIB_DIR)/gallium/
diff --git src/gallium/targets/vdpau-r600/Makefile.am
src/gallium/targets/vdpau-r600/Makefile.am
index f6b82de..4ce2d66 100644
--- src/gallium/targets/vdpau-r600/Makefile.am
+++ src/gallium/targets/vdpau-r600/Makefile.am
@@ -66,9 +66,3 @@ libvdpau_r600_la_LINK = $(LINK) $(libvdpau_r600_la_LDFLAGS)
# Mention a dummy pure C file to trigger generation of the $(LINK) variable
nodist_EXTRA_libvdpau_r600_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: libvdpau_r600.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/libvdpau_r600.so* $(top_builddir)/$(LIB_DIR)/gallium/
diff --git src/gallium/targets/vdpau-radeonsi/Makefile.am
src/gallium/targets/vdpau-radeonsi/Makefile.am
index beae309..a84fbd4 100644
--- src/gallium/targets/vdpau-radeonsi/Makefile.am
+++ src/gallium/targets/vdpau-radeonsi/Makefile.am
@@ -61,9 +61,3 @@ if HAVE_MESA_LLVM
libvdpau_radeonsi_la_LDFLAGS += $(LLVM_LDFLAGS)
libvdpau_radeonsi_la_LIBADD += $(LLVM_LIBS)
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: libvdpau_radeonsi.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/libvdpau_radeonsi.so* $(top_builddir)/$(LIB_DIR)/gallium/
diff --git src/gallium/targets/vdpau-softpipe/Makefile.am
src/gallium/targets/vdpau-softpipe/Makefile.am
index 7bde2f8..a0fb7dd 100644
--- src/gallium/targets/vdpau-softpipe/Makefile.am
+++ src/gallium/targets/vdpau-softpipe/Makefile.am
@@ -64,9 +64,3 @@ libvdpau_softpipe_la_LINK = $(LINK)
$(libvdpau_softpipe_la_LDFLAGS)
# Mention a dummy pure C file to trigger generation of the $(LINK) variable
nodist_EXTRA_libvdpau_softpipe_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: libvdpau_softpipe.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/libvdpau_softpipe.so* $(top_builddir)/$(LIB_DIR)/gallium/
diff --git src/gallium/targets/xa-vmwgfx/Makefile.am
src/gallium/targets/xa-vmwgfx/Makefile.am
index 6fe0510..2b9ef21 100644
--- src/gallium/targets/xa-vmwgfx/Makefile.am
+++ src/gallium/targets/xa-vmwgfx/Makefile.am
@@ -53,9 +53,3 @@ if HAVE_MESA_LLVM
libxatracker_la_LDFLAGS += $(LLVM_LDFLAGS)
libxatracker_la_LIBADD += $(LLVM_LIBS)
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: libxatracker.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/libxatracker.so* $(top_builddir)/$(LIB_DIR)/gallium/
diff --git src/gallium/targets/xorg-i915/Makefile.am
src/gallium/targets/xorg-i915/Makefile.am
index ed2ab8a..e2cbe13 100644
--- src/gallium/targets/xorg-i915/Makefile.am
+++ src/gallium/targets/xorg-i915/Makefile.am
@@ -68,9 +68,3 @@ i915_drv_la_LINK = $(LINK) $(i915_drv_la_LDFLAGS)
# Mention a dummy pure C file to trigger generation of the $(LINK) variable
nodist_EXTRA_i915_drv_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: i915_drv.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/i915_drv.so $(top_builddir)/$(LIB_DIR)/gallium/i915_drv.so
diff --git src/gallium/targets/xorg-nouveau/Makefile.am
src/gallium/targets/xorg-nouveau/Makefile.am
index 70c0bd6..8b2e9b5 100644
--- src/gallium/targets/xorg-nouveau/Makefile.am
+++ src/gallium/targets/xorg-nouveau/Makefile.am
@@ -63,9 +63,3 @@ AM_CFLAGS += $(LLVM_CFLAGS)
nouveau2_drv_la_LDFLAGS += $(LLVM_LDFLAGS)
nouveau2_drv_la_LIBADD += $(LLVM_LIBS)
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: nouveau2_drv.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/nouveau2_drv.so
$(top_builddir)/$(LIB_DIR)/gallium/nouveau2_drv.so
diff --git src/gallium/targets/xorg-r600/Makefile.am
src/gallium/targets/xorg-r600/Makefile.am
index 1a21655..dbd4d4d 100644
--- src/gallium/targets/xorg-r600/Makefile.am
+++ src/gallium/targets/xorg-r600/Makefile.am
@@ -68,9 +68,3 @@ r600g_drv_la_LINK = $(LINK) $(r600g_drv_la_LDFLAGS)
# Mention a dummy pure C file to trigger generation of the $(LINK) variable
nodist_EXTRA_r600g_drv_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: r600g_drv.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/r600g_drv.so $(top_builddir)/$(LIB_DIR)/gallium/r600g_drv.so
diff --git src/gallium/targets/xorg-radeonsi/Makefile.am
src/gallium/targets/xorg-radeonsi/Makefile.am
index 5ca1056..a2d40b1 100644
--- src/gallium/targets/xorg-radeonsi/Makefile.am
+++ src/gallium/targets/xorg-radeonsi/Makefile.am
@@ -62,9 +62,3 @@ AM_CFLAGS += $(LLVM_CFLAGS)
radeonsi_drv_la_LDFLAGS += $(LLVM_LDFLAGS)
radeonsi_drv_la_LIBADD += $(LLVM_LIBS)
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: radeonsi_drv.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/radeonsi_drv.so
$(top_builddir)/$(LIB_DIR)/gallium/radeonsi_drv.so
diff --git src/gallium/targets/xvmc-nouveau/Makefile.am
src/gallium/targets/xvmc-nouveau/Makefile.am
index 9931802..ee6c9fb 100644
--- src/gallium/targets/xvmc-nouveau/Makefile.am
+++ src/gallium/targets/xvmc-nouveau/Makefile.am
@@ -61,9 +61,3 @@ if HAVE_MESA_LLVM
libXvMCnouveau_la_LDFLAGS += $(LLVM_LDFLAGS)
libXvMCnouveau_la_LIBADD += $(LLVM_LIBS)
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: libXvMCnouveau.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/libXvMCnouveau.so* $(top_builddir)/$(LIB_DIR)/gallium/
diff --git src/gallium/targets/xvmc-r300/Makefile.am
src/gallium/targets/xvmc-r300/Makefile.am
index 4346b68..42f6383 100644
--- src/gallium/targets/xvmc-r300/Makefile.am
+++ src/gallium/targets/xvmc-r300/Makefile.am
@@ -60,9 +60,3 @@ if HAVE_MESA_LLVM
libXvMCr300_la_LDFLAGS += $(LLVM_LDFLAGS)
libXvMCr300_la_LIBADD += $(LLVM_LIBS)
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: libXvMCr300.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/libXvMCr300.so* $(top_builddir)/$(LIB_DIR)/gallium/
diff --git src/gallium/targets/xvmc-r600/Makefile.am
src/gallium/targets/xvmc-r600/Makefile.am
index b337c7e..70c7a49 100644
--- src/gallium/targets/xvmc-r600/Makefile.am
+++ src/gallium/targets/xvmc-r600/Makefile.am
@@ -66,9 +66,3 @@ libXvMCr600_la_LINK = $(LINK) $(libXvMCr600_la_LDFLAGS)
# Mention a dummy pure C file to trigger generation of the $(LINK) variable
nodist_EXTRA_libXvMCr600_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: libXvMCr600.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/libXvMCr600.so* $(top_builddir)/$(LIB_DIR)/gallium/
diff --git src/gallium/targets/xvmc-softpipe/Makefile.am
src/gallium/targets/xvmc-softpipe/Makefile.am
index eea6700..5482ce4 100644
--- src/gallium/targets/xvmc-softpipe/Makefile.am
+++ src/gallium/targets/xvmc-softpipe/Makefile.am
@@ -64,9 +64,3 @@ libXvMCsoftpipe_la_LINK = $(LINK)
$(libXvMCsoftpipe_la_LDFLAGS)
# Mention a dummy pure C file to trigger generation of the $(LINK) variable
nodist_EXTRA_libXvMCsoftpipe_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: libXvMCsoftpipe.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
- ln -f .libs/libXvMCsoftpipe.so* $(top_builddir)/$(LIB_DIR)/gallium/
diff --git src/gbm/Makefile.am src/gbm/Makefile.am
index e22c55c..055e6e6 100644
--- src/gbm/Makefile.am
+++ src/gbm/Makefile.am
@@ -40,7 +40,3 @@ libgbm_dri_la_CFLAGS = \
libgbm_la_LIBADD += \
libgbm_dri.la $(top_builddir)/src/mapi/shared-glapi/libglapi.la
endif
-
-all-local: libgbm.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
- ln -f .libs/libgbm.so.1.0.0 $(top_builddir)/$(LIB_DIR)/libgbm.so
diff --git src/glx/Makefile.am src/glx/Makefile.am
index f01709b..0c30cd0 100644
--- src/glx/Makefile.am
+++ src/glx/Makefile.am
@@ -107,10 +107,3 @@ GL_LDFLAGS = \
lib@GL_LIB@_la_SOURCES =
lib@GL_LIB@_la_LIBADD = $(GL_LIBS)
lib@GL_LIB@_la_LDFLAGS = $(GL_LDFLAGS)
-
-# 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.1.2.0
$(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so.1
- ln -sf lib@GL_LIB@.so.1 $(top_builddir)/$(LIB_DIR)/lib@GL_LIB@.so
diff --git src/mapi/es1api/Makefile.am src/mapi/es1api/Makefile.am
index eb98f16..4cbbd06 100644
--- src/mapi/es1api/Makefile.am
+++ src/mapi/es1api/Makefile.am
@@ -56,11 +56,3 @@ glapi_mapi_tmp.h: ../glapi/gen/gl_and_es_API.xml
$(glapi_gen_mapi_deps)
BUILT_SOURCES = glapi_mapi_tmp.h
CLEANFILES = $(BUILT_SOURCES)
-
-# 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: libGLESv1_CM.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
- ln -f .libs/libGLESv1_CM.so $(top_builddir)/$(LIB_DIR)/libGLESv1_CM.so
- ln -f .libs/libGLESv1_CM.so.1
$(top_builddir)/$(LIB_DIR)/libGLESv1_CM.so.1
- ln -f .libs/libGLESv1_CM.so.1.1.0
$(top_builddir)/$(LIB_DIR)/libGLESv1_CM.so.1.1.0
diff --git src/mapi/es2api/Makefile.am src/mapi/es2api/Makefile.am
index c6b0ca4..3209c93 100644
--- src/mapi/es2api/Makefile.am
+++ src/mapi/es2api/Makefile.am
@@ -60,11 +60,3 @@ glapi_mapi_tmp.h: ../glapi/gen/gl_and_es_API.xml
$(glapi_gen_mapi_deps)
BUILT_SOURCES = glapi_mapi_tmp.h
CLEANFILES = $(BUILT_SOURCES)
-
-# 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: libGLESv2.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
- ln -f .libs/libGLESv2.so $(top_builddir)/$(LIB_DIR)/libGLESv2.so
- ln -f .libs/libGLESv2.so.2 $(top_builddir)/$(LIB_DIR)/libGLESv2.so.2
- ln -f .libs/libGLESv2.so.2.0.0
$(top_builddir)/$(LIB_DIR)/libGLESv2.so.2.0.0
diff --git src/mapi/shared-glapi/Makefile.am src/mapi/shared-glapi/Makefile.am
index 2021a73..c387611 100644
--- src/mapi/shared-glapi/Makefile.am
+++ src/mapi/shared-glapi/Makefile.am
@@ -24,9 +24,3 @@ AM_CPPFLAGS =
\
-I$(top_builddir)/src/mapi \
-DMAPI_MODE_GLAPI \
-DMAPI_ABI_HEADER=\"shared-glapi/glapi_mapi_tmp.h\"
-
-all-local: libglapi.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR)
- ln -f .libs/libglapi.so.0.0.0
$(top_builddir)/$(LIB_DIR)/libglapi.so.0.0.0
- ln -sf libglapi.so.0.0.0 $(top_builddir)/$(LIB_DIR)/libglapi.so.0
- ln -sf libglapi.so.0 $(top_builddir)/$(LIB_DIR)/libglapi.so
diff --git src/mapi/vgapi/Makefile.am src/mapi/vgapi/Makefile.am
index 0af7115..0afa499 100644
--- src/mapi/vgapi/Makefile.am
+++ src/mapi/vgapi/Makefile.am
@@ -51,11 +51,3 @@ vgapi_tmp.h: $(srcdir)/vgapi.csv
$(top_srcdir)/src/mapi/mapi_abi.py
BUILT_SOURCES = vgapi_tmp.h
CLEANFILES = $(BUILT_SOURCES)
-
-# 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: libOpenVG.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
- ln -f .libs/libOpenVG.so $(top_builddir)/$(LIB_DIR)/libOpenVG.so
- ln -f .libs/libOpenVG.so.1 $(top_builddir)/$(LIB_DIR)/libOpenVG.so.1
- ln -f .libs/libOpenVG.so.1.0.0
$(top_builddir)/$(LIB_DIR)/libOpenVG.so.1.0.0
diff --git src/mesa/drivers/dri/i915/Makefile.am
src/mesa/drivers/dri/i915/Makefile.am
index 9501719..f8c62f3 100644
--- src/mesa/drivers/dri/i915/Makefile.am
+++ src/mesa/drivers/dri/i915/Makefile.am
@@ -59,9 +59,3 @@ i915_dri_la_LIBADD = \
../common/libdricommon.la \
$(DRI_LIB_DEPS) \
$(INTEL_LIBS)
-
-# 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: i915_dri.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
- ln -f .libs/i915_dri.so $(top_builddir)/$(LIB_DIR)/i915_dri.so;
diff --git src/mesa/drivers/dri/i965/Makefile.am
src/mesa/drivers/dri/i965/Makefile.am
index 32b041a..316b6a2 100644
--- src/mesa/drivers/dri/i965/Makefile.am
+++ src/mesa/drivers/dri/i965/Makefile.am
@@ -91,10 +91,4 @@ test_eu_compact_SOURCES = \
nodist_EXTRA_test_eu_compact_SOURCES = dummy.cpp
test_eu_compact_LDADD = $(TEST_LIBS)
-# 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: i965_dri.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
- ln -f .libs/i965_dri.so $(top_builddir)/$(LIB_DIR)/i965_dri.so;
-
endif
diff --git src/mesa/drivers/dri/nouveau/Makefile.am
src/mesa/drivers/dri/nouveau/Makefile.am
index 2b47f75..edea8e0 100644
--- src/mesa/drivers/dri/nouveau/Makefile.am
+++ src/mesa/drivers/dri/nouveau/Makefile.am
@@ -47,9 +47,3 @@ nouveau_vieux_dri_la_LIBADD = \
../common/libdricommon.la \
$(DRI_LIB_DEPS) \
$(NOUVEAU_LIBS)
-
-# 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: nouveau_vieux_dri.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
- ln -f .libs/nouveau_vieux_dri.so
$(top_builddir)/$(LIB_DIR)/nouveau_vieux_dri.so;
diff --git src/mesa/drivers/dri/r200/Makefile.am
src/mesa/drivers/dri/r200/Makefile.am
index 4357922..87d0d8b 100644
--- src/mesa/drivers/dri/r200/Makefile.am
+++ src/mesa/drivers/dri/r200/Makefile.am
@@ -50,9 +50,3 @@ r200_dri_la_LIBADD = \
../common/libdricommon.la \
$(DRI_LIB_DEPS) \
$(RADEON_LIBS)
-
-# 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: r200_dri.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
- ln -f .libs/r200_dri.so $(top_builddir)/$(LIB_DIR)/r200_dri.so;
diff --git src/mesa/drivers/dri/radeon/Makefile.am
src/mesa/drivers/dri/radeon/Makefile.am
index 43de059..c0ce08c 100644
--- src/mesa/drivers/dri/radeon/Makefile.am
+++ src/mesa/drivers/dri/radeon/Makefile.am
@@ -50,9 +50,3 @@ radeon_dri_la_LIBADD = \
../common/libdricommon.la \
$(DRI_LIB_DEPS) \
$(RADEON_LIBS)
-
-# 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: radeon_dri.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
- ln -f .libs/radeon_dri.so $(top_builddir)/$(LIB_DIR)/radeon_dri.so;
diff --git src/mesa/drivers/dri/swrast/Makefile.am
src/mesa/drivers/dri/swrast/Makefile.am
index d3da196..d7e94b2 100644
--- src/mesa/drivers/dri/swrast/Makefile.am
+++ src/mesa/drivers/dri/swrast/Makefile.am
@@ -45,9 +45,3 @@ swrast_dri_la_SOURCES = \
swrast_dri_la_LDFLAGS = -module -avoid-version -shared
swrast_dri_la_LIBADD = \
$(DRI_LIB_DEPS)
-
-# 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: swrast_dri.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
- ln -f .libs/swrast_dri.so $(top_builddir)/$(LIB_DIR)/swrast_dri.so;
diff --git src/mesa/drivers/osmesa/Makefile.am
src/mesa/drivers/osmesa/Makefile.am
index 082c294..364cae1 100644
--- src/mesa/drivers/osmesa/Makefile.am
+++ src/mesa/drivers/osmesa/Makefile.am
@@ -49,14 +49,5 @@ lib@OSMESA_LIB@_la_LIBADD = \
$(GLAPI_LIB) \
$(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@;
-endif
-
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = osmesa.pc
diff --git src/mesa/drivers/x11/Makefile.am src/mesa/drivers/x11/Makefile.am
index 32bd385..0041494 100644
--- src/mesa/drivers/x11/Makefile.am
+++ src/mesa/drivers/x11/Makefile.am
@@ -63,12 +63,3 @@ lib@GL_LIB@_la_LDFLAGS = \
-version-number $(GL_MAJOR):$(GL_MINOR):$(GL_PATCH) \
-no-undefined \
$(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
-endif
diff --git src/mesa/libdricore/Makefile.am src/mesa/libdricore/Makefile.am
index 56ceeb7..0521ac8 100644
--- src/mesa/libdricore/Makefile.am
+++ src/mesa/libdricore/Makefile.am
@@ -66,13 +66,6 @@ endif
if HAVE_DRI
lib_LTLIBRARIES = libdricore@VERSION@.la
-
-# 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: libdricore@VERSION@.la
- $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
- ln -f .libs/libdricore@VERSION@.so.1.0.0
$(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so.1;
- ln -sf libdricore@VERSION@.so.1
$(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so
endif
CLEANFILES = \
--
1.8.3.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
