diff options
| author | Jakob Bornecrantz <jakob@vmware.com> | 2010-01-05 20:59:24 +0100 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@vmware.com> | 2010-01-05 20:59:24 +0100 |
| commit | 2f7f7ceccab4176217c399502b3ff95df1517627 (patch) | |
| tree | 1a9f6e6c8ebcf5b13d9877685fce91b87a971ed2 /radeon/Makefile.am | |
| parent | d6059c3dd1300662e941ccd5e55649534fbb9a63 (diff) | |
| parent | 6d3b8bbddd44b42d89adb1aafb7645e7f802673a (diff) | |
Merge branch 'master' into libkms-master
Conflicts:
configure.ac
Diffstat (limited to 'radeon/Makefile.am')
| -rw-r--r-- | radeon/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/radeon/Makefile.am b/radeon/Makefile.am index dd136b1f..29af1df2 100644 --- a/radeon/Makefile.am +++ b/radeon/Makefile.am @@ -38,7 +38,8 @@ libdrm_radeon_la_SOURCES = \ radeon_bo_gem.c \ radeon_cs_gem.c \ radeon_cs_space.c \ - radeon_track.c + radeon_bo.c \ + radeon_cs.c libdrm_radeonincludedir = ${includedir}/drm libdrm_radeoninclude_HEADERS = \ @@ -46,7 +47,8 @@ libdrm_radeoninclude_HEADERS = \ radeon_cs.h \ radeon_bo_gem.h \ radeon_cs_gem.h \ - radeon_track.h + radeon_bo_int.h \ + radeon_cs_int.h pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = libdrm_radeon.pc |