From 82b6ea1a4b414426072bf001daeb3e9de0e93589 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 14 Apr 2006 22:51:19 +0000 Subject: [PATCH] Bug #6580: Don't install xf86drm.h, that's libdrm's job. --- ChangeLog | 5 +++++ hw/xfree86/os-support/Makefile.am | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 490370d34..6b303ef4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-04-14 Adam Jackson + + * hw/xfree86/os-support/Makefile.am: + Bug #6580: Don't install xf86drm.h, that's libdrm's job. + 2006-04-09 Daniel Stone * Xi/exevents.c: diff --git a/hw/xfree86/os-support/Makefile.am b/hw/xfree86/os-support/Makefile.am index 917b2cbc1..789767430 100644 --- a/hw/xfree86/os-support/Makefile.am +++ b/hw/xfree86/os-support/Makefile.am @@ -5,10 +5,10 @@ endif SUBDIRS = bus @XORG_OS_SUBDIR@ misc $(DRI_SUBDIRS) DIST_SUBDIRS = bsd bus drm misc linux lynxos solaris sysv sco usl -sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h xf86_ansic.h xf86_libc.h xf86drm.h \ - xf86drmCompat.h assyntax.h xf86OSKbd.h xf86OSmouse.h +sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h xf86_ansic.h xf86_libc.h \ + assyntax.h xf86OSKbd.h xf86OSmouse.h -EXTRA_DIST = int10Defines.h xf86OSpriv.h README.OS-lib +EXTRA_DIST = int10Defines.h xf86OSpriv.h README.OS-lib xf86drm.h # to get the grouping semantics right, you have to glom these three together # as one library, otherwise libtool will actively defeat your attempts to