Add DGA configure option and add various files that we should be dist'ing.

    Simplify xf86DefModeSet.c rule a bit.

9 files changed, 39 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 263fc02f3..4a2ca633c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-10-05  Kristian Høgsberg  <krh@redhat.com>
+
+	* afb/Makefile.am:
+	* cfb/Makefile.am:
+	* configure.ac:
+	* dix/Makefile.am:
+	* fb/Makefile.am:
+	* hw/vfb/Makefile.am:
+	* hw/xfree86/common/Makefile.am:
+	* hw/xfree86/dixmods/extmod/Makefile.am:
+	Add DGA configure option and add various files that we should be
+	dist'ing.  Simplify xf86DefModeSet.c rule a bit.
+
 2005-10-05  Adam Jackson  <ajax@freedesktop.org>
 
 	* configure.ac:
diff --git a/afb/Makefile.am b/afb/Makefile.am
index 9d89beb82..b162bada8 100644
--- a/afb/Makefile.am
+++ b/afb/Makefile.am
@@ -11,10 +11,10 @@ libafb_la_SOURCES = afbgc.c afbwindow.c afbfont.c afbfillrct.c afbpntwin.c afbpi
 	 afbzerarc.c afbfillarc.c afbfillsp.c afbsetsp.c afbscrinit.c afbplygblt.c \
 	 afbclip.c afbgetsp.c afbpolypnt.c afbbitblt.c afbcmap.c afbimggblt.c afbpntarea.c \
 	 afbmisc.c afbbstore.c afbtegblt.c $(libafb_gen_sources)
-	 
+
 INCLUDES = -I$(top_srcdir)/mfb
 
-EXTRA_DIST = afbline.c afbblt.c afbtile.c
+EXTRA_DIST = afbline.c afbblt.c afbtile.c README Xdaniver.doc
 
 afbseg.c:
 	echo "#define POLYSEGMENT" > $@
diff --git a/cfb/Makefile.am b/cfb/Makefile.am
index e150caf94..ad665712d 100644
--- a/cfb/Makefile.am
+++ b/cfb/Makefile.am
@@ -16,6 +16,7 @@ INCLUDES = $(CFB_INCLUDES)
 EXTRA_DIST = cfbline.c cfbfillarc.c cfbzerarc.c cfbblt.c cfbsolid.c \
              cfbtileodd.c cfbtile32.c cfb8line.c cfbply1rct.c cfbglblt8.c \
 	     cfb16.h cfb24.h cfb32.h cfb8bit.h cfbrrop.h \
-	     cfbtab.h
+	     cfbtab.h \
+	     stip68kgnu.h stipmips.s stipsparc.s stipsprc32.s
 
 sdk_HEADERS = cfb.h cfb32.h cfb16.h cfbmap.h cfbunmap.h cfbmskbits.h
diff --git a/configure.ac b/configure.ac
index 844b245fe..d4e708100 100644
--- a/configure.ac
+++ b/configure.ac
@@ -335,6 +335,7 @@ AC_ARG_ENABLE(xres,          [  --disable-xres ], [RES=$enableval], [RES=yes])
 AC_ARG_ENABLE(xtrap,         [  --enable-xtrap ], [XTRAP=$enableval], [XTRAP=no])
 AC_ARG_ENABLE(record,        [  --disable-record ], [RECORD=$enableval], [RECORD=yes])
 AC_ARG_ENABLE(xv,            [  --disable-xv ], [XV=$enableval], [XV=yes])
+AC_ARG_ENABLE(dga,           [  --enable-dga ], [DGA=$enableval], [DGA=no])
 AC_ARG_ENABLE(screensaver,   [  --disable-screensaver ], [SCREENSAVER=$enableval], [SCREENSAVER=yes])
 AC_ARG_ENABLE(xdmcp,         [  --disable-xdmcp ], [XDMCP=$enableval], [XDMCP=auto])
 AC_ARG_ENABLE(xdm-auth-1,    [  --disable-xdm-auth-1 ], [XDMAUTH=$enableval], [XDMAUTH=auto])
@@ -417,7 +418,7 @@ XEXT_INC='-I$(top_srcdir)/Xext'
 XEXT_LIB='$(top_builddir)/Xext/libXext.la'
 
 dnl Core modules for most extensions, et al.
-REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xcmiscproto xextproto xfont xproto xtrans xau xf86dgaproto xf86miscproto xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto resourceproto fontenc fontsproto"
+REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xcmiscproto xextproto xfont xproto xtrans xau xf86miscproto xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto resourceproto fontenc fontsproto"
 
 AM_CONDITIONAL(XV, [test "x$XV" = xyes])
 if test "x$XV" = xyes; then
