From 17ea7d16bd3477361d32091f445beca625703f63 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Thomas=20Balling=20S=C3=B8rensen?=
 <tball@tball-laptop.(none)>
Date: Tue, 26 Oct 2010 14:06:01 +0200
Subject: [PATCH] vl: creating cleaner way of naming libraries

---
 src/gallium/targets/Makefile.xvmc          | 5 ++---
 src/gallium/targets/xvmc-nouveau/Makefile  | 2 +-
 src/gallium/targets/xvmc-r600/Makefile     | 2 +-
 src/gallium/targets/xvmc-softpipe/Makefile | 2 ++
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/gallium/targets/Makefile.xvmc b/src/gallium/targets/Makefile.xvmc
index d5d33bde42e..6abe7f6b062 100644
--- a/src/gallium/targets/Makefile.xvmc
+++ b/src/gallium/targets/Makefile.xvmc
@@ -1,6 +1,5 @@
 # This makefile template is used to build libXvMCg3dvl.so
 
-LIBBASENAME = XvMCg3dvl
 LIBNAME = lib$(LIBBASENAME).so
 LIB_GLOB=lib$(LIBBASENAME).*so*
 XVMC_MAJOR = 1
@@ -57,7 +56,7 @@ clean:
 	-rm -f depend depend.bak
 
 install: default
-	$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-	$(MINSTALL) -m 755 $(TOP)/$(LIB_DIR)/gallium/$(LIB_GLOB) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
+	$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
+	$(MINSTALL) -m 755 $(TOP)/$(LIB_DIR)/gallium/$(LIB_GLOB) $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)
 
 include depend
diff --git a/src/gallium/targets/xvmc-nouveau/Makefile b/src/gallium/targets/xvmc-nouveau/Makefile
index fe418b07681..4384eeaeadf 100644
--- a/src/gallium/targets/xvmc-nouveau/Makefile
+++ b/src/gallium/targets/xvmc-nouveau/Makefile
@@ -1,7 +1,7 @@
 TOP = ../../../..
 include $(TOP)/configs/current
 
-#LIBNAME =
+LIBBASENAME = XvMCnouveau
 
 PIPE_DRIVERS = \
 	$(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \
diff --git a/src/gallium/targets/xvmc-r600/Makefile b/src/gallium/targets/xvmc-r600/Makefile
index 25aeb65059f..62e47b53851 100644
--- a/src/gallium/targets/xvmc-r600/Makefile
+++ b/src/gallium/targets/xvmc-r600/Makefile
@@ -1,7 +1,7 @@
 TOP = ../../../..
 include $(TOP)/configs/current
 
-#LIBNAME =
+LIBBASENAME = XvMCr600
 
 PIPE_DRIVERS = \
         $(TOP)/src/gallium/drivers/r600/libr600.a \
diff --git a/src/gallium/targets/xvmc-softpipe/Makefile b/src/gallium/targets/xvmc-softpipe/Makefile
index 1e3ff8ac89c..5b60bede589 100644
--- a/src/gallium/targets/xvmc-softpipe/Makefile
+++ b/src/gallium/targets/xvmc-softpipe/Makefile
@@ -1,6 +1,8 @@
 TOP = ../../../..
 include $(TOP)/configs/current
 
+LIBBASENAME = XvMCsoftpipe
+
 DRIVER_DEFINES = -DGALLIUM_SOFTPIPE
 DRIVER_INCLUDES =
 
-- 
2.30.2