Index: hw/xfree86/Makefile.am
===================================================================
RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/Makefile.am,v
retrieving revision 1.34
diff -u -r1.34 Makefile.am
--- hw/xfree86/Makefile.am	3 Dec 2005 17:04:45 -0000	1.34
+++ hw/xfree86/Makefile.am	6 Dec 2005 16:01:51 -0000
@@ -4,13 +4,9 @@
 
 DOC_SUBDIR = doc
 
-if BUILD_XF8_32WID
-XF8_32WID_SUBDIR=xf8_32wid
-endif
-
 SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \
           ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \
-	  xf8_32bpp $(XF8_32WID_SUBDIR) loader scanpci dixmods exa \
+	  xf8_32bpp xf8_32wid loader scanpci dixmods exa \
 	  $(DRI_SUBDIR) utils $(DOC_SUBDIR) getconfig
 
 DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
Index: hw/xfree86/xf8_32wid/Makefile.am
===================================================================
RCS file: /cvs/xorg/xserver/xorg/hw/xfree86/xf8_32wid/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- hw/xfree86/xf8_32wid/Makefile.am	2 Dec 2005 06:02:43 -0000	1.7
+++ hw/xfree86/xf8_32wid/Makefile.am	6 Dec 2005 16:01:51 -0000
@@ -1,4 +1,6 @@
+if BUILD_XF8_32WID
 module_LTLIBRARIES = libxf8_32wid.la
+endif
 
 sdk_HEADERS = cfb8_32wid.h