gallium: Rename the dri state tracker lib to libdridrm.a

diff --git a/src/gallium/state_trackers/dri/Makefile b/src/gallium/state_trackers/dri/Makefile
index 47750e997e99653820500c95426becc48ef016d5..ef8f19709ab242e497bb80210fd138e54c222362 100644 (file)
--- a/src/gallium/state_trackers/dri/Makefile
+++ b/src/gallium/state_trackers/dri/Makefile
@@ -1,7 +1,7 @@
 TOP = ../../../..
 include $(TOP)/configs/current
 
-LIBNAME = dri2drm
+LIBNAME = dridrm
 
 LIBRARY_INCLUDES = \
        -I$(TOP)/include \

diff --git a/src/gallium/winsys/drm/intel/dri2/Makefile b/src/gallium/winsys/drm/intel/dri2/Makefile
index 286ef08d5b01ccce5122c2977a5ff7b20619e94a..125e79e0edc1c348eb05bb0a8cfeca8ee4c56fb6 100644 (file)
--- a/src/gallium/winsys/drm/intel/dri2/Makefile
+++ b/src/gallium/winsys/drm/intel/dri2/Makefile
@@ -4,7 +4,7 @@ include $(TOP)/configs/current
 LIBNAME = i915_dri.so
 
 PIPE_DRIVERS = \
-       $(TOP)/src/gallium/state_trackers/dri/libdri2drm.a \
+       $(TOP)/src/gallium/state_trackers/dri/libdridrm.a \
        $(TOP)/src/gallium/winsys/drm/intel/gem/libinteldrm.a \
        $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
        $(TOP)/src/gallium/drivers/i915simple/libi915simple.a

diff --git a/src/gallium/winsys/drm/nouveau/dri2/Makefile b/src/gallium/winsys/drm/nouveau/dri2/Makefile
index 5e5efbcb113aa866a4706f8158691b1b7c2e1c6b..377a80d5188c3bbd68067cbdc3d32d2234a5b823 100644 (file)
--- a/src/gallium/winsys/drm/nouveau/dri2/Makefile
+++ b/src/gallium/winsys/drm/nouveau/dri2/Makefile
@@ -4,7 +4,7 @@ include $(TOP)/configs/current
 LIBNAME = nouveau_dri2.so
 
 PIPE_DRIVERS = \
-       $(TOP)/src/gallium/state_trackers/dri/libdri2drm.a \
+       $(TOP)/src/gallium/state_trackers/dri/libdridrm.a \
        $(TOP)/src/gallium/winsys/drm/nouveau/drm/libnouveaudrm.a \
        $(TOP)/src/gallium/drivers/nv04/libnv04.a \
        $(TOP)/src/gallium/drivers/nv10/libnv10.a \

diff --git a/src/gallium/winsys/drm/radeon/dri2/Makefile b/src/gallium/winsys/drm/radeon/dri2/Makefile
index 58a87dae18d5fe41964e8ad3eb31aa88ac4f4be8..c218ee9d0104eb3dcc568c552566c656345fd0d1 100644 (file)
--- a/src/gallium/winsys/drm/radeon/dri2/Makefile
+++ b/src/gallium/winsys/drm/radeon/dri2/Makefile
@@ -7,7 +7,7 @@ LIBNAME = radeon_dri.so
 MINIGLX_SOURCES =
 
 PIPE_DRIVERS = \
-       $(TOP)/src/gallium/state_trackers/dri/libdri2drm.a \
+       $(TOP)/src/gallium/state_trackers/dri/libdridrm.a \
        $(TOP)/src/gallium/winsys/drm/radeon/core/libradeonwinsys.a \
        $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
        $(TOP)/src/gallium/drivers/r300/libr300.a