[Mesa-dev] [PATCH 15/21] vdpau, xvmc: Add install-data-hooks to remove unneccessary symlinks.

[Johannes Obermayr]

libvdpau_*.so.1 and libXvMC*.so libs are dlopened by wrappers.
So only those libs should be installed.
---
 src/gallium/targets/vdpau-nouveau/Makefile.am  | 5 +++++
 src/gallium/targets/vdpau-r300/Makefile.am     | 5 +++++
 src/gallium/targets/vdpau-r600/Makefile.am     | 5 +++++
 src/gallium/targets/vdpau-radeonsi/Makefile.am | 5 +++++
 src/gallium/targets/vdpau-softpipe/Makefile.am | 5 +++++
 src/gallium/targets/xvmc-nouveau/Makefile.am   | 5 +++++
 src/gallium/targets/xvmc-r300/Makefile.am      | 5 +++++
 src/gallium/targets/xvmc-r600/Makefile.am      | 5 +++++
 src/gallium/targets/xvmc-softpipe/Makefile.am  | 5 +++++
 9 files changed, 45 insertions(+)

diff --git a/src/gallium/targets/vdpau-nouveau/Makefile.am b/src/gallium/targets/vdpau-nouveau/Makefile.am
index e9c4d33..e6ac32d 100644
--- a/src/gallium/targets/vdpau-nouveau/Makefile.am
+++ b/src/gallium/targets/vdpau-nouveau/Makefile.am
@@ -54,3 +54,8 @@ libvdpau_nouveau_la_LIBADD = \
 	$(VDPAU_LIBS) \
 	$(LIBDRM_LIBS) \
 	$(NOUVEAU_LIBS)
+
+install-data-hook:
+	mv $(DESTDIR)$(vdpaudir)/libvdpau_nouveau.so.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \
+	$(DESTDIR)$(vdpaudir)/libvdpau_nouveau.so.$(VDPAU_MAJOR) && \
+	rm -f $(DESTDIR)$(vdpaudir)/libvdpau_nouveau.so
diff --git a/src/gallium/targets/vdpau-r300/Makefile.am b/src/gallium/targets/vdpau-r300/Makefile.am
index 5e124b0..c220da0 100644
--- a/src/gallium/targets/vdpau-r300/Makefile.am
+++ b/src/gallium/targets/vdpau-r300/Makefile.am
@@ -54,3 +54,8 @@ libvdpau_r300_la_LIBADD = \
 	$(VDPAU_LIBS) \
 	$(LIBDRM_LIBS) \
 	$(RADEON_LIBS)
+
+install-data-hook:
+	mv $(DESTDIR)$(vdpaudir)/libvdpau_r300.so.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \
+	$(DESTDIR)$(vdpaudir)/libvdpau_r300.so.$(VDPAU_MAJOR) && \
+	rm -f $(DESTDIR)$(vdpaudir)/libvdpau_r300.so
diff --git a/src/gallium/targets/vdpau-r600/Makefile.am b/src/gallium/targets/vdpau-r600/Makefile.am
index 527edd6..949c686 100644
--- a/src/gallium/targets/vdpau-r600/Makefile.am
+++ b/src/gallium/targets/vdpau-r600/Makefile.am
@@ -52,3 +52,8 @@ libvdpau_r600_la_LIBADD = \
 	$(VDPAU_LIBS) \
 	$(LIBDRM_LIBS) \
 	$(RADEON_LIBS)
+
+install-data-hook:
+	mv $(DESTDIR)$(vdpaudir)/libvdpau_r600.so.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \
+	$(DESTDIR)$(vdpaudir)/libvdpau_r600.so.$(VDPAU_MAJOR) && \
+	rm -f $(DESTDIR)$(vdpaudir)/libvdpau_r600.so
diff --git a/src/gallium/targets/vdpau-radeonsi/Makefile.am b/src/gallium/targets/vdpau-radeonsi/Makefile.am
index 073c885..fb135f3 100644
--- a/src/gallium/targets/vdpau-radeonsi/Makefile.am
+++ b/src/gallium/targets/vdpau-radeonsi/Makefile.am
@@ -53,3 +53,8 @@ libvdpau_radeonsi_la_LIBADD = \
 	$(VDPAU_LIBS) \
 	$(LIBDRM_LIBS) \
 	$(RADEON_LIBS)
