diff options
| author | Dave Airlie <airlied@linux.ie> | 2006-11-06 08:03:18 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-11-06 08:03:18 +1100 |
| commit | 1e90b7ee8cefff59b70e285557aa7920dea77e81 (patch) | |
| tree | 2132e5dcee9e5ef9693742100953063cd6423b3a /libdrm/Makefile.am | |
| parent | 0c34d0f31a691bb649ed69f19e93fc1a723aa1d4 (diff) | |
| parent | 7b6cd95bb6c41653aed78952da0a461bd4791413 (diff) | |
Merge branch 'master' into nouveau-1
Conflicts:
linux-core/Makefile.kernel
Diffstat (limited to 'libdrm/Makefile.am')
| -rw-r--r-- | libdrm/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am index b12e87fa..91a7e5dc 100644 --- a/libdrm/Makefile.am +++ b/libdrm/Makefile.am @@ -26,6 +26,6 @@ AM_CFLAGS = -I$(top_srcdir)/shared-core libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c libdrmincludedir = ${includedir} -libdrminclude_HEADERS = xf86drm.h +libdrminclude_HEADERS = xf86drm.h xf86mm.h EXTRA_DIST = ChangeLog TODO |