xserver: Branch 'master'

[Kristian Høgsberg]

 .gitignore                            |    8 --------
 Makefile.am                           |    2 --
 hw/xfree86/dixmods/extmod/Makefile.am |    1 -
 3 files changed, 11 deletions(-)

New commits:
commit 4230b92744d54528f48ddc3b096a265b488053c9
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Wed May 21 17:58:15 2008 -0400

    Clean up remaining afb references.

diff --git a/.gitignore b/.gitignore
index 13d5de4..d2699db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,14 +37,6 @@ xorg-server.pc
 stamp-h?
 do-not-use-config.h
 do-not-use-config.h.in
-afb/afbbltC.c
-afb/afbbltCI.c
-afb/afbbltG.c
-afb/afbbltO.c
-afb/afbbltX.c
-afb/afbseg.c
-afb/afbtileC.c
-afb/afbtileG.c
 cfb/cfb8lineCO.c
 cfb/cfb8lineCP.c
 cfb/cfb8lineG.c
diff --git a/Makefile.am b/Makefile.am
index 7b6b02a..4ed30dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,6 @@ SUBDIRS = \
 	xkb \
 	$(DBE_DIR) \
 	$(MFB_DIR) \
-	$(AFB_DIR) \
 	$(RECORD_DIR) \
 	xfixes \
 	damageext \
@@ -84,7 +83,6 @@ DIST_SUBDIRS = \
 	xkb \
 	dbe \
 	mfb \
-	afb \
 	record \
 	xfixes \
 	damageext \
diff --git a/hw/xfree86/dixmods/extmod/Makefile.am b/hw/xfree86/dixmods/extmod/Makefile.am
index 77af62d..fb08497 100644
--- a/hw/xfree86/dixmods/extmod/Makefile.am
+++ b/hw/xfree86/dixmods/extmod/Makefile.am
@@ -21,7 +21,6 @@ endif
 
 AM_CFLAGS = @DIX_CFLAGS@ @XORG_CFLAGS@
 INCLUDES = @XORG_INCS@ \
-           -I$(top_srcdir)/afb \
            -I$(top_srcdir)/mfb \
            -I$(top_srcdir)/dbe \
            -I$(top_srcdir)/hw/xfree86/loader \