Fix typo and add new Makefiles to AC_OUTPUT

Fix typos
Add xorg.conf.man to CLEANFILES
Add missing files to EXTRA_DIST

ChangeLog

@@ -1,3 +1,25 @@
+2005-10-15  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* configure.ac:
+	Fix typo and add new Makefiles to AC_OUTPUT
+
+	* XpConfig/C/print/models/HPDJ1600C/Makefile.am:
+	Fix typos
+
+	* hw/xfree86/doc/man/Makefile.am:
+	Add xorg.conf.man to CLEANFILES
+
+	* Makefile.am:
+	* XpConfig/C/print/models/PSspooldir/Makefile.am:
+	* Xprint/Makefile.am:
+	* hw/xfree86/os-support/Makefile.am:
+	* hw/xfree86/os-support/lynxos/Makefile.am:
+	* ilbm/Makefile.am:
+	* iplan2p4/Makefile.am:
+	* miext/Makefile.am:
+	* miext/rootless/Makefile.am:
+	Add missing files to EXTRA_DIST
+
 2005-10-15  Kristian Høgsberg  <krh@redhat.com>
 
 	* lbx/Makefile.am: Doh, remember to add this file.

Makefile.am

@@ -36,37 +36,70 @@ if LBX
 LBX_DIR=lbx
 endif
 
-SUBDIRS=	\
+SUBDIRS = \
-	doc	\
+	doc \
-	include	\
+	include \
-	dix 	\
+	dix  \
-	fb	\
+	fb \
-	mi	\
+	mi \
-	Xext	\
+	Xext \
-	miext	\
+	miext \
-	os	\
+	os \
-	randr	\
+	randr \
 	render  \
-	Xi	\
+	Xi \
-	xkb	\
+	xkb \
-        dbe     \
+	dbe \
-	$(MFB_DIR)	\
+	$(MFB_DIR) \
-	$(AFB_DIR)	\
+	$(AFB_DIR) \
-	$(CFB_DIR)	\
+	$(CFB_DIR) \
-	$(CFB16_DIR)   \
+	$(CFB16_DIR) \
-	$(CFB24_DIR)   \
+	$(CFB24_DIR) \
-	$(CFB32_DIR)   \
+	$(CFB32_DIR) \
-	record	\
+	record \
-	xfixes	\
+	xfixes \
 	damageext \
 	$(XTRAP_DIR) \
 	$(COMPOSITE_DIR) \
-        $(GLX_DIR) \
+	$(GLX_DIR) \
-	hw	\
+	$(LBX_DIR) \
+	hw \
 	$(XPDDX_DIR) \
-	$(XPCONFIG_DIR) \
+	$(XPCONFIG_DIR)
-	$(LBX_DIR)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xorg-server.pc
 EXTRA_DIST = xorg-server.pc.in
+
+DIST_SUBDIRS = \
+	doc \
+	include \
+	dix  \
+	fb \
+	mi \
+	Xext \
+	miext \
+	os \
+	randr \
+	render  \
+	Xi \
+	xkb \
+	dbe \
+	mfb \
+	afb \
+	cfb \
+	cfb16 \
+	cfb24 \
+	cfb32 \
+	ilbm \
+	iplan2p4 \
+	record \
+	xfixes \
+	damageext \
+	XTrap \
+	composite \
+	GL \
+	hw \
+	Xprint \
+	XpConfig \
+	lbx

XpConfig/C/print/models/HPDJ1600C/Makefile.am

@@ -1,5 +1,5 @@
 SUBDIRS = fonts
 
-xpc_data = @xpconfigdir@/C/print/models/HPDJ1600C
+xpcdir = @xpconfigdir@/C/print/models/HPDJ1600C
 
-dist_xpc_data = model-config
+dist_xpc_DATA = model-config

XpConfig/C/print/models/PSspooldir/Makefile.am

@@ -1,3 +1,3 @@
 xpcdir = @xpconfigdir@/C/print/models/PSspooldir
 
