xserver: Branch 'master'

[Peter Hutterer]

 dix/Makefile.am |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 7b9915b11ed9eedd0698b4563328504d686ac4ec
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Sat Jul 18 20:52:20 2009 -0400

    dix: xserver "make dist" fails due to eventconvert.h (#27825)
    
    This header file is not in the /dix dir, but in the /include dir.
    The makefile aborted and the xserver distribution files were not created.
    The fix is to remove this header file from the libdix_la_SOURCES
    in the dix/Makefile.am.
    
    X.Org Bug 27825 <http://bugs.freedesktop.org/show_bug.cgi?id=27825>
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/dix/Makefile.am b/dix/Makefile.am
index ab702f7..13e5ded 100644
--- a/dix/Makefile.am
+++ b/dix/Makefile.am
@@ -18,7 +18,6 @@ libdix_la_SOURCES = 	\
 	enterleave.c	\
 	enterleave.h	\
 	events.c	\
-	eventconvert.h  \
 	eventconvert.c  \
 	extension.c	\
 	ffs.c		\