diff options
| author | Eric Anholt <eric@anholt.net> | 2006-09-27 16:38:01 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-09-27 16:38:01 -0700 |
| commit | 6ea16bf6b06c8b3aed4d2c98679ab28304d1b56c (patch) | |
| tree | 1f711e8fb7338d6bee527d084a6ea12421087d79 /src/Makefile.am | |
| parent | fdb6de663579d3b9f31bf9e8a93430b8505ca73f (diff) | |
| parent | b970166eab95ac024ff481b0f5fd9aaf3644aabf (diff) | |
Merge branch 'master' into modesetting
This reverts most of the mergedfb code. This will instead be done in device-
independent RandR code.
Conflicts:
src/Makefile.am
src/i810_driver.c
src/i810_reg.h
src/i830.h
src/i830_cursor.c
src/i830_driver.c
src/i830_modes.c
src/i830_video.c
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 72d62762..7af2dd7e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,6 +31,10 @@ i810_drv_la_LDFLAGS = -module -avoid-version i810_drv_ladir = @moduledir@/drivers i810_drv_la_SOURCES = \ + brw_defines.h \ + brw_structs.h \ + sf_prog.h \ + wm_prog.h \ common.h \ i2c_vid.h \ i810_accel.c \ @@ -44,6 +48,7 @@ i810_drv_la_SOURCES = \ i810_reg.h \ i810_video.c \ i810_wmark.c \ + i830_3d.c \ i830_accel.c \ i830_bios.c \ i830_bios.h \ @@ -63,13 +68,27 @@ i810_drv_la_SOURCES = \ i830_memory.c \ i830_modes.c \ i830_video.c \ + i830_video.h \ + i830_reg.h \ i830_rotate.c \ i830_randr.c \ i830_sdvo.c \ i830_sdvo.h \ i830_sdvo_regs.h \ i830_xf86Modes.h \ - i830_xf86Modes.c + i830_xf86Modes.c \ + i915_3d.c \ + i915_3d.h \ + i915_reg.h \ + i915_video.c + +if HAVE_GEN4ASM +sf_prog.h: packed_yuv_sf.g4a + intel-gen4asm -o sf_prog.h packed_yuv_sf.g4a +wm_prog.h: packed_yuv_wm.g4a + intel-gen4asm -o wm_prog.h packed_yuv_wm.g4a +endif + if DRI i810_drv_la_SOURCES += \ i810_dri.c \ @@ -78,3 +97,7 @@ i810_drv_la_SOURCES += \ i810_hwmc.c \ i830_dri.h endif + +EXTRA_DIST = \ + packed_yuv_sf.g4a \ + packed_yuv_wm.g4a |