xserver: Branch 'master'

[Julien Cristau]

 hw/xfree86/os-support/linux/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree a1fe36b772f7edc162ea97368f86588c0fb77148 (from 65a49f0ca198e0366175367729a101211388b16b)
Author: Julien Cristau <jcristau at debian.org>
Date:   Mon Aug 20 12:57:06 2007 +0200

    xfree86: Fix build on Linux/alpha.
    
    A bunch of CFLAGS had gone missing, so the build failed with errors like:
    ../../../../../hw/xfree86/os-support/linux/lnx_ev56.c:7:19: error: input.h: No such file or directory
    ../../../../../hw/xfree86/os-support/linux/lnx_ev56.c:8:24: error: scrnintstr.h: No such file or directory

diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am
index 10f2440..5bb252b 100644
--- a/hw/xfree86/os-support/linux/Makefile.am
+++ b/hw/xfree86/os-support/linux/Makefile.am
@@ -11,7 +11,7 @@ PLATFORM_PCI_SUPPORT = \
        $(srcdir)/lnx_axp.c \
        $(srcdir)/../shared/xf86Axp.c
 
-liblinuxev56_la_CFLAGS = -mcpu=ev56
+liblinuxev56_la_CFLAGS = $(AM_CFLAGS) -mcpu=ev56
 
 liblinuxev56_la_SOURCES = lnx_ev56.c
 endif