diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-06 12:40:47 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-06 12:40:47 -0700 |
| commit | f9504eff31eb3c9c6c6b33dced9875866ff8307e (patch) | |
| tree | dcc861375a18d76d30e512ecfa3f4381ae5fd6f9 /src/Makefile.am | |
| parent | f91134795b545c8baebf218975b261c76a0e5873 (diff) | |
| parent | 5c9a62a29f62a9ecce37fae98cb01f8217eaba15 (diff) | |
Merge branch 'drm-gem'
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 382c0aa5..dd92c8d9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,13 +30,14 @@ SUBDIRS = xvmc bios_reader ch7017 ch7xxx ivch sil164 tfp410 $(REGDUMPER) # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. -AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ @PCIACCESS_CFLAGS@ \ - @XMODES_CFLAGS@ -DI830_XV -DI830_USE_XAA -DI830_USE_EXA +AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \ + @PCIACCESS_CFLAGS@ -I../uxa \ + @XMODES_CFLAGS@ -DI830_XV -DI830_USE_XAA -DI830_USE_EXA -DI830_USE_UXA intel_drv_la_LTLIBRARIES = intel_drv.la intel_drv_la_LDFLAGS = -module -avoid-version intel_drv_ladir = @moduledir@/drivers -intel_drv_la_LIBADD = -lm +intel_drv_la_LIBADD = -lm ../uxa/libuxa.la if XSERVER_LIBPCIACCESS intel_drv_la_LIBADD += @PCIACCESS_LIBS@ endif @@ -93,6 +94,8 @@ intel_drv_la_SOURCES = \ i830_accel.c \ i830_bios.c \ i830_bios.h \ + i830_batchbuffer.c \ + i830_batchbuffer.h \ i830_common.h \ i830_crt.c \ i830_cursor.c \ @@ -154,7 +157,6 @@ INTEL_G4I = \ exa_wm.g4i \ exa_wm_affine.g4i \ exa_wm_projective.g4i - INTEL_G4B = \ packed_yuv_sf.g4b \ @@ -176,7 +178,7 @@ INTEL_G4B = \ exa_wm_write.g4b \ exa_wm_yuv_rgb.g4b \ exa_wm_xy.g4b - + EXTRA_DIST = \ $(XMODE_SRCS) \ $(INTEL_G4A) \ |