xserver: Branch 'master'

[Adam Jackson]

 Xext/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e25d55ad546905c4921f0a26385bdb9f22038429
Author: Adam Jackson <ajax at redhat.com>
Date:   Fri Apr 3 22:38:00 2009 -0400

    Revert accidental Makefile change from previous commit

diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index 21c8586..ac45f95 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -113,7 +113,7 @@ endif
 # DPMS extension
 DPMS_SRCS = dpms.c dpmsproc.h
 if DPMSExtension
-BUILTIN_SRCS += $(DPMS_SRCS)
+MODULE_SRCS += $(DPMS_SRCS)
 endif
 
 # Now take all of the above, mix well, bake for 10 minutes and get libXext*.la