-dist_xpc_DATA = model-config
+dist_xpc_DATA = model-config spooltodir.sh

Xprint/Makefile.am

@@ -31,3 +31,5 @@ Xprt_SOURCES =			\
 	Util.c			\
 	miinitext-wrapper.c	\
 	dpmsstubs-wrapper.c
+
+EXTRA_DIST = ValTree.c

configure.ac

@@ -348,7 +348,7 @@ AC_ARG_ENABLE(xf86vidmode,   [  --disable-xf86vidmode ], [XF86VIDMODE=$enableval
 AC_ARG_ENABLE(xf86misc,      [  --disable-xf86misc ], [XF86MISC=$enableval], [XF86MISC=yes])
 AC_ARG_ENABLE(xcsecurity,     AS_HELP_STRING([--enable-xcsecurity], [Build Security extension (default: disabled)]),[XCSECURITY=$enableval],[XCSECURITY=no])
 AC_ARG_ENABLE(xevie,          AS_HELP_STRING([--enable-xevie], [Build XEvIE extension (default: disabled)]), [XEVIE=$enableval], [XEVIE=no])
-AC_ARG_ENABLE(lbx,            AS_HELP_STRING([  --enable-xtrap ], [Build LBX (default: no)]), [LBX=$enableval], [LBX=no])
+AC_ARG_ENABLE(lbx,            AS_HELP_STRING([  --enable-lbx ], [Build LBX (default: no)]), [LBX=$enableval], [LBX=no])
 
 dnl DDXes.
 AC_ARG_ENABLE(xorg,    	      AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
@@ -1172,12 +1172,15 @@ cfb/Makefile
 cfb16/Makefile
 cfb24/Makefile
 cfb32/Makefile
+ilbm/Makefile
+iplan2p4/Makefile
 mi/Makefile
 miext/Makefile
 miext/damage/Makefile
 miext/shadow/Makefile
 miext/cw/Makefile
 miext/layer/Makefile
+miext/rootless/Makefile
 os/Makefile
 randr/Makefile
 render/Makefile
@@ -1210,7 +1213,10 @@ hw/xfree86/os-support/bus/Makefile
 hw/xfree86/os-support/drm/Makefile
 hw/xfree86/os-support/misc/Makefile
 hw/xfree86/os-support/linux/Makefile
+hw/xfree86/os-support/lynxos/Makefile
+hw/xfree86/os-support/sco/Makefile
 hw/xfree86/os-support/solaris/Makefile
+hw/xfree86/os-support/sysv/Makefile
 hw/xfree86/parser/Makefile
 hw/xfree86/rac/Makefile
 hw/xfree86/ramdac/Makefile

hw/xfree86/doc/man/Makefile.am

@@ -6,8 +6,6 @@ man1_MANS = Xorg.man
 filemandir = $(mandir)/man$(FILE_MAN_SUFFIX)
 fileman_DATA = xorg.conf.$(FILE_MAN_SUFFIX)
 
-CLEANFILES = $(man1_MANS) $(fileman_DATA)
-
 xorg.conf.$(FILE_MAN_SUFFIX): xorg.conf.man
 	-rm -f xorg.conf.$(FILE_MAN_SUFFIX)
 	$(LN_S) xorg.conf.man xorg.conf.$(FILE_MAN_SUFFIX)
@@ -16,4 +14,6 @@ include $(top_srcdir)/cpprules.in
 
 EXTRAMANDEFS = -D__logdir__=$(logdir)
 
+CLEANFILES = $(man1_MANS) $(fileman_DATA) xorg.conf.man
+
 EXTRA_DIST = $(MAN_SRCS)

hw/xfree86/os-support/Makefile.am

@@ -3,7 +3,7 @@ DRI_SUBDIRS=drm
 endif
 
 SUBDIRS = bus @XORG_OS_SUBDIR@ misc $(DRI_SUBDIRS)
-DIST_SUBDIRS = bsd bus drm misc linux solaris sysv sco
+DIST_SUBDIRS = bsd bus drm misc linux lynxos solaris sysv sco
 
 sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h xf86_ansic.h xf86_libc.h xf86drm.h \
               xf86drmCompat.h assyntax.h xf86OSKbd.h xf86OSmouse.h

hw/xfree86/os-support/lynxos/Makefile.am

@@ -0,0 +1,9 @@
+EXTRA_DIST = \
+	lynx_init.c \
+	lynx_io.c \
+	lynx_mmap.c \
+	lynx_mouse.c \
+	lynx_noinline.c \
+	lynx_ppc.c \
+	lynx_video.c \
+	lynx_ppc.S

ilbm/Makefile.am

@@ -0,0 +1,34 @@
+EXTRA_DIST = \
+	ilbm.h \
+	ilbmbitblt.c \
+	ilbmblt.c \
+	ilbmbres.c \
+	ilbmbresd.c \
+	ilbmbstore.c \
+	ilbmclip.c \
+	ilbmcmap.c \
+	ilbmfillarc.c \
+	ilbmfillrct.c \
+	ilbmfillsp.c \
+	ilbmfont.c \
+	ilbmgc.c \
+	ilbmgetsp.c \
+	ilbmhrzvert.c \
+	ilbmimage.c \
+	ilbmimggblt.c \
+	ilbmline.c \
+	ilbmmisc.c \
+	ilbmpixmap.c \
+	ilbmply1rct.c \
+	ilbmplygblt.c \
+	ilbmpntarea.c \
+	ilbmpntwin.c \
+	ilbmpolypnt.c \
+	ilbmpushpxl.c \
+	ilbmscrinit.c \
+	ilbmsetsp.c \
+	ilbmtegblt.c \
+	ilbmtile.c \
+	ilbmwindow.c \
+	ilbmzerarc.c \
+	README

iplan2p4/Makefile.am

@@ -0,0 +1,36 @@
+EXTRA_DIST = \
+	ipl.h \
+	iplallpriv.c \
+	iplbitblt.c \
+	iplblt.c \
+	iplbres.c \
+	iplbresd.c \
+	iplbstore.c \
+	iplcmap.c \
+	iplfillarc.c \
+	iplfillrct.c \
+	iplfillsp.c \
+	iplgc.c \
+	iplgetsp.c \
+	iplhrzvert.c \
+	iplimage.c \
+	iplline.c \
+	iplmap.h \
+	iplmergerop.h \
+	iplmskbits.c \
+	iplmskbits.h \
+	iplpack.c \
+	iplpack.h \
+	iplpixmap.c \
+	iplply1rct.c \
+	iplpntwin.c \
+	iplpolypnt.c \
+	iplrrop.c \
+	iplrrop.h \
+	iplscrinit.c \
+	iplsetsp.c \
+	iplsolid.c \
+	ipltegblt.c \
+	ipltile32.c \
+	ipltileodd.c \
+	iplwindow.c

miext/Makefile.am

@@ -2,4 +2,4 @@ SUBDIRS = damage shadow layer
 if COMPOSITE
 SUBDIRS += cw
 endif
-DIST_SUBDIRS = damage shadow layer cw
+DIST_SUBDIRS = damage shadow layer cw rootless

miext/rootless/Makefile.am

@@ -0,0 +1,23 @@
+EXTRA_DIST = \
+	accel/rlAccel.c \
+	accel/rlAccel.h \
+	accel/rlBlt.c \
+	accel/rlCopy.c \
+	accel/rlFill.c \
+	accel/rlFillRect.c \
+	accel/rlFillSpans.c \
+	accel/rlGlyph.c \
+	accel/rlSolid.c \
+	README.txt \
+	rootlessCommon.c \
+	rootlessCommon.h \
+	rootlessConfig.h \
+	rootlessGC.c \
+	rootless.h \
+	rootlessScreen.c \
+	rootlessValTree.c \
+	rootlessWindow.c \
+	rootlessWindow.h \
+	safeAlpha/safeAlpha.h \
+	safeAlpha/safeAlphaPicture.c \
+	safeAlpha/safeAlphaWindow.c