Remove fbcmap.c hacks from the DIX.

fb/Makefile.am

@@ -2,8 +2,6 @@ noinst_LTLIBRARIES = libfb.la
 
 sdk_HEADERS = fb.h fbrop.h
 
-AM_CFLAGS = -DXFree86Server -DXFree86Loader
-
 libfb_la_SOURCES = 	\
 	fb.h		\
 	fb24_32.c	\
@@ -14,7 +12,6 @@ libfb_la_SOURCES = 	\
 	fbblt.c		\
 	fbbltone.c	\
 	fbbstore.c	\
-	fbcmap.c	\
 	fbcompose.c	\
 	fbcopy.c	\
 	fbfill.c	\
@@ -48,3 +45,5 @@ libfb_la_SOURCES = 	\
 	fbedgeimp.h	\
 	fbmmx.c		\
 	fbmmx.h
+
+EXTRA_DIST = fbcmap.c

hw/xfree86/dixmods/Makefile.am

@@ -8,10 +8,13 @@ INCLUDES = $(XORG_INCS) -I$(top_srcdir)/afb -I$(top_srcdir)/mfb \
            -I$(top_srcdir)/cfb -I$(top_srcdir)/dbe -I$(srcdir)/../loader \
            -I$(top_srcdir)/miext/layer -I$(top_srcdir)/miext/shadow
 
-libbitmap_la_SOURCES = bitmapmod.c
+libbitmap_la_SOURCES = \
+	bitmapmod.c
 libbitmap_la_LDFLAGS = -lXfont
 
-libfb_la_SOURCES = fbmodule.c
+libfb_la_SOURCES = \
+	$(top_srcdir)/fb/fbcmap.c
+	fbmodule.c
 
 libdixmods_la_SOURCES = \
 	afbmodule.c \