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, 164 insertions, 0 deletions

diff --git a/xorg-server/hw/xfree86/utils/xorgcfg/Makefile.am b/xorg-server/hw/xfree86/utils/xorgcfg/Makefile.am
new file mode 100644
index 000000000..31d1b3f00
--- /dev/null
+++ b/xorg-server/hw/xfree86/utils/xorgcfg/Makefile.am
@@ -0,0 +1,164 @@
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# 
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+# 
+
+if BUILD_XORGCFG
+bin_PROGRAMS = xorgcfg
+
+INCLUDES = $(XORG_INCS) -I$(top_srcdir)/hw/xfree86/parser
+
+OPTIONSPATH=$(libdir)/X11
+
+xorgcfg_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) $(CURSESDEFINES) \
+	$(XORGCFG_DEP_CFLAGS) -DXKB_RULES_DIR=\"$(XKB_BASE_DIRECTORY)/rules\" \
+	-DPROJECT_ROOT=\"$(PROJECTROOT)\" -DOPTIONSPATH=\"$(OPTIONSPATH)\"
+xorgcfg_LDADD = $(XORGCFG_DEP_LIBS) ../../parser/libxf86config.a $(LOADERLIB) \
+	../../os-support/libxorgos.la ../../dummylib/libdummy-nonserver.a \
+	${SYS_LIBS}
+
+#if DoLoadableServer
+LDSRCS  = \
+	loader.c loadmod.c
+LOADERLIB = ../../loader/libloader.a
+#endif
+
+if USE_CURSES
+TEXTSRC = text-mode.c
+TEXTOBJ = text-mode.o
+CURSESDEFINES  = -DHAS_NCURSES
+endif
+
+if NEED_STRLCAT
+STRL_SRCS = $(top_srcdir)/os/strlcat.c $(top_srcdir)/os/strlcpy.c
+endif
+endif BUILD_XORGCFG
+
+xorgcfg_SOURCES =	\
+        accessx.c \
+        card-cfg.c \
+        cards.c \
+        config.c \
+        expert.c \
+        help.c \
+        interface.c \
+        keyboard-cfg.c \
+        $(LDSRCS)  \
+        monitor-cfg.c \
+        mouse-cfg.c \
+        options.c \
+        screen-cfg.c \
+        screen.c \
+        $(SNPRINTFSRCS) \
+        startx.c \
+        $(STRLSRCS) \
+        stubs.c \
+        $(TEXTSRC) \
+        vidmode.c \
+        xf86config.c \
+        card-cfg.h \
+        cards.h \
+        config.h \
+        help.h \
+        keyboard-cfg.h \
+        loader.h \
+        monitor-cfg.h \
+        mouse-cfg.h \
+        options.h \
+        screen-cfg.h \
+        screen.h \
+        stubs.h \
+        vidmode.h \
+        xf86config.h \
+	$(STRL_SRCS)
+
+BITMAPS = \
+        card.xbm \
+        keyboard.xbm \
+        monitor.xbm \
+        mouse.xbm \
+        left.xbm \
+        right.xbm \
+        up.xbm \
+        down.xbm \
+        wider.xbm \
+        narrower.xbm \
+        shorter.xbm \
+        taller.xbm
+
+PIXMAPS = \
+        card.xpm \
+        computer.xpm \
+        keyboard.xpm \
+        monitor.xpm \
+        mouse.xpm
+
+# Rules needed to cpp man page & app-defaults
+include $(top_srcdir)/cpprules.in
+
+if BUILD_XORGCFG
+XBMdir = $(includedir)/X11/bitmaps
+XPMdir = $(includedir)/X11/pixmaps
+
+XBM_DATA = $(BITMAPS)
+XPM_DATA = $(PIXMAPS)
+
+# App default files  (*.ad)
+
+appdefaultdir = @APPDEFAULTDIR@
+
+APPDEFAULTFILES = XOrgCfg
+
+appdefault_DATA = $(APPDEFAULTFILES)
+
+CPP_FILES_FLAGS = -D__VENDORNAME__="@VENDOR_STRING_SHORT@" \
+                  -D__VENDORVERS__="@VENDOR_MAN_VERSION@"
+
+# dear automake: it would be really nice if you would actually put things into
+# .SUFFIXES so i wouldnt' have to do this.
+XOrgCfg: XOrgCfg.pre
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < XOrgCfg.pre | $(CPP_SED_MAGIC) > $@
+
+# Man page
+appmandir = $(APP_MAN_DIR)
+
+appman_PRE = xorgcfg.man
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+
+all-local: $(appman_PRE) $(appman_DATA)
+
+BUILT_SOURCES = $(appman_PRE)
+CLEANFILES = $(APPDEFAULTFILES) $(BUILT_SOURCES) $(appman_DATA)
+
+SUFFIXES += .$(APP_MAN_SUFFIX) .man
+
+.man.$(APP_MAN_SUFFIX):
+	-rm -f $@
+	$(LN_S) $< $@
+
+endif BUILD_XORGCFG
+
+EXTRA_DIST = $(BITMAPS) $(PIXMAPS) XOrgCfg.pre xorgcfg.man.pre