summaryrefslogtreecommitdiff
path: root/src/gallium/winsys/drm/i965/dri
diff options
context:
space:
mode:
authorKeith Whitwell <keithw@vmware.com>2009-10-24 11:55:05 +0100
committerKeith Whitwell <keithw@vmware.com>2009-10-24 11:55:05 +0100
commit357e5c9a0e4656bc8f68799a2a082bbdd1277b7a (patch)
tree07547adb77bc8535ccf99ba1af06dd6670ca1593 /src/gallium/winsys/drm/i965/dri
parentd71af266dfe01953f2545708e16a8eb799113abb (diff)
ws/i965: renames from i915, hook up makefiles
Diffstat (limited to 'src/gallium/winsys/drm/i965/dri')
-rw-r--r--src/gallium/winsys/drm/i965/dri/Makefile6
-rw-r--r--src/gallium/winsys/drm/i965/dri/SConscript7
2 files changed, 6 insertions, 7 deletions
diff --git a/src/gallium/winsys/drm/i965/dri/Makefile b/src/gallium/winsys/drm/i965/dri/Makefile
index c0ecd9680e..7b610a3b5f 100644
--- a/src/gallium/winsys/drm/i965/dri/Makefile
+++ b/src/gallium/winsys/drm/i965/dri/Makefile
@@ -1,7 +1,7 @@
TOP = ../../../../../..
include $(TOP)/configs/current
-LIBNAME = i915_dri.so
+LIBNAME = i965_dri.so
PIPE_DRIVERS = \
$(TOP)/src/gallium/state_trackers/dri/libdridrm.a \
@@ -9,7 +9,7 @@ PIPE_DRIVERS = \
$(TOP)/src/gallium/drivers/trace/libtrace.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 +24,4 @@ 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
+ ln -s i965_dri.so $(TOP)/$(LIB_DIR)/gallium/i965_dri.so
diff --git a/src/gallium/winsys/drm/i965/dri/SConscript b/src/gallium/winsys/drm/i965/dri/SConscript
index b1b654d9f8..233ef464be 100644
--- a/src/gallium/winsys/drm/i965/dri/SConscript
+++ b/src/gallium/winsys/drm/i965/dri/SConscript
@@ -6,14 +6,13 @@ env.ParseConfig('pkg-config --cflags --libs libdrm_intel')
drivers = [
st_dri,
- inteldrm,
- softpipe,
- i915,
+ i965drm,
+ i965,
trace,
]
env.LoadableModule(
- target ='i915_dri.so',
+ target ='i965_dri.so',
source = COMMON_GALLIUM_SOURCES,
LIBS = drivers + mesa + auxiliaries + env['LIBS'],
SHLIBPREFIX = '',