+
+install-data-hook:
+	mv $(DESTDIR)$(vdpaudir)/libvdpau_radeonsi.so.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \
+	$(DESTDIR)$(vdpaudir)/libvdpau_radeonsi.so.$(VDPAU_MAJOR) && \
+	rm -f $(DESTDIR)$(vdpaudir)/libvdpau_radeonsi.so
diff --git a/src/gallium/targets/vdpau-softpipe/Makefile.am b/src/gallium/targets/vdpau-softpipe/Makefile.am
index 20ffb6e..2d772d3 100644
--- a/src/gallium/targets/vdpau-softpipe/Makefile.am
+++ b/src/gallium/targets/vdpau-softpipe/Makefile.am
@@ -62,3 +62,8 @@ if HAVE_MESA_LLVM
 AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
 libvdpau_softpipe_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la
 endif
+
+install-data-hook:
+	mv $(DESTDIR)$(vdpaudir)/libvdpau_softpipe.so.$(VDPAU_MAJOR).$(VDPAU_MINOR).0 \
+	$(DESTDIR)$(vdpaudir)/libvdpau_softpipe.so.$(VDPAU_MAJOR) && \
+	rm -f $(DESTDIR)$(vdpaudir)/libvdpau_softpipe.so
diff --git a/src/gallium/targets/xvmc-nouveau/Makefile.am b/src/gallium/targets/xvmc-nouveau/Makefile.am
index 0d5ebe3..0a97d8a 100644
--- a/src/gallium/targets/xvmc-nouveau/Makefile.am
+++ b/src/gallium/targets/xvmc-nouveau/Makefile.am
@@ -52,3 +52,8 @@ libXvMCnouveau_la_LIBADD = \
 	$(XVMC_LIBS) \
 	$(LIBDRM_LIBS) \
 	$(NOUVEAU_LIBS)
+
+install-data-hook:
+	mv $(DESTDIR)$(xvmcdir)/libXvMCnouveau.so.$(XVMC_MAJOR).$(XVMC_MINOR).0 \
+	$(DESTDIR)$(xvmcdir)/libXvMCnouveau.so && \
+	rm -f $(DESTDIR)$(xvmcdir)/libXvMCnouveau.so.$(XVMC_MAJOR)
diff --git a/src/gallium/targets/xvmc-r300/Makefile.am b/src/gallium/targets/xvmc-r300/Makefile.am
index b7dc95a..b662d10 100644
--- a/src/gallium/targets/xvmc-r300/Makefile.am
+++ b/src/gallium/targets/xvmc-r300/Makefile.am
@@ -60,3 +60,8 @@ libXvMCr300_la_LIBADD = \
 if HAVE_MESA_LLVM
 libXvMCr300_la_LDFLAGS += $(LLVM_LDFLAGS)
 endif
+
+install-data-hook:
+	mv $(DESTDIR)$(xvmcdir)/libXvMCr300.so.$(XVMC_MAJOR).$(XVMC_MINOR).0 \
+	$(DESTDIR)$(xvmcdir)/libXvMCr300.so && \
+	rm -f $(DESTDIR)$(xvmcdir)/libXvMCr300.so.$(XVMC_MAJOR)
diff --git a/src/gallium/targets/xvmc-r600/Makefile.am b/src/gallium/targets/xvmc-r600/Makefile.am
index 15526d8..86eb72a 100644
--- a/src/gallium/targets/xvmc-r600/Makefile.am
+++ b/src/gallium/targets/xvmc-r600/Makefile.am
@@ -53,3 +53,8 @@ libXvMCr600_la_LIBADD = \
 	$(XVMC_LIBS) \
 	$(LIBDRM_LIBS) \
 	$(RADEON_LIBS)
+
+install-data-hook:
+	mv $(DESTDIR)$(xvmcdir)/libXvMCr600.so.$(XVMC_MAJOR).$(XVMC_MINOR).0 \
+	$(DESTDIR)$(xvmcdir)/libXvMCr600.so && \
+	rm -f $(DESTDIR)$(xvmcdir)/libXvMCr600.so.$(XVMC_MAJOR)
diff --git a/src/gallium/targets/xvmc-softpipe/Makefile.am b/src/gallium/targets/xvmc-softpipe/Makefile.am
index ffc448a..fed3dbd 100644
--- a/src/gallium/targets/xvmc-softpipe/Makefile.am
+++ b/src/gallium/targets/xvmc-softpipe/Makefile.am
@@ -57,3 +57,8 @@ if HAVE_MESA_LLVM
 AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
 libXvMCsoftpipe_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la
 endif
+
+install-data-hook:
+	mv $(DESTDIR)$(xvmcdir)/libXvMCsoftpipe.so.$(XVMC_MAJOR).$(XVMC_MINOR).0 \
+	$(DESTDIR)$(xvmcdir)/libXvMCsoftpipe.so && \
+	rm -f $(DESTDIR)$(xvmcdir)/libXvMCsoftpipe.so.$(XVMC_MAJOR)
-- 
1.8.1.4