@@ -425,6 +426,12 @@ if test "x$XV" = xyes; then
 	REQUIRED_MODULES="$REQUIRED_MODULES videoproto"
 fi
 
+AM_CONDITIONAL(DGA, [test "x$DGA" = xyes])
+if test "x$DGA" = xyes; then
+	AC_DEFINE(DGA, 1, [Support DGA extension])
+	REQUIRED_MODULES="$REQUIRED_MODULES xf86dgaproto"
+fi
+
 AM_CONDITIONAL(COMPOSITE, [test "x$COMPOSITE" = xyes])
 if test "x$COMPOSITE" = xyes; then
 	AC_DEFINE(COMPOSITE, 1, [Support Composite Extension])
diff --git a/dix/Makefile.am b/dix/Makefile.am
index ba65c2909..f820276a7 100644
--- a/dix/Makefile.am
+++ b/dix/Makefile.am
@@ -33,3 +33,5 @@ libxpstubs_la_SOURCES =	\
 	xpstubs.c
 
 INCLUDES = -I$(top_srcdir)/Xprint
+
+EXTRA_DIST = buildatoms BuiltInAtoms CHANGES
diff --git a/fb/Makefile.am b/fb/Makefile.am
index 061dd70f5..4797cbae0 100644
--- a/fb/Makefile.am
+++ b/fb/Makefile.am
@@ -24,6 +24,7 @@ libfbmmx_la_SOURCES =	\
 libfb_la_SOURCES = 	\
 	fb.h		\
 	fb24_32.c	\
+	fb24_32.h	\
 	fballpriv.c	\
 	fbarc.c		\
 	fbbits.c	\
diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am
index 2c799a5d6..c02319192 100644
--- a/hw/vfb/Makefile.am
+++ b/hw/vfb/Makefile.am
@@ -23,3 +23,7 @@ AM_CFLAGS = -DHAVE_DIX_CONFIG_H \
             -DNO_MODULE_EXTS \
             -DXFree86Server \
             $(XVFBMODULES_CFLAGS)
+
+man1_MANS = Xvfb.man
+
+CLEANFILES = $(man1_MANS)
diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index 9358c8f2f..4b1739192 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -23,15 +23,10 @@ BUSSOURCES = xf86isaBus.c xf86pciBus.c xf86fbBus.c xf86noBus.c $(SBUS_SOURCES)
 KBDSOURCES = xf86Kbd@XORG_OS_KBD@.c
 
 MODEDEFSOURCES = $(srcdir)/vesamodes $(srcdir)/extramodes
-MODEDEFS = modedefs
 
-$(MODEDEFS): $(MODEDEFSOURCES)
+xf86DefModeSet.c: $(srcdir)/modeline2c.pl
 	$(RM) $@
-	cat $(MODEDEFSOURCES) > $@
-
-xf86DefModeSet.c: $(MODEDEFS) $(srcdir)/modeline2c.pl
-	$(RM) $@
-	$(PERL) $(srcdir)/modeline2c.pl < $(MODEDEFS) > $@
+	cat $(MODEDEFSOURCES) | $(PERL) $(srcdir)/modeline2c.pl > $@
 
 BUILT_SOURCES = xf86DefModeSet.c
 
@@ -42,7 +37,7 @@ libcommon_a_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
                       xf86Globals.c xf86Io.c xf86AutoConfig.c \
                       xf86MiscExt.c xf86Option.c \
                       xf86VidMode.c xf86fbman.c xf86cmap.c \
-                      xf86Helper.c \
+                      xf86Helper.c xf86PM.c \
                       xf86Mode.c xf86Build.h xorgHelper.c xf86Versions.c \
                       $(XVSOURCES) $(BUSSOURCES) $(XKBSOURCES) \
                       $(DEBUGSOURCES) $(XISOURCES) $(RANDRSOURCES) \
diff --git a/hw/xfree86/dixmods/extmod/Makefile.am b/hw/xfree86/dixmods/extmod/Makefile.am
index 6e401786d..fbb07732a 100644
--- a/hw/xfree86/dixmods/extmod/Makefile.am
+++ b/hw/xfree86/dixmods/extmod/Makefile.am
@@ -2,7 +2,10 @@ sdk_HEADERS = dgaproc.h
 
 module_LTLIBRARIES = libextmod.la
 
-# DGA_SRCS = xf86dga.c xf86dga2.c dgaproc.h xf86dgaext.h
+if DGA
+DGA_SRCS = xf86dga.c xf86dga2.c dgaproc.h xf86dgaext.h
+endif
+
 if XV
 XV_SRCS = xvmod.c xvmodproc.h
 endif