summaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorWang Zhenyu <zhenyu.z.wang@intel.com>2006-08-24 10:23:22 +0800
committerWang Zhenyu <zhenyu.z.wang@intel.com>2006-08-24 10:23:22 +0800
commit078af29fa65653c5322b006404f7ad29aec24cce (patch)
tree1c05fbbbc4e07cb6f2e930bc6048f8fa288a38f1 /src/Makefile.am
parent7458a6adb5ea62f56bb3d4ab19ad7d1aa6ad2d19 (diff)
parentea63e82ef417a9918e7d7105910a8ddeba2994f6 (diff)
Merge branch 'master' into exa
Conflicts: man/i810.man src/Makefile.am src/i830_accel.c src/i830_dga.c src/i830_driver.c
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index c2e49ac3..e58350c9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,6 +31,9 @@ i810_drv_la_LDFLAGS = -module -avoid-version
i810_drv_ladir = @moduledir@/drivers
i810_drv_la_SOURCES = \
+ brw_defines.h \
+ brw_structs.h \
+ wm_prog.h \
common.h \
i810_accel.c \
i810_common.h \
@@ -53,6 +56,7 @@ i810_drv_la_SOURCES = \
i830_memory.c \
i830_modes.c \
i830_video.c \
+ i830_video.h \
i830_rotate.c \
i830_randr.c \
i830_3d.c \
@@ -60,6 +64,7 @@ i810_drv_la_SOURCES = \
i915_3d.c \
i915_3d.h \
i915_reg.h \
+ i915_video.c \
i830_exa.c \
i830_xaa.c \
i830_exa_render.c \