summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Balling Sørensen <tball@tball-laptop.(none)>2010-10-26 14:06:01 +0200
committerThomas Balling Sørensen <tball@tball-laptop.(none)>2010-10-26 14:06:01 +0200
commit17ea7d16bd3477361d32091f445beca625703f63 (patch)
treeca4c105ecd4e7fbbf2640de90543fd051ea790a7
parent050dfe9caf364fdaac91db1313988275774a7eaa (diff)
vl: creating cleaner way of naming libraries
-rw-r--r--src/gallium/targets/Makefile.xvmc5
-rw-r--r--src/gallium/targets/xvmc-nouveau/Makefile2
-rw-r--r--src/gallium/targets/xvmc-r600/Makefile2
-rw-r--r--src/gallium/targets/xvmc-softpipe/Makefile2
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 =