xserver: Branch 'master'

[James Cloos]

 hw/xfree86/common/Makefile.am |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit cb44b6121c4b7b9dd7ff4ff52aaab914c82ff013
Author: Andrew Oakley <andrew at ado.is-a-geek.net>
Date:   Wed Dec 5 20:23:05 2007 -0500

    Fix commit aa0dfb3f42f19bb351ca7f1a9507ff5ec4590e96
    From bugzilla bug 13467¹:
    
    Currently the xserver fails to build without this (now deleted) file, as the
    Makefile tries to distribute it.  The patch simply removes the reference to
    modeline2c.pl.
    
    1] http://bugs.freedesktop.org/show_bug.cgi?id=13467
    
    Signed-off-by: James Cloos <cloos at jhcloos.com>

diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index 5499b69..2f23776 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -87,7 +87,6 @@ EXTRA_DIST = \
 	xf86Date.h \
 	xf86DefModes.c \
 	$(MODEDEFSOURCES) \
-	modeline2c.pl \
         $(DISTKBDSOURCES)
 
 if LNXACPI