Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

1 files changed, 89 insertions, 0 deletions

diff --git a/xorg-server/hw/dmx/config/Makefile.am b/xorg-server/hw/dmx/config/Makefile.am
new file mode 100644
index 000000000..c31e04942
--- /dev/null
+++ b/xorg-server/hw/dmx/config/Makefile.am
@@ -0,0 +1,89 @@
+noinst_LIBRARIES = libdmxconfig.a
+
+LIBSRCS = parser.y \
+          scanner.l \
+          dmxparse.c \
+          dmxparse.h \
+          dmxprint.c \
+          dmxprint.h \
+          dmxcompat.c \
+          dmxcompat.h \
+          dmxconfig.c \
+          dmxconfig.h
+
+parser.h: parser.c
+scanner.c: scanner.l parser.h
+
+BUILT_SOURCES = parser.c parser.h scanner.c
+
+MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+
+libdmxconfig_a_SOURCES = $(LIBSRCS)
+
+if GLX
+GLX_DEFS = @GL_CFLAGS@
+GLX_INCS = -I@MESA_SOURCE@/include
+endif	    
+
+AM_YFLAGS = -d
+AM_CFLAGS = \
+	$(DIX_CFLAGS) \
+	-I$(top_srcdir)/hw/dmx \
+	$(GLX_INCS) \
+	-DHAVE_DMX_CONFIG_H \
+	-DDMX_LOG_STANDALONE \
+	$(GLX_DEFS) \
+	@DMXMODULES_CFLAGS@
+
+bin_PROGRAMS = xdmxconfig vdltodmx dmxtodmx
+
+xdmxconfig_DEPENDENCIES = libdmxconfig.a
+xdmxconfig_SOURCES = \
+	xdmxconfig.c \
+	$(top_srcdir)/hw/dmx/dmxlog.c \
+	Canvas.c \
+	Canvas.h \
+	CanvasP.h
+xdmxconfig_LDADD = -L. -ldmxconfig @XDMXCONFIG_DEP_LIBS@
+xdmxconfig_CFLAGS = $(AM_CFLAGS) @XDMXCONFIG_DEP_CFLAGS@
+
+vdltodmx_DEPENDENCIES = libdmxconfig.a
+vdltodmx_SOURCES = vdltodmx.c
+vdltodmx_LDADD = -L. -ldmxconfig
+
+dmxtodmx_DEPENDENCIES = libdmxconfig.a
+dmxtodmx_SOURCES = dmxtodmx.c
+dmxtodmx_LDADD = -L. -ldmxconfig
+
+appmandir = $(APP_MAN_DIR)
+
+appman_PRE = xdmxconfig.man vdltodmx.man dmxtodmx.man
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+
+CLEANFILES = $(appman_DATA)
+
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+  XORGMANNAME = X Version 11
+
+MAN_SUBSTS = -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' 
+
+.man.$(APP_MAN_SUFFIX):
+	sed $(MAN_SUBSTS) < $< > $@
+
+EXTRA_DIST = \
+	$(appman_PRE) \
+	test-a.in test-a.out \
+	test-b.in test-b.out \
+	test-c.in test-c.out \
+	test-d.in test-d.out \
+	test-e.in test-e.out \
+	test-f.in test-f.out \
+	test-g.in test-g.out \
+	test-h.in test-h.out \
+	test-i.in test-i.out \
+	test-j.in test-j.out \
+	test-k.in test-k.out \
+	test-l.in test-l.out