Merge branch '7.8'

[mesa.git] / src / gallium / winsys / drm / i965 / dri / Makefile

diff --git a/src/gallium/winsys/drm/i965/dri/Makefile b/src/gallium/winsys/drm/i965/dri/Makefile
index c0ecd9680e2cdcad3f813a694d1e8ff1f4fd7f9c..56690769fc79ec1766d4477298bfb17b649c5399 100644 (file)
--- a/src/gallium/winsys/drm/i965/dri/Makefile
+++ b/src/gallium/winsys/drm/i965/dri/Makefile
@@ -1,15 +1,16 @@
 TOP = ../../../../../..
 include $(TOP)/configs/current
 
-LIBNAME = i915_dri.so
+LIBNAME = i965_dri.so
 
 PIPE_DRIVERS = \
        $(TOP)/src/gallium/state_trackers/dri/libdridrm.a \
-       $(TOP)/src/gallium/winsys/drm/intel/gem/libinteldrm.a \
+       $(TOP)/src/gallium/winsys/drm/i965/gem/libi965drm.a \
        $(TOP)/src/gallium/drivers/trace/libtrace.a \
+       $(TOP)/src/gallium/winsys/drm/sw/libswdrm.a \
        $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
        $(TOP)/src/gallium/drivers/identity/libidentity.a \
-       $(TOP)/src/gallium/drivers/i915/libi915.a
+       $(TOP)/src/gallium/drivers/i965/libi965.a
 
 
 DRIVER_SOURCES =
@@ -24,4 +25,3 @@ DRI_LIB_DEPS += -ldrm_intel
 
 symlinks: $(TOP)/$(LIB_DIR)/gallium
        @rm -f $(TOP)/$(LIB_DIR)/gallium/i965_dri.so
-       ln -s i915_dri.so $(TOP)/$(LIB_DIR)/gallium/i965_dri.so