diff options
| author | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-03-11 14:37:41 +0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-03-11 14:37:41 +0800 |
| commit | 31654f52b084ebb32f69854dfb1c342c9da07928 (patch) | |
| tree | 415cb1ba373cc815964bd2441aa546ebd5f74a9f /src/Makefile.am | |
| parent | a03aca101d4d51ed2279a99d1137ce3b7ef364e2 (diff) | |
| parent | 02c0ffb1d8112a6fb03f9c8eae9ec1a1fca123ef (diff) | |
Merge branch 'master' into xvmc
Conflicts:
man/intel.man
src/i830_driver.c
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index b2b08f2e..a5c036e8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,8 +30,8 @@ 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@ @XMODES_CFLAGS@ \ - -DI830_XV -DI830_USE_XAA -DI830_USE_EXA +AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ @PCIACCESS_CFLAGS@ \ + @XMODES_CFLAGS@ -DI830_XV -DI830_USE_XAA -DI830_USE_EXA intel_drv_la_LTLIBRARIES = intel_drv.la intel_drv_la_LDFLAGS = -module -avoid-version |