Merge remote branch 'origin/7.8'

[mesa.git] / src / mesa / drivers / dri / i965 / Makefile

diff --git a/src/mesa/drivers/dri/i965/Makefile b/src/mesa/drivers/dri/i965/Makefile
index 7a55333e896fd372e750fddb9eaca71dd5c97c98..842d4b7aa104c52e51f5e736e028cc06ffe7c9f0 100644 (file)
--- a/src/mesa/drivers/dri/i965/Makefile
+++ b/src/mesa/drivers/dri/i965/Makefile
@@ -24,7 +24,6 @@ DRIVER_SOURCES = \
        intel_pixel_draw.c \
        intel_pixel_read.c \
        intel_state.c \
-       intel_swapbuffers.c \
        intel_syncobj.c \
        intel_tex.c \
        intel_tex_copy.c \
@@ -55,6 +54,7 @@ DRIVER_SOURCES = \
        brw_gs_emit.c \
        brw_gs_state.c \
        brw_misc_state.c \
+       brw_optimize.c \
        brw_program.c \
        brw_queryobj.c \
        brw_sf.c \
@@ -85,18 +85,29 @@ DRIVER_SOURCES = \
        brw_wm_pass2.c \
        brw_wm_sampler_state.c \
        brw_wm_state.c \
-       brw_wm_surface_state.c 
+       brw_wm_surface_state.c \
+       gen6_cc.c \
+       gen6_clip_state.c \
+       gen6_depthstencil.c \
+       gen6_gs_state.c \
+       gen6_sampler_state.c \
+       gen6_scissor_state.c \
+       gen6_sf_state.c \
+       gen6_urb.c \
+       gen6_viewport_state.c \
+       gen6_vs_state.c \
+       gen6_wm_state.c
 
 C_SOURCES = \
        $(COMMON_SOURCES) \
-       $(MINIGLX_SOURCES) \
        $(DRIVER_SOURCES)
 
 ASM_SOURCES = 
 
 DRIVER_DEFINES = -I../intel -I../intel/server
 
-DRI_LIB_DEPS += -ldrm_intel
+INCLUDES += $(INTEL_CFLAGS)
+DRI_LIB_DEPS += $(INTEL_LIBS)
 
 include ../Makefile.template