Module Name: src
Committed By: snj
Date: Mon Jan 11 00:49:48 UTC 2010
Modified Files:
src/external/mit/xorg/lib/dri/i965 [netbsd-5]: Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1236):
external/mit/xorg/lib/dri/i965/Makefile: revision 1.6
fix a problem reported by jmorse:
- fix a line continuation that stopped SRCS= from working
- don't include intel_dri.c here
To generate a diff of this commit:
cvs rdiff -u -r1.3.6.2 -r1.3.6.3 src/external/mit/xorg/lib/dri/i965/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/dri/i965/Makefile
diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.3.6.2 src/external/mit/xorg/lib/dri/i965/Makefile:1.3.6.3
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.3.6.2 Fri Nov 13 20:49:08 2009
+++ src/external/mit/xorg/lib/dri/i965/Makefile Mon Jan 11 00:49:47 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3.6.2 2009/11/13 20:49:08 sborrill Exp $
+# $NetBSD: Makefile,v 1.3.6.3 2010/01/11 00:49:47 snj Exp $
MODULE= i965
@@ -7,7 +7,7 @@
-I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/intel/server
DRI_EXTRA_PATHS= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/intel \
- ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/intel/server \
+ ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/intel/server
SRCS= \
intel_batchbuffer.c \
intel_blit.c \
@@ -85,8 +85,7 @@
brw_wm_pass2.c \
brw_wm_sampler_state.c \
brw_wm_state.c \
- brw_wm_surface_state.c \
- intel_dri.c
+ brw_wm_surface_state.c
COPTS.brw_draw_upload.c= -Wno-error
