xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dfb1cce28ac07d412598f7b9ab2ee908978b38e7
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Nov 2 12:51:56 2007 -0400

    Restore build of xf8_16bpp.
    
    It doesn't link against cfb, so don't conditionalize its build against cfb.

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 9be0220..6277033 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -13,14 +13,14 @@ MFB_SUBDIR = xf1bpp xf4bpp
 endif
 
 if CFB
-CFB_SUBDIR = xf8_16bpp xf8_32bpp
+CFB_SUBDIR = xf8_32bpp
 endif
 
 DOC_SUBDIR = doc
 
 SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \
 	  ramdac shadowfb vbe vgahw xaa $(MFB_SUBDIR) $(CFB_SUBDIR) \
-	  loader dixmods exa modes \
+	  xf8_16bpp loader dixmods exa modes \
 	  $(DRI_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR)
 
 DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \