1 files changed, 0 insertions, 78 deletions
diff --git a/src/mesa/drivers/dri/i915-tex/Makefile b/src/mesa/drivers/dri/i915-tex/Makefile
deleted file mode 100644
index fff8e9a1179..00000000000
--- a/src/mesa/drivers/dri/i915-tex/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = i915_dri.so
-
-DRIVER_SOURCES = \
-	i830_context.c \
-	i830_metaops.c \
-	i830_state.c \
-	i830_texblend.c \
-	i830_tex.c \
-	i830_texstate.c \
-	i830_vtbl.c \
-	intel_render.c \
-	intel_regions.c \
-	intel_buffer_objects.c \
-	intel_batchbuffer.c \
-	intel_mipmap_tree.c \
-	i915_tex_layout.c \
-	intel_tex_image.c \
-	intel_tex_subimage.c \
-	intel_tex_copy.c \
-	intel_tex_validate.c \
-	intel_tex_format.c \
-	intel_tex.c \
-	intel_pixel.c \
-	intel_pixel_copy.c \
-	intel_pixel_read.c \
-	intel_pixel_draw.c \
-	intel_buffers.c \
-	intel_blit.c \
-	i915_tex.c \
-	i915_texstate.c \
-	i915_context.c \
-	i915_debug.c \
-	i915_fragprog.c \
-	i915_metaops.c \
-	i915_program.c \
-	i915_state.c \
-	i915_texprog.c \
-	i915_vtbl.c \
-	intel_context.c \
-	intel_ioctl.c \
-<<<<<<< Makefile
-	intel_pixel.c \
-	intel_render.c \
-	intel_rotate.c \
-=======
->>>>>>> 1.3.4.11
-	intel_screen.c \
-	intel_span.c \
-	intel_state.c \
-<<<<<<< Makefile
-	intel_tex.c \
-	intel_texmem.c \
-	intel_tris.c 
-=======
-	intel_tris.c \
-	intel_fbo.c \
-	intel_depthstencil.c \
-	intel_bufmgr.c
-
-
->>>>>>> 1.3.4.11
-
-C_SOURCES = \
-	$(COMMON_SOURCES) \
-	$(MINIGLX_SOURCES) \
-	$(DRIVER_SOURCES)
-
-ASM_SOURCES = 
-
-
-
-include ../Makefile.template
-
-symlinks: