File: remove-upstream-build-system.patch

package info (click to toggle)
tightvnc 1%3A1.3.10-10
links: PTS, VCS
area: main
in suites: forky, sid
size: 14,508 kB
sloc: ansic: 209,589; asm: 780; perl: 539; makefile: 533; sh: 267
file content (41956 lines) | stat: -rw-r--r-- 1,177,707 bytes
parent folder | download | duplicates (3)
Description: Remove upstream's entire build system
Forwarded: no
Author: Sven Geuer <debmaint@g-e-u-e-r.de>
Last-Update: 2021-05-15
--- a/Imakefile
+++ /dev/null
@@ -1,19 +0,0 @@
-#define IHaveSubdirs
-#define PassCDebugFlags
-
-SUBDIRS = libvncauth vncviewer vncpasswd vncconnect
-
-World:
-	make Makefiles
-	make depend
-	make all
-	@echo ""
-	@echo Built $(SUBDIRS).
-	@echo 'To build Xvnc, do "cd Xvnc", followed by "./configure" then "make"'
-	@echo ""
-
-libs:
-	@echo 'No libraries included.'
-
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
--- a/Xvnc/Imakefile
+++ /dev/null
@@ -1,192 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/137 1996/10/08 07:38:14 swick $
-XCOMM $XFree86: xc/Imakefile,v 3.11.2.2 1998/02/28 04:47:00 dawes Exp $
-#define IHaveSubdirs
-#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
-
-RELEASE = "Release 6.3"
-#ifndef OSName
-#define OSName Unknown Operating System!
-#endif
-
-#if !BuildServersOnly
-#if BuildFonts
-        FONTSDIR = fonts
-#endif
-#ifndef Win32Architecture
-        DOCSDIR = doc
-        NLSSUBDIR = nls
-#endif
-#endif
-
-        SUBDIRS = include config lib $(NLSSUBDIR) \
-                  programs $(FONTSDIR) $(DOCSDIR)
-  LNINSTALLDIRS = lib
-
-#if HasParallelMake
-#ifdef ParallelDefines
-        PARALLELOPTS = ParallelDefines
-#endif
-#endif
-
-MakeSubdirs($(SUBDIRS))
-
-MakeLintSubdirs($(LNINSTALLDIRS),install.ln,install.ln)
-
-MakeLintSubdirs($(LNINSTALLDIRS),external.ln,lintlib)
-
-DependSubdirs($(SUBDIRS))
-
-#define IHaveSpecialMakefileTarget
-
-#ifndef Win32Architecture
-#ifndef OS2Architecture
-VerifyOS::
-	@echo ""
-	@echo Building on OSName "("OSMajorVersion"."OSMinorVersion"."OSTeenyVersion")."
-	@echo ""
-#ifdef LinuxArchitecture
-	@echo libc version LinuxCLibMajorVersion"."LinuxCLibMinorVersion"."LinuxCLibTeenyVersion
-	@echo ""
-#endif
-
-includes::
-	MakeDir($(BUILDINCDIR))
-	MakeDir($(BUILDBINDIR))
-
-XCOMM
-XCOMM Watch out!!!  Make sure you do make includes after removing X11....
-XCOMM
-clean::
-	$(RM) -r $(BUILDINCDIR)
-	$(RM) -r $(BUILDLIBDIR)
-	$(RM) -r $(BUILDBINDIR)
-
-World::
-	$(MAKE) $(MFLAGS) $(MAKE_OPTS) $(PARALLELOPTS) all
-
-Everything::
-	@echo ""
-	@echo Rebuilding $(RELEASE) of the X Window System.
-	@echo ""
-	@date
-	@echo ""
-	cd $(IMAKESRC) && if [ -f Makefile ]; then \
-	    $(MAKE) $(MFLAGS) BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \
-	else \
-	    $(MAKE) $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; \
-	fi
-	$(MAKE) $(MFLAGS) $(MAKE_OPTS) Makefiles
-	$(MAKE) $(MFLAGS) $(MAKE_OPTS) includes
-	$(MAKE) $(MFLAGS) $(MAKE_OPTS) depend
-	$(MAKE) $(MFLAGS) $(MAKE_OPTS) $(WORLDOPTS)
-	@echo ""
-	@date
-	@echo ""
-	@echo Rebuild of $(RELEASE) of the X Window System complete.
-	@echo ""
-
-XCOMM clean out link tree looking for stuff that should get checked in
-dangerous_strip_clean::
-	$(MAKE) -k clean
-	find . -type l -exec rm {} \;
-	find . \( \! \( -type d -o -name Makefile \) \) -print
-
-#else /* OS2Architecture */
-VerifyOS::
-	@echo :
-	@echo Building on OSName.
-	@echo :
-
-includes::
-	MakeDir($(subst /,\,$(BUILDINCDIR)))
-
-XCOMM
-XCOMM Watch out!!!  Make sure you do make includes after removing X11....
-XCOMM
-clean::
-	$(RM) -r $(BUILDINCDIR)
-	$(RM) -r $(BUILDLIBDIR)
-
-Everything::
-	@echo :
-	@echo Building $(RELEASE) of the X Window System on OS/2
-	@echo :
-	@echo :
-	\indir $(IMAKESRC) $(MAKE) $(MFLAGS) SHELL= -f Makefile.ini BOOTSTRAPCFLAGS=-Zexe
-	if exist Makefile.bak del Makefile.bak
-	if exist MAkefile ren Makefile Makefile.bak
-	$(MAKE) $(MFLAGS) -f Makefile.bak Makefile
-	$(MAKE) $(MFLAGS) SHELL= VerifyOS
-	$(MAKE) $(MFLAGS) SHELL= Makefiles
-	$(MAKE) $(MFLAGS) SHELL= clean
-	$(MAKE) $(MFLAGS) SHELL= includes
-	$(MAKE) $(MFLAGS) SHELL= depend
-	$(MAKE) $(MFLAGS)
-	@echo :
-	@echo :
-	@echo Rebuild of $(RELEASE) of the X Window System complete.
-	@echo :
-
-#ifdef ProjectRoot
-install::
-	MakeDir($(subst /,\,$(PROJECTROOT)))
-#endif
-
-install::
-	MakeDir($(subst /,\,$(INCROOT)))
-	MakeDir($(subst /,\,$(USRLIBDIR)))
-	MakeDir($(subst /,\,$(LIBDIR)))
-
-#endif
-#else /* not Win32Architecture else */
-VerifyOS::
-	@echo :
-	@echo Building on OSName.
-	@echo :
-
-includes::
-	MakeDir($(BUILDINCDIR:/=\))
-
-XCOMM
-XCOMM Watch out!!!  Make sure you do make includes after removing X11....
-XCOMM
-clean::
-	RmTreeCmd $(BUILDINCDIR:/=\)
-	RmTreeCmd $(BUILDLIBDIR:/=\)
-
-Everything::
-	@echo :
-	@echo Rebuilding $(RELEASE) of the X Window System.
-	@echo :
-	@echo :
-	cd $(IMAKESRC)
-	$(MAKE) $(MFLAGS) -f Makefile.ini imake.exe
-	cd ..\..
-	$(MAKE) $(MFLAGS) $(MAKE_OPTS) Makefiles
-	$(MAKE) $(MFLAGS) $(MAKE_OPTS) includes
-	$(MAKE) $(MFLAGS) $(MAKE_OPTS) depend
-	$(MAKE) $(MFLAGS) $(MAKE_OPTS) $(WORLDOPTS)
-	@echo :
-	@echo :
-	@echo Rebuild of $(RELEASE) of the X Window System complete.
-	@echo :
-
-#ifdef ProjectRoot
-install::
-	MakeDir($(PROJECTROOT:/=\))
-#endif
-
-install::
-	MakeDir($(INCROOT:/=\))
-	MakeDir($(USRLIBDIR:/=\))
-	MakeDir($(LIBDIR:/=\))
-
-#endif /* not Win32Architecture else */
-
-#ifndef MakeManKeywords
-#define MakeManKeywords YES	/* install.man rebuilds "man -k" database? */
-#endif
-
-#undef BootstrapCleanSubdirs
-#define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)"
-BOOTSTRAPSUBDIRS = imake makedepend
--- a/Xvnc/Makefile
+++ /dev/null
@@ -1,193 +0,0 @@
-# $XConsortium: Makefile /main/36 1996/11/13 14:42:50 lehors $
-# $XFree86: xc/Makefile,v 3.6.2.2 1998/02/07 00:44:32 dawes Exp $
-
-# Luna users will need to either run make as "make MAKE=make"
-# or add "MAKE = make" to this file.
-
-RELEASE = "Release 6.3"
-SHELL = /bin/sh
-RM = rm -f
-MV = mv
-WORLDOPTS = -k
-WIN32WORLDOPTS = -i
-TOP = .
-CURRENT_DIR = .
-CONFIGSRC = $(TOP)/config
-IMAKESRC = $(CONFIGSRC)/imake
-DEPENDSRC = $(CONFIGSRC)/makedepend
-DEPENDTOP = ../..
-IMAKETOP = ../..
-IRULESRC = $(CONFIGSRC)/cf
-IMAKE = $(IMAKESRC)/imake
-IMAKE_CMD = $(IMAKE) -I$(IRULESRC) $(IMAKE_DEFINES)
-MAKE_OPTS = -f xmakefile
-MAKE_CMD = $(MAKE) $(MAKE_OPTS)
-FLAGS = $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"
-
-all:
-	@$(MAKE_CMD) xmakefile-exists || $(MAKE) all-initial
-	@$(MAKE_CMD) $@
-
-all-initial:
-	@echo Please use make World, or on NT use nmake World.Win32.
-	@echo Check the configuration parameters in the $(IRULESRC) directory,
-	@echo and pass BOOTSTRAPCFLAGS if necessary.
-	@echo Read the release notes carefully before proceeding.
-	@echo Do not name your log file make.log or it will be deleted.
-
-World:
-	@echo ""
-	@echo Building $(RELEASE) of the X Window System.
-	@echo ""
-	@case "x$(BOOTSTRAPCFLAGS)" in x) \
-	echo I hope you checked the configuration parameters in $(IRULESRC) ; \
-	echo to see if you need to pass BOOTSTRAPCFLAGS. ; \
-	echo "" ; \
-	;; esac;
-	@date
-	@echo ""
-	@if [ ! -f $(IRULESRC)/host.def ]; then \
-	    if [ ! -f $(TOP)/lib/Xt/Imakefile ]; then \
-		echo "#define BuildServersOnly YES" > $(IRULESRC)/host.def; \
-	    else \
-		if [ ! -f $(TOP)/fonts/Imakefile ]; then \
-		    echo "#define BuildFonts NO" > $(IRULESRC)/host.def; \
-		else \
-		    echo "" > $(IRULESRC)/host.def; \
-		fi \
-	    fi \
-	fi
-	cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean
-	$(MAKE) $(MFLAGS) Makefile.boot
-	$(MAKE_CMD) $(MFLAGS) VerifyOS
-	$(MAKE_CMD) $(MFLAGS) Makefiles
-	$(MAKE_CMD) $(MFLAGS) clean BOOTSTRAPSUBDIRS=
-	$(MAKE_CMD) $(MFLAGS) includes
-	$(MAKE_CMD) $(MFLAGS) depend
-	$(MAKE_CMD) $(MFLAGS) $(WORLDOPTS) World
-	@echo ""
-	@date
-	@echo ""
-	@echo Full build of $(RELEASE) of the X Window System complete.
-	@echo ""
-
-.PRECIOUS: Makefile
-
-# This is just a sequence of bootstrapping steps we have to do.
-# The steps are listed as separate targets so clearmake can wink in
-# the Makefile.proto files.
-Makefile.boot: imake.proto $(DEPENDSRC)/Makefile.proto depend.bootstrap $(IMAKESRC)/Makefile.proto imake.bootstrap
-
-imake.proto:
-	cd $(IMAKESRC) && $(MAKE) $(FLAGS)
-	$(RM) $(DEPENDSRC)/Makefile.proto
-
-$(DEPENDSRC)/Makefile.proto:
-	$(IMAKE_CMD) -s $(DEPENDSRC)/Makefile.proto -f $(DEPENDSRC)/Imakefile -DTOPDIR=$(DEPENDTOP) -DCURDIR=$(DEPENDSRC)
-
-depend.bootstrap:
-	cd $(DEPENDSRC) && $(RM) -r Makefile Makefile.dep makedepend *.o bootstrap
-	cd $(DEPENDSRC) && $(MAKE) -f Makefile.proto bootstrap
-
-$(IMAKESRC)/Makefile.proto:
-	$(IMAKE_CMD) -s $(IMAKESRC)/Makefile.proto -f $(IMAKESRC)/Imakefile -DTOPDIR=$(IMAKETOP) -DCURDIR=$(IMAKESRC)
-
-imake.bootstrap:
-	cd $(IMAKESRC) && $(MAKE) -f Makefile.proto bootstrapdepend
-	cd $(IMAKESRC) && $(MAKE) $(FLAGS) bootstrap
-	cd $(IMAKESRC) && $(MAKE) -f Makefile.proto all 
-	-@if [ -f xmakefile ]; then set -x; \
-	  $(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak; \
-	  else exit 0; fi
-	$(MAKE) $(MFLAGS) xmakefile
-
-Makefile::
-	$(MAKE) $(MFLAGS) xmakefile
-
-xmakefile: Imakefile
-	$(IMAKE_CMD) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
-
-World.Win32:
-	@echo :
-	@echo Building $(RELEASE) of the X Window System.
-	@echo :
-	@echo :
-	-@if not exist $(IRULESRC)\host.def echo > $(IRULESRC)\host.def
-	cd $(IMAKESRC)
-	$(MAKE) -f Makefile.ini clean.Win32
-	$(MAKE) -f Makefile.ini imake.exe
-	cd ..\..
-	-if exist xmakefile.bak del xmakefile.bak
-	-if exist xmakefile ren xmakefile xmakefile.bak
-	$(IMAKE:/=\) -s xmakefile -I$(IRULESRC) $(IMAKE_DEFINES) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
-	$(MAKE_CMD) $(MFLAGS) VerifyOS
-	$(MAKE_CMD) $(MFLAGS) Makefiles
-	$(MAKE_CMD) $(MFLAGS) clean
-	cd $(CONFIGSRC)\util
-	$(MAKE) mkdirhier.exe
-	cd ..\..
-	$(MAKE_CMD) $(MFLAGS) includes
-	$(MAKE_CMD) $(MFLAGS) depend
-	$(MAKE_CMD) $(MFLAGS) $(WIN32WORLDOPTS)
-	@echo :
-	@echo :
-	@echo Full build of $(RELEASE) of the X Window System complete.
-	@echo :
-
-World.OS2:
-	@echo :
-	@echo Building $(RELEASE) of the X Window System on OS/2.
-	@echo :
-	@echo :
-	-@if not exist $(IRULESRC)\host.def echo > $(IRULESRC)\host.def
-	\indir $(IMAKESRC) $(MAKE) SHELL= -f Makefile.ini clean.os2
-	\indir $(IMAKESRC) $(MAKE) SHELL= CC=gcc -f Makefile.ini imake.os2
-	-if exist Makefile.bak del Makefile.bak
-	-if exist Makefile ren Makefile Makefile.bak
-	$(subst /,\,$(IMAKE)) -I$(IRULESRC) $(IMAKE_DEFINES) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
-	$(MAKE) $(MFLAGS) VerifyOS
-	$(MAKE) $(MFLAGS) Makefiles
-	$(MAKE) $(MFLAGS) clean
-	$(MAKE) $(MFLAGS) includes
-	$(MAKE) $(MFLAGS) depend
-	$(MAKE) $(MFLAGS)  
-	@echo :
-	@echo :
-	@echo Full build of $(RELEASE) of the X Window System complete.
-	@echo :
-
-# don't allow any default rules in this Makefile
-.SUFFIXES:
-# quiet "make" programs that display a message if suffix list empty
-.SUFFIXES: .Dummy
-
-# a copy of every rule that might be invoked at top level
-
-clean:
-	    $(MAKE_CMD) $@
-dangerous_strip_clean:
-	    $(MAKE_CMD) $@
-depend:
-	    $(MAKE_CMD) $@
-Everything:
-	    $(MAKE_CMD) $@
-external.ln:
-	    $(MAKE_CMD) $@
-includes:
-	    $(MAKE_CMD) $@
-install.linkkit:
-	    $(MAKE_CMD) $@
-install.ln:
-	    $(MAKE_CMD) $@
-install.man:
-	    $(MAKE_CMD) $@
-install:
-	    $(MAKE_CMD) $@
-Makefiles:
-	    $(MAKE_CMD) $@
-man_keywords:
-	    $(MAKE_CMD) $@
-tags:
-	    $(MAKE_CMD) $@
-VerifyOS:
-	    $(MAKE_CMD) $@
--- a/Xvnc/config/Imakefile
+++ /dev/null
@@ -1,12 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/6 1996/09/28 16:04:42 rws $
-#define IHaveSubdirs
-#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
-
-#undef BootstrapCleanSubdirs
-#define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)"
-
-BOOTSTRAPSUBDIRS = imake makedepend
-SUBDIRS = cf $(BOOTSTRAPSUBDIRS) util
-
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
--- a/Xvnc/config/cf/Amoeba.cf
+++ /dev/null
@@ -1,430 +0,0 @@
-XCOMM platform:  $XConsortium: Amoeba.cf /main/12 1996/09/28 16:04:48 rws $
-XCOMM platform:  $XFree86: xc/config/cf/Amoeba.cf,v 3.9 1996/12/23 05:50:00 dawes Exp $
-
-/*  The presence of this configuration file in the X distribution
- *  does not imply full support for the system it describes.
- *  Additional patches from The XFree86 Project, Inc. will be required to 
- *  compile the X distribution on Amoeba.  According to them, these patches
- *  will also be made available at the regular Amoeba ftp site
- *  ftp.am.cs.vu.nl.
- */
-
-/*
- * Configuration file for Amoeba 5.2
- */
-
-#ifndef OSName
-#define OSName                  Amoeba 5.2
-#endif
-XCOMM operating system:  OSName
-#ifndef OSMajorVersion
-#define OSMajorVersion          5
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion          2
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion          0
-#endif
-#ifndef OSVendor
-#define OSVendor                Vrije Universiteit
-#endif
-
-#define AmoebaArchitecture	YES
-
-/* Configuration defaults */
-#ifndef AmoebaTop
-#define AmoebaTop		__AM_TOP__
-#endif
-#ifndef AmoebaBin
-#define AmoebaBin		$(ATOP)/bin.sun4
-#endif
-#ifndef AmoebaConf
-#define AmoebaConf		__AM_CONF__
-#endif
-
-#define HasNdbm			YES
-#define NeedSdbm		YES
-#define HasShm			NO
-#define HasSecureRPC		NO
-#define SetTtyGroup		NO
-#define HasPutenv		YES
-#define HasSockets              NO
-#define HasStreams              NO
-
-#if defined(Sun3Architecture) || defined(SparcArchitecture)
-#define XsunAmoebaServer	YES
-#define XsunAmoebaMonoServer	YES
-#endif
-
-#define BuildFonts              NO
-#define BuildFontServer         NO
-#define BuildPexExt		NO
-#define BuildXIE		NO
-
-#define YaccCmd                 byacc
-#define TermcapLibrary          /* in libajax */
-#define LexLib			/* not needed */
-
-#define PexCCOptions		DefaultCCOptions
-#define ServerOSDefines		XFree86ServerOSDefines
-
-#define UsrLibDir               $(DESTDIR)/profile/module/x11/lib
-#define LibDir                  $(DESTDIR)/profile/module/x11/lib
-#define ManDirectoryRoot        $(DESTDIR)/profile/module/x11/man
-#define BinDir                  $(DESTDIR)/profile/module/x11/bin
-#define IncRoot                 $(DESTDIR)/profile/module/x11/include
-#define FontDir                 $(DESTDIR)/profile/module/x11/fonts/$(ARCH)
-#define DefaultRGBDatabase      $(DESTDIR)/profile/module/x11/lib/rgb/$(ARCH)/rgb
-
-#define ManSuffix               1
-#define ManPath                 ManDirectoryRoot
-#define XmanLocalSearchPath     ManDirectoryRoot
-
-#define DefaultUserPath         :/bin:$(BINDIR)
-#define DefaultSystemPath       /bin:$(BINDIR):
-
-#define StandardIncludes        -I$(ATOP)/src/h \
-				-I$(ATOP)/src/h/posix \
-				-I$(ATOP)/src/h/posix/machdep/$(ARCH) \
-				-I$(ATOP)/src/h/machdep/arch/$(ARCH) \
-				-I$(ATOP)/src/h/toolset/$(TOOLSET)
-
-#define Malloc0ReturnsNull      YES
-#define ServerInstallFlags      -s 32
-#define FontDefines             -DFONT_SNF
-#define ConnectionFlags         -DAMTCPCONN -DAMRPCCONN
-#define ServerXdmcpDefines	/* no -DXDMCP */
-#define UseRgbTxt		YES
-#define NdbmDefines		-DSDBM -DNDBM -I$(XINCLUDESRC)
-#define DBMLibrary		/* $(LIBSRC)/sdbm/libsdbm.a */
-
-#if defined(i386Architecture)
-#ifndef AckToolset
-#define AckToolset              YES
-#define ExtraFPLoadFlags	-fp
-#endif
-#define XF86MonoServer		YES
-#endif
-
-#if defined(Sun3Architecture)
-#ifndef AckToolset
-#define AckToolset              YES
-#endif
-#endif
-
-#if AckToolset
-#define CcCmd                   ack
-#define ServerCcCmd             ack
-#define LdCmd                   ack
-#define AckArchOption		-mam_$(ARCH)
-#define DefaultCCOptions        AckArchOption
-#define LibraryCCOptions        AckArchOption
-#define LdCombineFlags          -Rled-r -c.out
-#define ArCmd 			aal clrv
-#define RanlibCmd		/bin/true
-#define AsCmd			AmoebaConf/$(ARCH).$(TOOLSET)/toolset/do_as AckArchOption
-#define AsIncl			-I$(ATOP)/src/h/machdep/arch/$(ARCH)
-#define AsmDefines		-DACK_ASSEMBLER
-#define LdPreLib		/**/
-#define LdPostLib		/**/
-#endif
-
-#if defined(SparcArchitecture)
-#define AllocateLocalDefines	-DINCLUDE_ALLOCA_H
-
-#define CcCmd                   cc
-#define ServerCcCmd             cc
-#define LdCmd                   AmoebaConf/$(ARCH).$(TOOLSET)/toolset/do_gld
-#define DefaultCCOptions        -sun4
-#define LibraryCCOptions        -sun4
-#define AmoebaCompilerDefs	-Usun
-#define ServerExtraDefines	AllocateLocalDefines
-#define LdPostLib		/**/
-#endif
-
-#ifndef AmoebaCompilerDefs
-#define AmoebaCompilerDefs	/**/
-#endif
-
-#define CommonAmoebaDefines     -DAMOEBA -D$(ARCH) AmoebaCompilerDefs
-#define StandardDefines         CommonAmoebaDefines
-#define StandardCppDefines      StandardDefines
-
-#ifndef ExtraFPLoadFlags
-#define ExtraFPLoadFlags
-#endif
-#define MathLibrary		$(ALIB)/math/libmath.a
-#define OSLibraries             $(ALIB)/ajax/libajax.a \
-				$(ALIB)/amoeba/libamoeba.a \
-				MathLibrary \
-				ExtraFPLoadFlags
-#define ServerExtraSysLibs	$(CBRT) OSLibraries
-#define ExtraLoadFlags		OSLibraries
-
-ATOP            = AmoebaTop
-ALIB            = AmoebaConf/$(ARCH).$(TOOLSET)/lib
-#if AckToolset 
-/* The ACK toolset already links in the appropriate head.o by default */
-HEAD            =
-#else
-HEAD            = $(ALIB)/head/head.o
-#endif
-
-ABIN            = AmoebaBin
-AINSTALL        = /bin/sh $(CONFIGSRC)/util/aminstall.sh $(ABIN)
-AINSTALLFLAGS   =
-TOB             = /bin/sh $(CONFIGSRC)/util/aminstall.sh $(ABIN)
-MKXDIRHIER      = /bin/sh $(CONFIGSRC)/util/ammkdirhier.sh $(ABIN)
-
-/* Make wizardy: */
-COMPILE.c=$(CC) $(CFLAGS) $(CPPFLAGS) -c
-LINK.c=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
-
-#if defined(i386Architecture)
-ARCH            = i80386
-TOOLSET         = ack
-ALDFLAGS        = /* -mam_i80386 now in CCopts */ -.c -Rcv-s32
-
-#include <xfree86.cf>
-#endif
-
-#if defined(Sun3Architecture)
-ARCH            = mc68000
-TOOLSET         = ack
-ALDFLAGS        =  -.c -Rcv-s32
-#endif
-
-#if defined(SparcArchitecture)
-ARCH            = sparc
-TOOLSET         = sun
-SPARCLIBDIR     = AmoebaBin/gnu/sparc
-ALDFLAGS        = -mam_sparc -n -Ttext 40000 -Bstatic -e start -L$(SPARCLIBDIR)
-#endif
-
-#define BootstrapCFlags		-DAMOEBA -DCROSS_$(ARCH) -DCROSS_COMPILE
-
-/*
- * The rest of this files consists of rules to allow cross-compilation
- * and installation of binaries and data files from the Unix host to
- * the Amoeba file system.
- */
-
-/* #ifdef CROSS_COMPILING */
-#define CrossCompiling          YES
-
-#define HostLinkRule(target, flags, src, libs)  cc -o target src
-
-#define LinkRule(program,options,objects,libraries) \
-$(LD) $(ALDFLAGS) $(HEAD) -o program options objects libraries $(EXTRA_LOAD_FLAGS)
-
-/* ComplexHostProgramTarget - Compile a program such that we can run
- * it on this host, i.e., don't use the default cross compiler.
- */
-#ifndef ComplexHostProgramTarget
-#define	ComplexHostProgramTarget(program)				@@\
-              CC=cc							@@\
-    STD_INCLUDES=							@@\
-          CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS)		@@\
-EXTRA_LOAD_FLAGS=							@@\
-        PROGRAM = program						@@\
-									@@\
-AllTarget(program)							@@\
-									@@\
-program: $(OBJS) $(DEPLIBS)						@@\
-	RemoveTargetProgram($@)						@@\
-	HostLinkRule($@,$(_NOOP_),$(OBJS),$(DEPLIBS) $(LOCAL_LIBRARIES)) @@\
-									@@\
-DependTarget()								@@\
-									@@\
-LintTarget()								@@\
-									@@\
-clean::									@@\
-	RemoveFile(ProgramTargetName(program))
-#endif /* ComplexHostProgramTarget */
-
-#ifndef SimpleHostProgramTarget
-#define SimpleHostProgramTarget(program)				@@\
-           OBJS = program.o						@@\
-           SRCS = program.c						@@\
-									@@\
-ComplexHostProgramTarget(program)
-#endif /* SimpleHostProgramTarget */
-
-
-#ifndef Concat
-#if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp)
-#define Concat(a,b)a##b
-#else
-#define Concat(a,b)a/**/b
-#endif
-#endif
-
-/*
- * LintLibReferences - variables for lint libraries
- */
-#ifndef LintLibReferences
-#define LintLibReferences(varname,libname,libsource)			@@\
-Concat(LINT,varname) = Concat(libsource/llib-,libname.ln)
-#endif
-
-/*
- * UnsharedLibReferences - variables for unshared libraries
- */
-#ifndef UnsharedLibReferences
-#define UnsharedLibReferences(varname,libname,libsource)		@@\
-Concat3(DEP,varname,LIB) = Concat($(BUILDLIBDIR)/lib,libname.a)		@@\
-     Concat(varname,LIB) = Concat($(BUILDLIBDIR)/lib,libname.a)		@@\
-LintLibReferences(varname,libname,libsource)
-#endif
-
-#ifndef InstallLibrary
-#define	InstallLibrary(libname,dest)					@@\
-install:: Concat(lib,libname.a)						@@\
-	@echo '** TODO: Install Library ' Concat(lib,libname.a)
-#endif /* InstallLibrary */
-
-#ifndef MergeIntoInstalledLibrary
-#define MergeIntoInstalledLibrary(tolib,fromlib)			@@\
-install::  fromlib							@@\
-	@echo '** TODO: merge ' fromlib into tolib
-#endif /* MergeIntoInstalledLibrary */
-
-#ifndef InstallLibraryAlias
-#define	InstallLibraryAlias(libname,alias,dest)				@@\
-install::								@@\
-	@echo '** TODO: Install lib alias ' libname alias dest
-#endif /* InstallLibraryAlias */
-
-#ifndef InstallLintLibrary
-#define	InstallLintLibrary(libname,dest)				@@\
-install.ln:: Concat(llib-l,libname.ln)					@@\
-	@echo '** TODO: Install lintlib ' Concat(llib-l,libname.ln)
-#endif /* InstallLintLibrary */
-
-#ifndef InstallManPageLong
-#define	InstallManPageLong(file,destdir,dest)				@@\
-install.man:: file.man							@@\
-	@echo '** TODO: Install man page ' file.man
-#endif /* InstallManPageLong */
-
-#ifndef InstallGenManPageLong
-#define	InstallGenManPageLong(file,destdir,dest,suffix)			@@\
-install.man:: file.man							@@\
-	@echo '** TODO: Install man page ' file.man
-#endif /* InstallGenManPageLong */
-
-#ifndef InstallManPageAliases
-#define	InstallManPageAliases(file,destdir,aliases)			@@\
-install.man::								@@\
-	@(TMP=/tmp/tmp.$$$$; \						@@\
-	$(RM) $${TMP}; \						@@\
-	echo .so `basename destdir`/file.$(MANSUFFIX) > $${TMP}; \	@@\
-	for i in aliases; do (set -x; \					@@\
-	$(TOB) $${TMP} $(DESTDIR)destdir/$$i.$(MANSUFFIX)); \ 		@@\
-	done; \								@@\
-	$(RM) $${TMP})
-#endif /* InstallManPageAliases */
-
-#ifndef InstallGenManPageAliases
-#define	InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
-install.man::								@@\
-	@(TMP=/tmp/tmp.$$$$; \						@@\
-	$(RM) $${TMP}; \						@@\
-	echo .so `basename destdir`/file.suffix > $${TMP}; \		@@\
-	for i in aliases; do (set -x; \					@@\
-	$(TOB) $${TMP} $(DESTDIR)destdir/$$i.suffix); \ 		@@\
-	done; \								@@\
-	$(RM) $${TMP})
-#endif /* InstallGenManPageAliases */
-
-#ifndef InstallNamedNonExec
-#define	InstallNamedNonExec(srcname,dstname,dest)			@@\
-install:: srcname							@@\
-	$(MKXDIRHIER) $(DESTDIR)dest					@@\
-	$(TOB) srcname $(DESTDIR)dest/dstname
-#endif /* InstallNamedNonExec */
-
-#ifndef InstallNonExecFile
-#define	InstallNonExecFile(file,dest)					@@\
-install:: file								@@\
-	$(MKXDIRHIER) dest						@@\
-	$(TOB) file dest/file
-#endif /* InstallNonExecFile */
-
-#ifndef InstallNonExec
-#define	InstallNonExec(file,dest)					@@\
-install:: file								@@\
-	$(TOB) file dest/file
-#endif /* InstallNonExec */
-
-#ifndef InstallProgramWithFlags
-#define InstallProgramWithFlags(program,dest,flags)			@@\
-install:: program							@@\
-	$(MKXDIRHIER) dest/program					@@\
-	$(AINSTALL) $(AINSTALLFLAGS) program dest/program/pd.$(ARCH)
-#endif /* InstallProgramWithFlags */
-
-#ifndef InstallScript
-#define	InstallScript(program,dest)					@@\
-install:: program.script						@@\
-	$(TOB) program.script dest/program
-#endif /* InstallScript */
-
-#ifndef InstallNamedScript
-#define	InstallNamedScript(srcname,dstname,dest)			@@\
-install:: srcname							@@\
-	$(TOB) srcname dest/dstname
-#endif /* InstallNamedScript */
-
-#ifndef InstallNamedProg
-#define	InstallNamedProg(srcname,dstname,dest)				@@\
-install:: srcname							@@\
-	$(MKXDIRHIER) $(DESTDIR)dest/dstname				@@\
-	$(AINSTALL) $(AINSTALLFLAGS) srcname $(DESTDIR)dest/dstname/pd.$(ARCH)
-#endif /* InstallNamedProg */
-
-#ifndef InstallMultipleDestFlags
-#define InstallMultipleDestFlags(step,list,dest,flags)			@@\
-step:: list								@@\
-	$(MKXDIRHIER) $(DESTDIR)dest					@@\
-	@case '${MFLAGS}' in *[i]*) set +e;; esac; \			@@\
-	for i in list; do \						@@\
-		(set -x; $(TOB) $$i dest/$$i); \			@@\
-	done
-#endif /* InstallMultipleDestFlags */
-
-#ifndef InstallMultipleProg
-#define InstallMultipleProg(list,dest)					@@\
-install:: list								@@\
-	@case '${MFLAGS}' in *[i]*) set +e;; esac; \			@@\
-	for i in list; do \						@@\
-	    (set -x; \ 							@@\
-	  	$(MKXDIRHIER) $(DESTDIR)dest/$$i; \			@@\
-		$(AINSTALL) $(AINSTALLFLAGS) $$i dest/$$i/pd.$(ARCH));\	@@\
-	done
-#endif /* InstallMultipleProg */
-
-#ifndef InstallAppDefaults
-#if InstallAppDefFiles
-#define	InstallAppDefaults(class)					@@\
-install:: class.ad							@@\
-	$(MKXDIRHIER) $(XAPPLOADDIR)					@@\
-	$(TOB) class.ad $(DESTDIR)$(XAPPLOADDIR)/class
-#else
-#define	InstallAppDefaults(class)
-#endif /* InstallAppDefFiles */
-#endif /* InstallAppDefaults */
-
-#ifndef InstallAppDefaultsLong
-#if InstallAppDefFiles
-#define	InstallAppDefaultsLong(file,class)				@@\
-install:: file.ad							@@\
-	$(MKXDIRHIER) $(DESTDIR)$(XAPPLOADDIR)				@@\
-	$(TOB) file.ad $(DESTDIR)$(XAPPLOADDIR)/class
-#else
-#define	InstallAppDefaultsLong(file,class)
-#endif /* InstallAppDefFiles */
-#endif /* InstallAppDefaultsLong */
-
-/* #endif CROSS_COMPILE */
--- a/Xvnc/config/cf/DGUX.cf
+++ /dev/null
@@ -1,22 +0,0 @@
-XCOMM platform:  $XConsortium: DGUX.cf /main/5 1996/09/28 16:04:56 rws $
-
-#ifndef OSName
-#define OSName            DG/UX 4.32
-#endif
-XCOMM operating system:  OSName
-#ifndef OSMajorVersion
-#define OSMajorVersion    4
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion    32
-#endif
-
-#define BootstrapCFlags   -DDGUX
-#define StandardDefines   -DDGUX -DSYSV
-#define SystemV           YES
-#define HasPutenv         YES
-#define HasGcc            YES
-#define BuildServer       NO
-#define UNCOMPRESSPATH /usr/bin/X11/uncompress
-
-#define ExtraFilesToClean *.lg
--- a/Xvnc/config/cf/FreeBSD.cf
+++ /dev/null
@@ -1,364 +0,0 @@
-XCOMM platform:  $TOG: FreeBSD.cf /main/18 1997/06/12 07:40:35 kaleb $
-XCOMM platform:  $XFree86: xc/config/cf/FreeBSD.cf,v 3.58.2.11 1998/03/01 01:08:59 dawes Exp $
-
-#ifndef OSName
-#define OSName			DefaultOSName
-#endif
-#ifndef OSVendor
-#define OSVendor		/**/
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion		DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion		DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion		DefaultOSTeenyVersion
-#endif
-XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-
-#define HasGcc			YES
-#define HasGcc2			YES
-#define HasCplusplus		YES
-#define HasGcc2ForCplusplus	YES
-#define GccUsesGas		YES
-#define UseGas			YES
-#define GnuCpp			YES
-#define HasNdbm         	YES
-#define HasPutenv       	YES
-#define HasSnprintf		YES
-#define HasBSD44Sockets 	YES
-#ifndef HasLibCrypt
-# define HasLibCrypt		YES
-#endif
-#ifndef HasShm
-# define HasShm          	YES
-#endif
-#define HasWChar32		YES
-
-#define AvoidNullMakeCommand	YES
-#define StripInstalledPrograms	YES
-#define CompressAllFonts	YES
-#define Malloc0ReturnsNull	YES
-#define NeedConstPrototypes	YES
-#define NeedFunctionPrototypes	YES
-#define NeedNestedPrototypes	YES
-#define NeedVarargsPrototypes	YES
-#define NeedWidePrototypes	NO
-
-#define MkdirHierCmd		mkdir -p
-
-#define CcCmd			cc
-#define CppCmd			/usr/libexec/cpp
-#define PreProcessCmd		CppCmd
-#define StandardCppDefines	-traditional
-#if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit)
-#define DefaultCCOptions	/**/
-#else
-#define DefaultCCOptions	-ansi -pedantic -Dasm=__asm
-#endif
-#ifndef ExtraLibraries
-#define ExtraLibraries		/**/
-#endif
-#ifndef UseGnuMalloc
-/* 2.2 doesn't really have GnuMalloc */
-#if OSMajorVersion < 2 || (OSMajorVersion == 2 && OSMinorVersion < 2)
-#define UseGnuMalloc		YES
-#else
-#define UseGnuMalloc		NO
-#endif
-#endif
-
-/* 2.2.2 and later has setusercontext() */
-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 2) || \
-     (OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 2)
-#define HasSetUserContext	YES
-#endif
-
-/* 
- * This doesn't work the way it does on every other system. On FreeBSD it's
- * only a "hint, not a demand", whatever that means. Note that this is not 
- * what it says in the ld and ld.so man pages, which are rather vague on the
- * matter.
- *
- * But we do know that if a) you do what the X Project team does and set your 
- * ProjectRoot to something like "/X11", and b) you have other X libraries, 
- * e.g. in /usr/X11R6/lib, and you have added /usr/X11R6/lib to your 
- * ld.so.cache with ldconfig, then any programs linked with this "hint" will
- * find that ld.so ignores the "hint" at runtime and loads the libraries in 
- * the ld.so.cache, i.e.the wrong ones, instead! Empirically we find that
- * the run-path is only used as a last resort to find the libraries, after
- * the LD_LIBRARY_PATH and ld.so.cache.
- *
- * N. B. to FreeBSD users who are not familiar with the semantics of the run-
- * path on other systems. The run-path is akin to a per-program ld.so.cache. 
- * If a program is linked with a run-path, that run-path should take 
- * precedence over _everything_ else! In my opinion ldconfig and the 
- * ld.so.cache should be deprecated immediately now that FreeBSD has run-
- * paths. Any program that needs libraries that are outside the "well known" 
- * locations should be linked with a run-path.
- *
- * All of which begs the question: If this option doesn't work in any useful
- * way, why did they (FreeBSD) bother to add it? It would be nice if FreeBSD
- * would fix ld.so so that run-paths are truly useful.
- *
- * Using run-paths is added with the intent that vendors who ship X for 
- * FreeBSD should use it too. Once everyone uses it then there will be no 
- * reason for FreeBSD to assume that it knows where X libraries are installed 
- * and they can remove it from the list of directories they add to ld.so.cache 
- * in their /etc/rc file.
- */
-#if OSMajorVersion > 2 || (OsMajorVersion == 2 && OSMinorVersion >= 2)
-#ifndef ExtraLoadFlags
-#define ExtraLoadFlags		-Wl,-R,$(USRLIBDIRPATH)
-#endif
-#endif
-
-#ifndef GnuMallocLibrary
-#define GnuMallocLibrary	-lgnumalloc
-#endif
-
-#if (OSMajorVersion > 2) || (OSMajorVersion == 2 && OSMinorVersion >= 2) \
-	|| (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 6)
-/* 2.1.6 and 2.2 have libz */
-#ifndef HasZlib
-#define HasZlib		YES
-#endif
-#endif
-
-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2) || \
-    (OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion > 2)
-/*
- * FreeBSD 2.2.5 or later.
- *
- * Don't make any assumptions about the version of Tcl in the base OS.
- * These settings assume that the tcl-7.6 and tk-4.2 packages have been
- * installed.
- *
- * Note the static libs in some versions of the FreeBSD packages are
- * broken.  The symptom of this is unresolved symbols when linking
- * XF86Setup.  If you run into this problem, either build your own
- * static libs from the standard Tcl and Tk source, or change the
- * definitions of XF86SetupUsesStatic{Tcl,Tk}.  The latter is not
- * recommended for binaries that are going to be redistributed.
- */
-#ifndef TkLibName
-#define TkLibName		tk42
-#endif
-#ifndef TkIncDir
-#define TkIncDir		/usr/local/include/tk4.2
-#endif
-#ifndef TclLibName
-#define TclLibName		tcl76
-#endif
-#ifndef TclIncDir
-#define TclIncDir		/usr/local/include/tcl7.6
-#endif
-#else
-#if OSMajorVersion == 2 && OSMinorVersion == 2
-/*
- * FreeBSD 2.2 prior to 2.2.5
- *
- * Note: the tk-4.1 package for FreeBSD doesn't have the static lib, so
- * you'll have to build it yourself, or change the definition of
- * XF86SetupUsesStaticTk.
- */
-#ifndef TkLibName
-#define TkLibName		tk41
-#endif
-#ifndef TclLibName
-#define TclLibName		tcl
-#endif
-#ifndef TclLibDir
-#define TclLibDir		/usr/lib
-#endif
-#ifndef TclIncDir
-#define TclIncDir		/usr/include
-#endif
-/* FreeBSD 2.2 has libtcl in the base system */
-#ifndef XF86SetupUsesStaticTcl
-#define XF86SetupUsesStaticTcl	NO
-#endif
-
-#else /* ! 2.2 or later */
-
-#if OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 6
-
-/*
- * 2.1.x with x >=6 has tk 4.1 and tcl 7.5 in the packages collection.
- * Neither packages include the static libs, so you either need to build
- * them yourself or set XF86SetupUsesStaticTcl and XF86SetupUsesStaticTk
- * to NO.  This isn't the default because we don't want the XFree86
- * binaries to have these packages as a dependency.
- */
-
-#ifndef TkLibName
-#define TkLibName		tk41
-#endif
-#ifndef TclLibName
-#define TclLibName		tcl75
-#endif
-
-#else /* ! 2.1.6 or later */
-
-#ifndef TkLibName
-#define TkLibName		tk40
-#endif
-#ifndef TclLibName
-#define TclLibName		tcl74
-#endif
-
-#endif
-#endif
-#endif
-
-#undef  InstallCmd
-#define InstallCmd		/usr/bin/install
-
-#if GccUsesGas
-# define GccGasOption 		-DGCCUSESGAS
-# define AsmDefines		-DUSE_GAS
-#else
-# define GccGasOption /**/
-#endif
-
-#define ServerExtraDefines GccGasOption XFree86ServerDefines
-
-#define StandardDefines	-DCSRG_BASED
-
-#if OSMajorVersion > 1
-#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME
-#define XawI18nDefines		-DUSE_XWCHAR_STRING
-#define HasMakefileSafeInclude	YES
-#define IncludeMakefile(file) @@# dependencies are in .depend
-#define DependFileName		.depend
-#ifndef BuildDynamicLoading
-#define BuildDynamicLoading	YES
-#endif
-#ifndef ForceNormalLib
-#define ForceNormalLib		YES
-#endif
-#define HasMkstemp		YES
-#else
-#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
-#define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-#endif
-
-/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
-#ifndef DefaultGcc2i386Opt
-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
-#define DefaultGcc2i386Opt -O2
-#endif
-#endif
-
-#ifdef i386Architecture
-# define OptimizedCDebugFlags DefaultGcc2i386Opt
-#else
-# define OptimizedCDebugFlags -O2
-#endif
-
-#ifndef PreIncDir
-# define PreIncDir	/usr/include
-#endif
-
-#define TroffCmd        groff -Tps
-#define SetTtyGroup     YES
-
-#ifndef ExtraFilesToClean
-# define ExtraFilesToClean *.core
-#endif
-
-#define DefaultUserPath		/bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR):/usr/gnu/bin:/usr/local/bin
-#define DefaultSystemPath	/bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR)
-#ifndef SystemManDirectory
-#define SystemManDirectory	/usr/share/man
-#endif
-
-#define InstKmemFlags	-g kmem -m 2755
-
-/*
- * Compress manual pages
- */
-#ifndef CompressManPages
-# define CompressManPages        YES
-#endif
-
-#if CompressManPages
-
-#ifndef CompressManCmd
-# define CompressManCmd		gzip -n
-#endif
-   COMPRESSMANCMD = CompressManCmd
-
-#ifndef InstallManPageLong
-#define InstallManPageLong(file,destdir,dest)                           @@\
-install.man:: file.man                                                  @@\
-	MakeDir($(DESTDIR)destdir)                                      @@\
-	$(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)*                      @@\
-	$(INSTALL) -c $(INSTMANFLAGS) file.man \                        @@\
-          $(DESTDIR)destdir/dest.$(MANSUFFIX)                           @@\
-	-$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.$(MANSUFFIX)
-#endif
-
-#ifndef InstallGenManPageLong
-#define InstallGenManPageLong(file,destdir,dest,suffix)                 @@\
-install.man:: file.man                                                  @@\
-	MakeDir($(DESTDIR)destdir)                                      @@\
-	$(RM) $(DESTDIR)destdir/dest.suffix*                            @@\
-	$(INSTALL) -c $(INSTMANFLAGS) file.man \                        @@\
-          $(DESTDIR)destdir/dest.suffix                                 @@\
-	-$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.suffix
-#endif
-
-#ifndef InstallMultipleMan
-#define InstallMultipleMan(list,dest)                                   @@\
-install.man:: list                                                      @@\
-	MakeDir($(DESTDIR)dest)						@@\
-	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
-	for i in list; do \                                             @@\
-	        (set -x; \                                              @@\
-	        MNAME=`echo $$i | cut -f1 -d.`; \			@@\
-	        $(RM) $(DESTDIR)dest/$${MNAME}*; \                      @@\
-	        $(INSTALL) -c $(INSTMANFLAGS) $$i \                     @@\
-		  $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \              @@\
-	        $(COMPRESSMANCMD) $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX)); \  @@\
-	done
-#endif
-
-/*
- * InstallManPageAliases - install soft links for aliases.
- */
-#ifndef InstallManPageAliases
-#define InstallManPageAliases(file,destdir,aliases)                     @@\
-install.man::                                                           @@\
-	@(SUFFIX=`echo $(DESTDIR)destdir/file.* | sed -e 's,.*/[^\.]*.,,'`; \ @@\
-	for i in aliases; do (set -x; \                                 @@\
-	$(RM) $(DESTDIR)destdir/$$i.*; \                                @@\
-	(cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \                  @@\
-	$$i.$${SUFFIX})); \                                             @@\
-	done)
-#endif
-
-/*
- * InstallGenManPageAliases - install soft links for aliases.
- */
-#ifndef InstallGenManPageAliases
-#define InstallGenManPageAliases(file,destdir,suffix,aliases)              @@\
-	InstallManPageAliases(file,destdir,aliases)
-#endif
-#endif
-
-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1)
-#define HasBsdMake	YES
-#endif
-
-#ifndef StaticLibrary
-#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
-#endif
-
-#include <bsdLib.rules>
-
-#ifdef i386Architecture
-#include <xfree86.cf>
-#endif
--- a/Xvnc/config/cf/Imake.cf
+++ /dev/null
@@ -1,963 +0,0 @@
-XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
-/*
- * To add support for another platform:
- * 
- *     1.  Identify a machine-specific cpp symbol.  If your preprocessor 
- *         does not have any built in, you will need to add the symbol to the
- *         cpp_argv table in config/imake/imakemdep.h and rebuild imake with
- *         the BOOTSTRAPCFLAGS variable set (see the macII for an example).
- *
- *     2.  Add all machine-specific cpp symbols (either defined by you or by
- *         the preprocessor or compiler) to the predefs table in 
- *         config/imake/imakemdep.h.
- *
- *     3.  But a new #ifdef block below that defines MacroIncludeFile and
- *         MacroFile for your new platform and then #undefs the machine-
- *         specific preprocessor symbols (to avoid problems with file names).
- *
- *     4.  Create a .cf file with the name given by MacroFile.
- */
-XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.66 2001/04/18 16:13:17 dawes Exp $
-
-#if defined(__APPLE__)
-# undef __APPLE__
-# define MacroIncludeFile <darwin.cf>
-# define MacroFile darwin.cf
-# define DarwinArchitecture
-# ifdef __ppc__
-#  define PpcDarwinArchitecture
-#  undef __ppc__
-# endif
-# ifdef __i386__
-#  define i386DarwinArchitecture
-#  undef __i386__
-# endif
-#endif
-
-#if defined(clipper) || defined(__clipper__)
-# undef clipper
-# define MacroIncludeFile <ingr.cf>
-# define MacroFile ingr.cf
-# define IngrArchitecture
-#endif /* clipper */
-
-#ifdef __CYGWIN__
-#define MacroIncludeFile <cygwin.cf>
-#define MacroFile cygwin.cf
-#define cygwinArchitecture
-#define i386Architecture
-#undef i386
-#undef __i386__
-#undef _X86_
-#undef __CYGWIN__
-#endif /* CYGWIN */
-
-#ifdef ultrix
-# define MacroIncludeFile <ultrix.cf>
-# define MacroFile ultrix.cf
-# ifdef vax
-#  undef vax
-#  define VaxArchitecture
-# endif
-# ifdef mips
-#  undef mips
-#  define MipsArchitecture
-#  define MipselArchitecture
-# endif
-# undef ultrix
-# define UltrixArchitecture
-#endif /* ultrix */
-
-#if defined(vax) && !defined(UltrixArchitecture)
-# define MacroIncludeFile <bsd.cf>
-# define MacroFile bsd.cf
-# undef vax
-# define BSDArchitecture
-# define VaxArchitecture
-#endif /* vax */
-
-#ifdef bsdi
-# define MacroIncludeFile <bsdi.cf>
-# define MacroFile bsdi.cf
-# undef bsdi
-# define BSDOSArchitecture
-# if defined(__i386__) || defined(i386)
-#  define i386BsdArchitecture
-#  define i386Architecture
-#  undef i386
-#  undef __i386__
-# endif
-# if defined(__sparc__) || defined(__sparc_v9__) || defined(sparc)
-#  define SparcArchitecture
-#  undef sparc
-#  undef __sparc__
-#  undef __sparc_v9__
-# endif
-#endif /* bsdi */
-
-#ifdef __OpenBSD__
-# undef __OpenBSD__
-# undef __NetBSD__
-# define OpenBSDArchitecture
-# define MacroIncludeFile <OpenBSD.cf>
-# define MacroFile OpenBSD.cf
-# ifdef __i386__
-#  define i386BsdArchitecture
-#  define i386Architecture
-#  undef i386
-# endif
-# if defined(__sparc__) || defined(sparc)
-#  define SparcArchitecture
-#  undef sparc
-# endif
-# ifdef mips
-#   define MipsArchitecture
-#   ifdef arc
-#     define ArcArchitecture
-#     undef arc
-#   endif
-#   ifdef pmax
-#     define PmaxArchitecture
-#     undef pmax
-#   endif
-#   undef mips
-# endif
-# ifdef __alpha__
-#   define AlphaArchitecture
-#   undef __alpha__
-# endif
-# ifdef mc68020
-#  define Mc68020Architecture
-#  if defined(amiga)
-#   define AmigaArchitecture
-#   undef amiga
-#  endif
-#  if defined(hp300)
-#   define Hp300Architecture
-#   undef hp300
-#  endif
-#  if defined(mac68k)
-#    define Mac68kArchitecture
-#    undef mac68k
-#  endif
-#  if defined(mvme68k)
-#   define Mvme68kArchitecture
-#   undef mvme68k
-#  endif
-#  if defined(sun3) 
-#   define Sun3Architecture
-#   undef sun3
-#  endif
-#  undef mc68000
-# endif
-# ifdef __powerpc__
-#  define PpcArchitecture
-#  undef __powerpc__
-# endif
-#endif /* OpenBSD */
-
-#ifdef __NetBSD__
-# define MacroIncludeFile <NetBSD.cf>
-# define MacroFile NetBSD.cf
-# undef __NetBSD__
-# define NetBSDArchitecture
-# ifdef __i386__
-#  define i386BsdArchitecture
-#  define i386Architecture
-#  undef i386
-# endif
-# if defined(__sparc__) || defined(sparc)
-#  define SparcArchitecture
-#  undef sparc
-# endif
-# ifdef mips
-#   define MipsArchitecture
-#   define ArcArchitecture
-#   undef mips
-# endif
-# ifdef __alpha__
-#   define AlphaArchitecture
-#   undef __alpha__
-# endif
-# ifdef mc68000
-#   define Mc68020Architecture
-# endif
-# ifdef __arm32__
-#   define Arm32Architecture
-#   undef __arm32__
-# endif
-# ifdef __vax__
-#   define VaxArchitecture
-#   undef __vax__
-# endif
-# ifdef __powerpc__
-#   define PpcArchitecture
-#   undef __powerpc__
-# endif
-#endif /* NetBSD */
-
-#ifdef __FreeBSD__
-# define MacroIncludeFile <FreeBSD.cf>
-# define MacroFile FreeBSD.cf
-# undef __FreeBSD__
-# define FreeBSDArchitecture
-# ifdef __i386__
-#  define i386BsdArchitecture
-#  define i386Architecture
-#  undef i386
-# endif
-# ifdef __alpha__
-#  define AlphaBsdArchitecture
-#  define AlphaArchitecture
-#  undef __alpha__
-# endif
-#endif /* __FreeBSD__ */
-
-#ifdef AMOEBA
- /* Should be before the 'sun' entry because we may be cross-compiling */
-# define MacroIncludeFile <Amoeba.cf>
-# define MacroFile Amoeba.cf
-# if defined(i80386) || defined(__i80386__)
-#  undef i80386
-#  define i386Architecture
-# else
-#  if defined(mc68000) || defined(__mc68000__)
-#   undef mc68000
-#   define Sun3Architecture
-#   define SunArchitecture
-#  else
-#   if defined(sparc) || defined(__sparc__)
-#    undef sparc
-#    define SparcArchitecture
-#    define SunArchitecture
-#   endif
-#  endif
-#  undef sun
-# endif
-#endif /* AMOEBA */
-
-#ifdef sun
-# define MacroIncludeFile <sun.cf>
-# define MacroFile sun.cf
-# ifdef SVR4
-#  undef SVR4
-#  define SVR4Architecture
-# endif
-# ifdef sparc
-#  undef sparc
-# define SparcArchitecture
-# endif
-# ifdef mc68000
-#  undef mc68000
-# define Sun3Architecture
-# endif
-# ifdef i386
-#  undef i386
-#  define i386Architecture
-# endif
-# undef sun
-# define SunArchitecture
-#endif /* sun */
-
-#ifdef __hpux
-# define MacroIncludeFile <hp.cf>
-# define MacroFile hp.cf
-# undef __hpux
-# define HPArchitecture
-#endif /* __hpux */
-
-#ifdef sco
-# define MacroIncludeFile <sco5.cf>
-# define MacroFile sco5.cf
-# undef sco
-# undef USL
-# undef SYSV
-# undef i386
-# undef SCO
-# undef SVR4
-# define i386Architecture
-# define SCOArchitecture
-# define i386SVR3Architecture
-# define SVR3Architecture
-# define i386ScoArchitecture
-# define i386Sco325Architecture
-#endif /* sco - SCO Open Server 5 */
-
-#ifdef USL
-# define MacroIncludeFile <usl.cf>
-# define MacroFile usl.cf
-# undef USL
-# undef SVR4
-# undef i386
-# define SVR4Architecture
-# define i386Architecture
-# define USLArchitecture
-#endif /* USL */
-
-#ifdef NCR
-# define MacroIncludeFile <ncr.cf>
-# define MacroFile ncr.cf
-# undef NCR
-# undef SVR4
-# undef i386
-# define SVR4Architecture
-# define i386Architecture
-# define NCRArchitecture
-#endif /* NCR */
-
-#ifdef apollo
-# define MacroIncludeFile <apollo.cf>
-# define MacroFile apollo.cf
-# undef apollo
-# define ApolloArchitecture
-#endif /* apollo */
-
-#ifdef sony
-# define MacroIncludeFile <sony.cf>
-# define MacroFile sony.cf
-# undef sony
-# undef sony_news
-# define SonyArchitecture
-# ifdef mc68020
-#  undef mc68020
-#  undef mc68030
-#  define Mc68020Architecture
-# endif
-# ifdef mips
-#  undef mips
-#  define MipsArchitecture
-# endif
-# ifdef __svr4
-#  define SVR4Architecture
-# else
-#  if !defined(bsd43) || defined(SYSTYPE_SYSV) || defined(_SYSTYPE_SYSV)
-#   define SonySysvArchitecture
-#  else
-#   define SonyBsdArchitecture
-#  endif
-# endif
-#endif /* sony */
-
-#ifdef M4310
-# define MacroIncludeFile <pegasus.cf>
-# define MacroFile pegasus.cf
-# undef M4310
-# define PegasusArchitecture
-#endif /* M4310 */
-
-#ifdef M4330
-# define MacroIncludeFile <m4330.cf>
-# define MacroFile m4330.cf
-# undef  M4330
-# define M4330Architecture
-#endif /* M4330 */
-
-#ifdef macII
-# define MacroIncludeFile <macII.cf>
-# define MacroFile macII.cf
-# undef  macII
-# define MacIIArchitecture
-#endif /* macII */
-
-#ifdef _CRAY
-# define MacroIncludeFile <cray.cf>
-# define MacroFile cray.cf
-# undef cray
-# undef CRAY
-# undef CRAY1
-# undef CRAY2
-# undef YMP
-# define CrayArchitecture
-#endif /* _CRAY */
-
-#ifdef sgi
-# define MacroIncludeFile <sgi.cf>
-# define MacroFile sgi.cf
-# undef sgi
-# define SGIArchitecture
-# undef mips
-# undef __mips
-# define MipsArchitecture
-# ifdef _SVR4
-#  undef _SVR4
-#  define SVR4Architecture
-# endif
-# ifdef _SYSTYPE_SVR4
-#  undef _SYSTYPE_SVR4
-#  define SVR4Architecture
-# endif
-#endif /* sgi */
-
-#ifdef stellar
-# define MacroIncludeFile <stellar.cf>
-# define MacroFile stellar.cf
-# undef stellar
-# define StellarArchitecture
-#endif /* stellar */
-
-#if defined(ibm) || defined(_IBMR2) || defined(ibm032) || defined(aix)
-# define MacroIncludeFile <ibm.cf>
-# define MacroFile ibm.cf
-# ifdef ibm
-#  undef ibm
-# endif
-# define IBMArchitecture
-# ifdef i386
-#  undef i386
-#  define PS2Architecture
-# endif
-# ifdef ibm032
-#  undef ibm032
-#  define RtArchitecture
-# endif
-# ifdef aix
-#  undef aix
-#  define AIXArchitecture
-# endif
-# ifdef _IBMR2
-#  undef _IBMR2
-#  define RsArchitecture
-# endif
-#endif /* ibm */
-
-#ifdef luna
-# undef luna
-# define MacroIncludeFile <luna.cf>
-# define MacroFile luna.cf
-# define LunaArchitecture
-# ifdef mc68000
-#  undef mc68000
-#  define Mc68000Architecture
-# else
-#  undef mc88000
-#  define Mc88000Architecture
-# endif
-#endif /* luna */
-
-#ifdef Mips
-#  define MacroIncludeFile <Mips.cf>
-#  define MacroFile Mips.cf
-#  undef Mips
-#  undef mips
-#  if defined(SYSTYPE_BSD43) || defined(BSD) || defined(BSD43)
-#    define MipsBsdArchitecture
-#  else /* BSD */
-#    define MipsSysvArchitecture
-#  endif /* BSD */
-#endif /* Mips */
-
-#ifdef MOTOROLA
-# define MacroIncludeFile <moto.cf>
-# define MacroFile moto.cf
-# undef MOTOROLA	
-# ifdef SYSV
-#  define MotoR3Architecture
-# endif
-# ifdef SVR4
-#  define MotoR4Architecture
-# endif
-#endif /* MOTOROLA */
-
-#if defined(SVR4) && !defined(DGUX)
-# ifdef i386
-#  define i386Architecture
-#  undef i386
-# endif
-# ifdef PC98
-#  define PANIX98Architecture
-#  undef PC98
-# endif
-# define SVR4Architecture
-# define MacroIncludeFile <svr4.cf>
-# define MacroFile svr4.cf
-# undef SVR4
-#endif /* SVR4 */
-
-#ifdef SYSV
-# ifdef i386
-# undef i386
-#  ifdef ISC
-#   define i386Architecture	
-#   define i386SVR3Architecture	
-#   define MacroIncludeFile <isc.cf>
-#   define MacroFile isc.cf
-#   define i386IscArchitecture
-#   undef ISC
-#   ifdef ISC202
-#    define IscVersion 202
-#    undef ISC202
-#   else
-#    ifdef ISC30
-#     define IscVersion 300
-#     undef ISC30
-#    else
-#     ifdef ISC40
-#      define IscVersion 400
-#      undef ISC40
-#     else
-#      define IscVersion 221
-#     endif /* ISC40 */
-#    endif /* ISC30 */
-#   endif /* ISC202 */
-#  endif /* ISC */
-#  ifndef MacroFile
-#   define i386SVR3Architecture
-#   define MacroIncludeFile <x386.cf>
-#   define MacroFile x386.cf
-#  endif /* MacroFile */
-# endif /* i386 */
-#endif /* SYSV */
-
-/* SYSV386 is here for backward compatibility only */
-#ifdef SYSV386
-# undef i386
-# ifdef SVR4
-#  define i386Architecture
-#  define SVR4Architecture
-#  define i386SVR4Architecture
-#  define MacroIncludeFile <svr4.cf>
-#  define MacroFile svr4.cf
-#  undef SVR4
-# else /* ! SVR4 */
-#  ifdef ISC
-#   define i386Architecture	
-#   define i386SVR3Architecture	
-#   define MacroIncludeFile <isc.cf>
-#   define MacroFile isc.cf
-#   define i386IscArchitecture
-#   undef ISC
-#   ifdef ISC202
-#    define IscVersion 202
-#    undef ISC202
-#   else
-#    ifdef ISC30
-#     define IscVersion 300
-#     undef ISC30
-#    else
-#     ifdef ISC40
-#      define IscVersion 400
-#      undef ISC40
-#     else
-#      define IscVersion 221
-#     endif /* ISC40 */
-#    endif /* ISC30 */
-#   endif /* ISC202 */
-#  endif /* ISC */
-#  ifndef MacroFile
-#   define i386SVR3Architecture
-#   define MacroIncludeFile <x386.cf>
-#   define MacroFile x386.cf
-#  endif /* MacroFile */
-# endif /* ! SVR4 */
-#endif /* SYSV386 */
-
-#ifdef DGUX
-# define i386Architecture
-# define SVR4Architecture
-# define MacroIncludeFile <DGUX.cf>
-# define MacroFile DGUX.cf
-# undef DGUX
-# define DguxArchitecture
-#endif /* DGUX */
-
-#ifdef __convex__
-# define MacroIncludeFile <convex.cf>
-# define MacroFile convex.cf
-# ifdef convex
-#  undef convex
-# endif
-# define ConvexArchitecture
-#endif /* _convex_ */
-
-#ifdef __osf__
-# define MacroIncludeFile <osf1.cf>
-# define MacroFile osf1.cf
-# define OSF1Architecture
-# undef __osf__
-# ifdef __mips__
-#  undef __mips__
-#  define MipsArchitecture
-#  define MipselArchitecture
-# endif
-# ifdef __alpha
-#  undef __alpha
-#  define AlphaArchitecture
-# endif
-#endif /* __osf__ */
-
-#ifdef Oki
-# define MacroIncludeFile <Oki.cf>
-# define MacroFile Oki.cf
-# undef Oki
-# define i860SVR4Architecture
-# define SVR4Architecture
-# undef SVR4
-#endif /* Oki */
-
-#ifdef WIN32
-# define MacroIncludeFile <Win32.cf>
-# define MacroFile Win32.cf
-# define Win32Architecture
-#endif /* WIN32 */
-
-#ifdef linux 
-# define MacroIncludeFile <linux.cf>
-# define MacroFile linux.cf
-# undef linux
-# define LinuxArchitecture
-# ifdef i386
-#  ifndef i386Architecture
-#   define i386Architecture
-#  endif
-#  undef i386
-XCOMM Keep cpp from replacing path elements containing i486/i586/i686
-#  ifdef i486
-#  ifndef i386Architecture
-#   define i386Architecture
-#  endif
-#   undef i486
-#  endif
-#  ifdef i586
-#  ifndef i386Architecture
-#   define i386Architecture
-#  endif
-#   undef i586
-#  endif
-#  ifdef i686
-#  ifndef i386Architecture
-#   define i386Architecture
-#  endif
-#   undef i686
-#  endif
-#  ifdef k6
-#  ifndef i386Architecture
-#   define i386Architecture
-#  endif
-#   undef k6
-#  endif
-# endif /* k6 */
-# ifdef __i386__
-#  ifndef i386Architecture
-#   define i386Architecture
-#  endif
-#  undef __i386__
-# endif /* __i386__ */
-# ifdef __i486__
-#  ifndef i386Architecture
-#   define i386Architecture
-#  endif
-#  undef __i486__
-# endif /* __i486__ */
-# ifdef __i586__
-#  ifndef i386Architecture
-#   define i386Architecture
-#  endif
-#  undef __i586__
-# endif /* __i586__ */
-# ifdef __i686__
-#  ifndef i386Architecture
-#   define i386Architecture
-#  endif
-#  undef __i686__
-# endif /* __i686__ */
-# ifdef __k6__
-#  ifndef i386Architecture
-#   define i386Architecture
-#  endif
-#  undef __k6__
-# endif /* __k6__ */
-# ifdef __i386
-#  ifndef i386Architecture
-#   define i386Architecture
-#  endif
-#  undef __i386
-# endif /* __i386 */
-# ifdef __i486
-#  ifndef i386Architecture
-#   define i386Architecture
-#  endif
-#  undef __i486
-# endif /* __i486 */
-# ifdef __i586
-#  ifndef i386Architecture
-#   define i386Architecture
-#  endif
-#  undef __i586
-# endif /* __i586 */
-# ifdef __i686
-#  ifndef i386Architecture
-#   define i386Architecture
-#  endif
-#  undef __i686
-# endif /* __i686 */
-# ifdef __k6
-#  ifndef i386Architecture
-#   define i386Architecture
-#  endif
-#  undef __k6
-# endif /* __k6 */
-# ifdef __s390__
-#   define s390Architecture
-#  undef __s390__
-# endif /* s390 */
-# ifdef __alpha
-#  define AlphaArchitecture
-#  undef __alpha
-# endif /* __alpha */
-# ifdef __alpha__
-#  ifndef AlphaArchitecture
-#   define AlphaArchitecture
-#  endif
-#  undef __alpha__
-# endif /* __alpha__ */
-# ifdef __arm__
-#  define Arm32Architecture
-#  undef arm
-#  undef __arm
-#  undef __arm__
-# endif
-# ifdef mc68000
-#  define Mc68020Architecture
-#  undef mc68000
-# endif /* mc68000 */
-# ifdef powerpc
-#  define PpcArchitecture
-#  undef powerpc
-# endif
-# ifdef __powerpc__
-#  ifndef PpcArchitecture
-#   define PpcArchitecture
-#  endif
-#  undef __powerpc__
-# endif
-# ifdef sparc
-#  define SparcArchitecture
-#  undef sparc
-# endif
-# ifdef __sparc__
-#  ifndef SparcArchitecture
-#   define SparcArchitecture
-#  endif
-#  undef __sparc__
-# endif
-# ifdef x86_64 
-#  define x86_64Architecture
-#  undef x86_64 
-# endif
-# ifdef __x86_64__
-#  ifndef x86_64Architecture
-#   define x86_64Architecture
-#  endif
-#  undef __x86_64__
-# endif
-# ifdef ia64 
-#  define ia64Architecture
-#  undef ia64 
-# endif
-# ifdef __ia64__
-#  ifndef ia64Architecture
-#   define ia64Architecture
-#  endif
-#  undef __ia64__
-# endif
-# if defined(mips) || defined(__mips__)
-#  define MipsArchitecture
-#  undef mips
-#  undef __mips__
-#  if defined(MIPSEL) || defined(_MIPSEL)
-#   define MipselArchitecture
-#  endif
-#  undef MIPSEL
-#  undef _MIPSEL
-# endif
-# ifdef __hppa__
-#  ifndef HPArchitecture
-#   define HPArchitecture
-#  endif
-#  undef __hppa__
-# endif /* __hppa__ */
-# ifdef __sh__
-#  ifndef SuperHArchitecture
-#   define SuperHArchitecture
-#  endif
-#  ifdef __BIG_ENDIAN__
-#   ifndef SuperHebArchitecture
-#    define SuperHebArchitecture
-#   endif
-#  endif
-#  undef __sh__
-# endif /* __sh__ */
-# if defined(__SH3__) || defined(__sh3__)
-#  ifndef SuperH3Architecture
-#   define SuperH3Architecture
-#  endif
-#  undef __SH3__
-#  undef __sh3__
-# endif /* __SH3__ or __sh3__ */
-# ifdef __SH4__
-#  ifdef __SH4_NOFPU__
-#   ifndef SuperH4NOFPUArchitecture
-#    define SuperH4NOFPUArchitecture
-#   endif
-#   undef __SH4_NOFPU__
-#  else
-#   ifndef SuperH4Architecture
-#    define SuperH4Architecture
-#   endif
-#  endif
-#  undef __SH4__
-# endif /* __SH4__ */
-XCOMM  for compatibility with 3.3.x 
-# ifdef PpcArchitecture
-#  define PowerPCArchitecture
-# endif
-#endif /* linux */
-
-#if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
-# define MacroIncludeFile <lynx.cf>
-# define MacroFile lynx.cf
-# define LynxOSArchitecture
-# undef __Lynx__
-# undef Lynx
-# undef lynx
-# if defined(i386) || defined(__i386__) || defined(__x86__)
-#  define i386Architecture
-#  undef i386
-#  undef __i386__
-#  undef __x86__
-# endif
-# ifdef __powerpc__
-#  define PpcArchitecture
-#  undef __powerpc__
-# endif
-# if defined(sparc) || defined(__sparc__)
-#  define SparcArchitecture
-#  undef sparc
-#  undef __sparc__
-# endif
-/* for compatibility with 3.3.x */
-# ifdef PpcArchitecture
-#  define PowerPCArchitecture
-# endif
-#endif /* LynxOS AT/PPC/microSPARC */
-
-#ifdef __uxp__
-# define MacroIncludeFile <fujitsu.cf>
-# define MacroFile fujitsu.cf
-# define FujitsuArchitecture
-# undef __uxp__
-# define UXPArchitecture
-# define SVR4Architecture
-# ifdef sparc
-#  undef sparc
-#  define SparcArchitecture
-# endif
-#endif /* __uxp__ */
-
-#ifdef __sxg__
-# define MacroIncludeFile <fujitsu.cf>
-# define MacroFile fujitsu.cf
-# define FujitsuArchitecture
-# undef __sxg__
-# define mc68000Architecture
-#endif /* __sxg__ */
-
-#ifdef _SEQUENT_
-/* undefine assignments resulting from -DSVR4 */
-# undef MacroIncludeFile
-# define MacroIncludeFile <sequent.cf>
-# undef MacroFile
-# define MacroFile sequent.cf
-# undef _SEQUENT_
-# define DynixPtxArchitecture
-# define SequentArchitecture
-#endif
-
-#if defined(_nec_ews_svr4) || defined(nec_ews_svr4) || defined(nec_ews_svr2) || defined(SX) || defined(_nec_up) || defined(_nec_ft) || defined(PC_UX)
-# ifdef nec
-#  undef nec
-# endif
-# define MacroIncludeFile <nec.cf>
-# define MacroFile nec.cf
-# define NecArchitecture
-#endif
-
-#ifdef minix 
-#define MacroIncludeFile <minix.cf>
-#define MacroFile minix.cf
-#undef minix
-#define MinixArchitecture
-#define i386Architecture
-#endif /* minix */
-
-#ifdef MACH
-#ifdef __GNU__
-#define MacroIncludeFile <gnu.cf>
-#define MacroFile gnu.cf
-#define GNUMachArchitecture
-#else
-#define MacroIncludeFile <mach.cf>
-#define MacroFile mach.cf
-#endif
-#undef MACH
-#ifdef	i386
-#define i386MachArchitecture
-#define i386Architecture
-#endif	/* i386 */
-#undef i386
-#endif /* MACH */
-
-/* On NetBSD, `unix' is not defined, and cpp emits a warning every time
- * it sees a test using the `unix' symbol */
-#if !defined(NetBSDArchitecture) || (defined(NetBSDArchitecture) && DefaultOSMajorVersion == 1 && DefaultOSMinorVersion <= 3)
-#ifdef unix
-#undef unix
-#endif
-#endif
-
-#ifdef emxos2
-#define MacroIncludeFile <os2.cf>
-#define MacroFile os2.cf
-#define OS2Architecture
-#define i386Architecture
-#endif /* emxos2 */
-
-#if defined(__QNX__) && !defined(__QNXNTO__)
-#define MacroIncludeFile <QNX4.cf>
-#define MacroFile QNX4.cf
-#define QNX4Architecture
-#define i386Architecture
-#endif /* QNX4 */
-
-#ifdef __QNXNTO__
-#define MacroIncludeFile <nto.cf>
-#define MacroFile nto.cf
-#define NTOArchitecture
-#ifdef PPC
-# define PPCArchitecture
-# undef PPC
-#else
-#ifdef MIPS
-# define mipsArchitecture
-# undef MIPS
-#else
-#ifdef i386
-# define i386Architecture
-# undef i386
-#endif
-#endif
-#endif
-#endif /* QNX/Neutrino */
-
-#ifdef SparcArchitecture
-# if defined(__sparc_v9) || defined(__arch64__)
-#  define Sparc64Architecture
-# endif
-#endif
-
-#ifndef MacroIncludeFile
-XCOMM WARNING:  Imake.cf not configured; guessing at definitions!!!
-XCOMM This might mean that BOOTSTRAPCFLAGS was not set when building imake.
-#define MacroIncludeFile <generic.cf>
-#define MacroFile generic.cf
-#endif
--- a/Xvnc/config/cf/Imake.rules
+++ /dev/null
@@ -1,2650 +0,0 @@
-XCOMM ---------------------------------------------------------------------
-XCOMM Imake rules for building libraries, programs, scripts, and data files
-XCOMM rules:  $TOG: Imake.rules /main/222 1997/07/17 20:04:40 kaleb $
-XCOMM rules:  $XFree86: xc/config/cf/Imake.rules,v 3.33.2.7 1998/02/06 09:02:17 dawes Exp $
-
-/*
- *		   MACHINE-INDEPENDENT RULES; DO NOT MODIFY
- *
- * Warning, when defining rules: make sure you do not include both a trailing
- * backslash and double ampersand backslash or else you will get an extra
- * backslash in the Makefile.
- * 
- * The following macros are defined for the various templates and Imakefiles
- * (for a list of the applicable make variables, see the template files):
- * 
- * Concat			(a,b)
- * Concat3			(a,b,c)
- * Concat4			(a,b,c,d)
- * _Use				(a,b)
- * _UseCat			(a,b,c)
- * _MUse			(a,b)
- * _MUseCat			(a,b,c)
- * ProgramTargetName		(target)
- * RunProgram			(progvar,options)
- * RunProgramWithSetup		(setup,progvar,options)
- * RemoveFile			(file)
- * RemoveFiles			(files)
- * CenterLoadTarget		(target,srclist,libs,defines)
- * CenterProgramTarget		(program,srclist,objlist,locallibs,syslibs)
- * SentinelLinkTarget		(step,program,linklist)
- * SentinelProgramTarget	(program,deplist,linklist)
- * SentinelCplusplusProgramTarget	(program,deplist,linklist)
- * PurifyLinkTarget		(step,program,linklist)
- * PurifyProgramTarget		(program,deplist,linklist)
- * PurifyCplusplusProgramTarget	(program,deplist,linklist)
- * ProofLinkTarget		(step,program,linklist)
- * ProofProgramTarget		(program,deplist,linklist)
- * ProofCplusplusProgramTarget	(program,deplist,linklist)
- * ProofCleanTarget		()
- * RemoveTargetProgram		(program)
- * MakeDir			(dir)
- * BuildIncludesTop		(srclist)
- * BuildIncludes		(srclist,dstsubdir,dstupdir)
- * LinkRule			(program,options,objects,libraries)
- * HostLinkRule			(program,options,objects,libraries)
- * NoCmpScript			(target)
- * NoConfigRec			(target)
- * NormalProgramTarget		(program,objects,deplibs,locallibs,syslibs)
- * SetUIDProgramTarget		(program,objects,deplibs,locallibs,syslibs)
- * SingleProgramTarget		(program,objects,locallibs,syslibs)
- * SimpleProgramTarget		(program)
- * ComplexProgramTarget		(program)
- * ComplexProgramTarget_1	(program,locallib,syslib)
- * ComplexProgramTarget_2	(program,locallib,syslib)
- * ComplexProgramTarget_3	(program,locallib,syslib)
- * ServerTargetWithFlags	(server,subdirs,objects,libs,syslibs,flags)
- * ServerTarget			(server,subdirs,objects,libs,syslibs)
- * MoveToBakFile		(file)
- * RMoveToBakFile		(file)
- * RanLibrary			(args)
- * LibraryTargetName		(libname)
- * LibraryTargetNameSuffix	(libname,suffix)
- * InstallNamedTarget		(step,srcname,flags,dest,dstname)
- * InstallTarget		(step,file,flags,dest)
- * InstallLibrary		(libname,dest)
- * MergeIntoInstalledLibrary	(tolib,fromlib)
- * InstallLibraryAlias		(libname,alias,dest)
- * InstallLintLibrary		(libname,dest)
- * InstallManPageLong		(file,destdir,dest)
- * InstallManPage		(file,destdir)
- * InstallManPageAliases	(file,destdir,aliases)
- * ManKeywordsTarget		(manpath)
- * InstallNamedNonExec		(srcname,dstname,dest)
- * InstallNonExecFile		(file,dest)
- * InstallNonExecFileNoClobber	(file,dest)
- * InstallNonExec		(file,dest)
- * InstallProgramWithFlags	(program,dest,flags)
- * InstallProgram		(program,dest)
- * InstallScript		(program,dest)
- * InstallNamedProg		(srcname,dstname,dest)
- * InstallNamedProgNoClobber	(srcname,dstname,dest)
- * MakeFlagsToShellFlags	(makeflags,shellcmd)
- * MakeNamedTargetSubdir	(dir,flags,subname)
- * LinkFileList			(step,list,dir,sub)
- * LinkVarDirectory		(mdir,cdir,rdir,ldir)
- * InstallMultipleDestFlags	(step,list,dest,flags)
- * InstallMultipleDest		(step,list,dest)
- * InstallMultiple		(list,dest)
- * InstallMultipleFlags		(list,dest,flags)
- * InstallMultipleMan		(list,dest)
- * DependDependency		()
- * DependTarget			()
- * DependTarget3		(srcs1,srcs2,srcs3)
- * CleanTarget			()
- * TagsTarget			()
- * ImakeDependency		(target)
- * BuildMakefileTarget		(notused,imakeflags)
- * MakefileTarget		()
- * LibMkdir			(dir)
- * LibCleanDir			(dir)
- * LintLibReferences		(varname,libname,libsource)
- * UnsharedLibReferences	(varname,libname,libsource)
- * ProjectUnsharedLibReferences	(varname,libname,libsource,buildlibdir)
- * SharedLibDependencies	(libname,libsource,revname)
- * SharedDSLibDependencies	(libname,libsource,revname)
- * SharedLibReferences		(varname,libname,libsource,revname,rev)
- * SharedDSLibReferences	(varname,libname,libsource,revname,rev)
- * ObjectCompile		(options)
- * NormalLibObjCompile		(options)
- * NormalSharedLibObjCompile	(options)
- * LibObjCompile		(dir,options)
- * DebuggedLibObjCompile	(options)
- * ProfiledLibObjCompile	(options)
- * SharedLibObjCompile		(options)
- * NormalLibraryObjectRule	()
- * NormalFortranObjectRule	()
- * ObjectFromSpecialSource	(dst,src,flags)
- * SpecialObjectRule		(objs,depends,options)
- * SpecialCObjectRule		(basename,depends,options)
- * LexFile			(file)
- * YaccFile			(file,flags)
- * YaccFileNoFlags		(file)
- * MakeLibrary			(libname,objlist)
- * NormalLibraryTarget		(libname,objlist)
- * NormalLibraryTarget2		(libname,objlist1,objlist2)
- * NormalLibraryTarget3		(libname,objlist1,objlist2,objlist3)
- * NormalDepLibraryTarget	(libname,deplist,objlist)
- * UnsharedLibraryTarget	(libname,objlist,down,up)
- * UnsharedLibraryTarget3	(libname,objlist1,objlist2,objlist3,down,up)
- * SubdirLibraryRule		(objlist)
- * ProfiledLibraryTarget	(libname,objlist)
- * DebuggedLibraryTarget	(libname,objlist)
- * AliasedLibraryTarget		(libname,alias)
- * NormalRelocatableTarget	(objname,objlist)
- * ProfiledRelocatableTarget	(objname,objlist)
- * DebuggedRelocatableTarget	(objname,objlist)
- * LintLibraryTarget		(libname,srclist)
- * NormalLintTarget		(srclist)
- * LintTarget			()
- * LinkSourceFile		(src,dir)
- * LinkFile			(tofile,fromfile)
- * MakeSubincludesForBuild	(step,dir,srclist)
- * LangNamedTargetSubdirs	(lang,name,dirs,verb,flags,subname)
- * LangNamedMakeSubdirs		(lang,name,dirs)
- * LangMakeSubdirs		(lang,dirs)
- * NamedTargetSubdirs		(name,dirs,verb,flags,subname)
- * NamedMakeSubdirs		(name,dirs)
- * MakeSubdirs			(dirs)
- * DependSubdirs		(dirs)
- * ForceSubdirs			(dirs)
- * InstallSubdirs		(dirs)
- * InstallManSubdirs		(dirs)
- * IncludesSubdirs		(dirs)
- * NamedCleanSubdirs		(name,dirs)
- * CleanSubdirs			(dirs)
- * NamedTagSubdirs		(name,dirs)
- * TagSubdirs			(dirs)
- * MakeLintSubdirs		(dirs,target,subtarget)
- * LintSubdirs			(dirs)
- * MakeLintLibSubdirs		(dirs)
- * MakeMakeSubdirs		(dirs,target)
- * MakefileSubdirs		(dirs)
- * CppScriptTarget		(dst,src,defs,deplist)
- * MakeScriptFromCpp		(name,defs)
- * CppFileTarget		(dst,src,defs,deplist)
- * CppSourceFile		(dst,src,defs,deplist)
- * MakeDirectories		(step,dirs)
- * AllTarget			(depends)
- * StaticLibrary		(libpath,libname)
- * MakeMutex			(targets)
- *
- *
- * The following are in specific <os>Lib.rules:
- *
- * SharedLibraryTarget		(libname,rev,solist,down,up)
- * SharedLibraryDataTarget	(libname,rev,salist)
- * InstallSharedLibrary		(libname,rev,dest)
- * InstallSharedLibraryData	(libname,rev,dest)
- * 
- */
-
-#define NullParameter
-
-/* if [ -d ] or [ ! -d ] causes make to fail, define this as - */
-#ifndef DirFailPrefix
-#define DirFailPrefix
-#endif
-
-/*
- * NoCmpScript - suppress clearmake build script comparison.
- */
-#ifndef NoCmpScript
-#if HasClearmake
-#define NoCmpScript(targ)						@@\
-XCOMM special target for clearmake					@@\
-.NO_CMP_SCRIPT: targ
-#else
-#define NoCmpScript(targ) /**/
-#endif
-#endif
-
-/*
- * NoConfigRec - suppress using clearmake configuration records.
- */
-#ifndef NoConfigRec
-#if HasClearmake
-#define NoConfigRec(targ)						@@\
-XCOMM special target for clearmake					@@\
-.NO_CONFIG_REC: targ
-#else
-#define NoConfigRec(targ) /**/
-#endif
-#endif
-
-/*
- * Concat - concatenates two strings.
- */
-#ifndef Concat
-#if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp)
-#define Concat(a,b)a##b
-#else
-#define Concat(a,b)a/**/b
-#endif
-#endif
-
-/*
- * Concat3 - concatenates three strings.
- */
-#ifndef Concat3
-#if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp)
-#define Concat3(a,b,c)a##b##c
-#else
-#define Concat3(a,b,c)a/**/b/**/c
-#endif
-#endif
-
-/*
- * Concat4 - concatenates four strings.
- */
-#ifndef Concat4
-#if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp)
-#define Concat4(a,b,c,d)a##b##c##d
-#else
-#define Concat4(a,b,c,d)a/**/b/**/c/**/d
-#endif
-#endif
-
-/*
- * _XUse - makes a choice based on UseInstalledX11.
- */
-#ifndef _XUse
-# if defined(UseInstalled) || UseInstalledX11
-#  define _XUse(a,b) a
-# else
-#  define _XUse(a,b) b
-# endif
-#endif /* _XUse */
-
-/*
- * _Use - makes a choice based on UseInstalled.
- */
-#ifndef _Use
-# define _Use	_XUse
-#endif /* _Use */
-
-/*
- * _XUseCat - combination of _XUse and Concat.
- *           exists to avoid problems with some preprocessors
- */
-#ifndef _XUseCat
-# if (__STDC__ && !defined(UnixCpp)) || defined(AnsiCpp)
-#  if defined(UseInstalled) || UseInstalledX11
-#   define _XUseCat(a,b,c) a##c
-#  else
-#   define _XUseCat(a,b,c) b##c
-#  endif
-# else
-#  if defined(UseInstalled) || UseInstalledX11
-#   define _XUseCat(a,b,c) a/**/c
-#  else
-#   define _XUseCat(a,b,c) b/**/c
-#  endif
-# endif
-#endif /* _XUseCat */
-
-/*
- * _UseCat - combination of _Use and Concat.
- *           exists to avoid problems with some preprocessors
- */
-#ifndef _UseCat
-# define _UseCat	_XUseCat
-#endif /* _UseCat */
-
-#ifndef ProgramTargetName
-#define ProgramTargetName(target)target
-#endif
-
-#ifndef RunProgram
-#define RunProgram(progvar,options) $(progvar) options
-#endif
-
-#ifndef RunProgramWithSetup
-#define RunProgramWithSetup(setup,progvar,options) setup $(progvar) options
-#endif
-
-#ifndef RemoveFile
-#define RemoveFile(file) $(RM) file
-#endif /* RemoveFile */
-
-#ifndef RemoveFiles
-#define RemoveFiles(files) $(RM) files
-#endif /* RemoveFiles */
-
-/*
- * CenterLoadTarget - generate rules to load files into CodeCenter
- */
-#ifndef CenterLoadTarget
-#if HasCodeCenter
-#define CenterLoadTarget(target,srclist,libs,defines)			@@\
-ProgramTargetName(target):: srclist					@@\
-	XCOMM load defines srclist libs
-#else
-#define CenterLoadTarget(target,srclist,libs,defines) /**/
-#endif
-#endif /* CenterLoadTarget */
-
-/*
- * CenterProgramTarget - generate rules to make CodeCenter read in sources
- * and objects.
- */
-#ifndef CenterProgramTarget
-#define CenterProgramTarget(program,srclist,objlist,locallibs,syslibs)	@@\
-CenterLoadTarget(Concat(debug_,program),srclist,$(EXTRA_LDOPTIONS) $(LOCAL_LDFLAGS) $(LDPRELIBS) locallibs $(LDLIBS) syslibs,$(ALLDEFINES)) @@\
-									@@\
-CenterLoadTarget(Concat(odebug_,program),objlist,$(EXTRA_LDOPTIONS) $(LOCAL_LDFLAGS) $(LDPRELIBS) locallibs $(LDLIBS) syslibs,$(ALLDEFINES))
-#endif /* CenterProgramTarget */
-
-#ifndef SentinelLinkTarget
-#if HasSentinel
-#define SentinelLinkTarget(step,program,linklist)			@@\
-ProgramTargetName(step.sentinel):					@@\
-	RemoveTargetProgram($@)						@@\
-	$(CCENVSETUP) $(SENTINEL) $(SENTINELOPTIONS) $(CC) -o program.sentinel $(LDOPTIONS) linklist $(EXTRA_LOAD_FLAGS)
-#else
-#define SentinelLinkTarget(step,program,linklist) /**/
-#endif
-#endif /* SentinelLinkTarget */
-
-/*
- * SentinelProgramTarget - generate rules to make Sentinel image
- */
-#ifndef SentinelProgramTarget
-#if HasSentinel
-#define	SentinelProgramTarget(program,deplist,linklist)			@@\
-ProgramTargetName(program.sentinel): deplist				@@\
-	RemoveTargetProgram($@)						@@\
-	$(CCENVSETUP) $(SENTINEL) $(SENTINELOPTIONS) $(CC) -o $@ $(LDOPTIONS) linklist $(EXTRA_LOAD_FLAGS) @@\
-									@@\
-clean clean.sentinel::							@@\
-	RemoveFile(program.sentinel)
-#else
-#define	SentinelProgramTarget(program,deplist,linklist) /**/
-#endif
-#endif /* SentinelProgramTarget */
-
-/*
- * SentinelCplusplusProgramTarget - generate rules to make Sentinel image 
- */
-#ifndef SentinelCplusplusProgramTarget
-#if HasSentinel
-#define	SentinelCplusplusProgramTarget(program,deplist,linklist)	@@\
-ProgramTargetName(program.sentinel): deplist				@@\
-	RemoveTargetProgram($@)						@@\
-	$(CXXENVSETUP) $(SENTINEL) $(SENTINELOPTIONS) $(CXX) -o $@ $(CXXLDOPTIONS) linklist $(EXTRA_LOAD_FLAGS) @@\
-									@@\
-clean clean.sentinel::							@@\
-	RemoveFile(program.sentinel)
-#else
-#define	SentinelCplusplusProgramTarget(program,deplist,linklist) /**/
-#endif
-#endif /* SentinelCplusplusProgramTarget */
-
-#ifndef PurifyLinkTarget
-#if HasPurify
-#define PurifyLinkTarget(step,program,linklist)				@@\
-ProgramTargetName(step.pure):						@@\
-	RemoveTargetProgram($@)						@@\
-	$(CCENVSETUP) $(PURIFY) $(PURIFYOPTIONS) $(CC) -o program.pure $(LDOPTIONS) linklist $(EXTRA_LOAD_FLAGS)
-#else
-#define PurifyLinkTarget(step,program,linklist) /**/
-#endif
-#endif /* PurifyLinkTarget */
-
-/*
- * PurifyProgramTarget - generate rules to make Purify'ed image
- */
-#ifndef PurifyProgramTarget
-#if HasPurify
-#define	PurifyProgramTarget(program,deplist,linklist)			@@\
-ProgramTargetName(program.pure): deplist				@@\
-	RemoveTargetProgram($@)						@@\
-	$(CCENVSETUP) $(PURIFY) $(PURIFYOPTIONS) $(CC) -o $@ $(LDOPTIONS) linklist $(EXTRA_LOAD_FLAGS) @@\
-									@@\
-clean clean.pure::							@@\
-	RemoveFile(program.pure)
-#else
-#define	PurifyProgramTarget(program,deplist,linklist) /**/
-#endif
-#endif /* PurifyProgramTarget */
-
-/*
- * PurifyCplusplusProgramTarget - generate rules to make Purify'ed image
- */
-#ifndef PurifyCplusplusProgramTarget
-#if HasPurify
-#define	PurifyCplusplusProgramTarget(program,deplist,linklist)		@@\
-ProgramTargetName(program.pure): deplist				@@\
-	RemoveTargetProgram($@)						@@\
-	$(CXXENVSETUP) $(PURIFY) $(PURIFYOPTIONS) $(CXX) -o $@ $(CXXLDOPTIONS) linklist $(EXTRA_LOAD_FLAGS) @@\
-									@@\
-clean clean.pure::							@@\
-	RemoveFile(program.pure)
-#else
-#define	PurifyCplusplusProgramTarget(program,deplist,linklist) /**/
-#endif
-#endif /* PurifyCplusplusProgramTarget */
-
-#ifndef ProofLinkTarget
-#if HasTestCenter
-#define ProofLinkTarget(step,program,linklist)				@@\
-ProgramTargetName(step.tc):						@@\
-	RemoveTargetProgram($@)						@@\
-	$(CCENVSETUP) $(PROOF) $(PROOFOPTIONS) $(CC) -o program.tc $(LDOPTIONS) linklist $(EXTRA_LOAD_FLAGS)
-#else
-#define ProofLinkTarget(step,program,linklist) /**/
-#endif
-#endif /* ProofLinkTarget */
-
-/*
- * ProofProgramTarget - generate rules to make Proof'ed image
- */
-#ifndef ProofProgramTarget
-#if HasTestCenter
-#define	ProofProgramTarget(program,deplist,linklist)			@@\
-ProgramTargetName(program.tc): deplist					@@\
-	RemoveTargetProgram($@)						@@\
-	$(CCENVSETUP) $(PROOF) $(PROOFOPTIONS) $(CC) -o $@ $(LDOPTIONS) linklist $(EXTRA_LOAD_FLAGS) @@\
-									@@\
-clean clean.tc::							@@\
-	RemoveFiles(program.tc program.tc.*.*)
-#else
-#define	ProofProgramTarget(program,deplist,linklist) /**/
-#endif
-#endif /* ProofProgramTarget */
-
-/*
- * ProofCplusplusProgramTarget - generate rules to make Proof'ed image
- */
-#ifndef ProofCplusplusProgramTarget
-#if HasTestCenter
-#define	ProofCplusplusProgramTarget(program,deplist,linklist)		@@\
-ProgramTargetName(program.tc): deplist					@@\
-	RemoveTargetProgram($@)						@@\
-	$(CXXENVSETUP) $(PROOF) $(PROOFOPTIONS) $(CXX) -o $@ $(CXXLDOPTIONS) linklist $(EXTRA_LOAD_FLAGS) @@\
-									@@\
-clean clean.tc::							@@\
-	RemoveFiles(program.tc program.tc.*.*)
-#else
-#define	ProofCplusplusProgramTarget(program,deplist,linklist) /**/
-#endif
-#endif /* ProofCplusplusProgramTarget */
-
-#ifndef ProofCleanTarget
-#if HasTestCenter
-#define ProofCleanTarget()						@@\
-clean clean.tc::							@@\
-	$(RM) -r TC.Cache
-#else
-#define ProofCleanTarget() /**/
-#endif
-#endif /* ProofCleanTarget */
-
-#ifndef RemoveTargetProgram
-#if RemoveTargetProgramByMoving
-#define RemoveTargetProgram(program) \
--if [ -f program ]; then RemoveFile(Concat(program,~)); $(MV) program Concat(program,~); fi
-#else
-#define RemoveTargetProgram(program) RemoveFile(program)
-#endif
-#endif /* RemoveTargetProgram */
-
-#ifndef MakeDir
-#define MakeDir(dir) DirFailPrefix@if [ -d dir ]; then set +x; \	@@\
-		else (set -x; $(MKDIRHIER) dir); fi
-#endif /* MakeDir */
-
-#ifndef BuildIncludesTop
-#define BuildIncludesTop(srclist)					@@\
-includes:: srclist							@@\
-	MakeDir($(BUILDINCDIR))						@@\
-	@(set -x; cd $(BUILDINCDIR) && for i in srclist; do \		@@\
-		RemoveFile($$i); \					@@\
-		$(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/$$i .; \		@@\
-	done)
-#endif /* BuildIncludesTop */
-
-#ifndef BuildIncludes
-#define BuildIncludes(srclist,dstsubdir,dstupdir)			@@\
-includes:: srclist							@@\
-	MakeDir($(BUILDINCDIR)/dstsubdir)				@@\
-	@(set -x; cd $(BUILDINCDIR)/dstsubdir && for i in srclist; do \	@@\
-		RemoveFile($$i); \					@@\
-		$(LN) $(BUILDINCTOP)/dstupdir/$(CURRENT_DIR)/$$i .; \	@@\
-	done)
-#endif /* BuildIncludes */
-
-/*
- * LinkBuildBinary - export a binary from the build tree.
- */
-#ifndef LinkBuildBinary
-#define LinkBuildBinary(binary)						@@\
-all:: $(BUILDBINDIR)/binary binary					@@\
-									@@\
-$(BUILDBINDIR)/binary: binary						@@\
-	RemoveFile($@)							@@\
-	cd $(BUILDBINDIR) && $(LN) $(BUILDBINTOP)/$(CURRENT_DIR)/binary .
-#endif /* LinkBuildBinary */
-
-#ifndef BuildInterfaces
-#define BuildInterfaces(srclist,dstsubdir,dstupdir)			@@\
-interfaces::								@@\
-	MakeDir($(BUILDINCDIR)/dstsubdir)				@@\
-	@(set -x; cd $(BUILDINCDIR)/dstsubdir && for i in srclist; do \	@@\
-		RemoveFile($$i); \					@@\
-		$(LN) $(BUILDINCTOP)/dstupdir/$(CURRENT_DIR)/$$i .; \	@@\
-	done)
-#endif /* BuildInterfaces */
-
-/*
- * LinkRule - link a program
- */
-#ifndef LinkRule
-#define LinkRule(program,options,objects,libraries) \
-$(CCLINK) -o program options objects libraries $(EXTRA_LOAD_FLAGS)
-#endif /* LinkRule */
-
-/*
- * HostLinkRule - link a utility to be used on the build host
- * (differs from LinkRule if cross compiling)
- */
-#ifndef HostLinkRule
-#define HostLinkRule LinkRule
-#endif
-
-#ifndef CplusplusLinkRule
-#define CplusplusLinkRule(program,options,objects,libraries) \
-$(CXXLINK) -o program options objects libraries $(EXTRA_LOAD_FLAGS)
-#endif /* CplusplusLinkRule */
-
-/*
- * NormalProgramTarget - generate rules to compile and link the indicated 
- * program; since it does not use any default object files, it may be used for
- * multiple programs in the same Imakefile.
- */
-#ifndef NormalProgramTarget
-#define	NormalProgramTarget(program,objects,deplibs,locallibs,syslibs)	@@\
-ProgramTargetName(program): objects deplibs				@@\
-	RemoveTargetProgram($@)						@@\
-	LinkRule($@,$(LDOPTIONS),objects,locallibs $(LDLIBS) syslibs)	@@\
-									@@\
-SentinelProgramTarget(program,objects deplibs,objects locallibs $(LDLIBS) syslibs) @@\
-PurifyProgramTarget(program,objects deplibs,objects locallibs $(LDLIBS) syslibs) @@\
-ProofProgramTarget(program,objects deplibs,objects locallibs $(LDLIBS) syslibs) @@\
-									@@\
-clean::									@@\
-	RemoveFile(ProgramTargetName(program))
-#endif /* NormalProgramTarget */
-
-
-/*
- * NormalCplusplusProgramTarget - Like NormalTargetProgram, but uses
- * C++ linking rules.
- */
-#ifndef NormalCplusplusProgramTarget
-#define	NormalCplusplusProgramTarget(program,objects,deplibs,locallibs,syslibs)	@@\
-ProgramTargetName(program): objects deplibs				@@\
-	RemoveTargetProgram($@)						@@\
-	CplusplusLinkRule($@,$(CXXLDOPTIONS),objects,locallibs $(LDLIBS) syslibs) @@\
-									@@\
-SentinelCplusplusProgramTarget(program,objects deplibs,objects locallibs $(LDLIBS) syslibs) @@\
-PurifyCplusplusProgramTarget(program,objects deplibs,objects locallibs $(LDLIBS) syslibs) @@\
-ProofCplusplusProgramTarget(program,objects deplibs,objects locallibs $(LDLIBS) syslibs) @@\
-									@@\
-clean::									@@\
-	RemoveFile(ProgramTargetName(program))
-#endif /* NormalCplusplusProgramTarget */
-
-
-#ifndef SetUIDProgramTarget
-#define SetUIDProgramTarget NormalProgramTarget
-#endif
-
-
-/*
- * SingleProgramTarget - obsolete version of NormalProgramTarget that does
- * not have deplibs.
- */
-#ifndef SingleProgramTarget
-#define	SingleProgramTarget(program,objects,locallibs,syslibs)		@@\
-NormalProgramTarget(program,objects,NullParameter,locallibs,syslibs)
-#endif /* SingleProgramTarget */
-
-/*
- * SimpleProgramTarget - generate rules for compiling and linking programs
- * that only have one C source file.  It should only be used in Imakefiles 
- * that describe a single program.
- */
-#ifndef SimpleProgramTarget
-#define	SimpleProgramTarget(program)					@@\
-           OBJS = program.o						@@\
-           SRCS = program.c						@@\
-									@@\
-ComplexProgramTarget(program)
-#endif /* SimpleProgramTarget */
-
-#ifndef SimpleCplusplusProgramTarget
-#define SimpleCplusplusProgramTarget(program)				@@\
-           OBJS = program.o						@@\
-           SRCS = program.CCsuf						@@\
-									@@\
-ComplexCplusplusProgramTarget(program)
-#endif /* SimpleCplusplusProgramTarget */
-
-#ifndef ProgramTargetHelper
-#define	ProgramTargetHelper(program,srcs,objs,deplib,locallib,syslib)	@@\
-ProgramTargetName(program): $(objs) $(deplib)				@@\
-	RemoveTargetProgram($@)						@@\
-	LinkRule($@,$(LDOPTIONS),$(objs),locallib $(LDLIBS) syslib)	@@\
-									@@\
-CenterProgramTarget(program,$(srcs),$(objs),locallib,syslib)		@@\
-SentinelProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\
-PurifyProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\
-ProofProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\
-									@@\
-InstallProgram(program,$(BINDIR))					@@\
-InstallManPage(program,$(MANDIR))
-#endif /* ProgramTargetHelper */
-
-#ifndef ProgramTargetHelperNoMan
-#define        ProgramTargetHelperNoMan(program,srcs,objs,deplib,locallib,syslib) @@\
-ProgramTargetName(program): $(objs) $(deplib)                          @@\
-       RemoveTargetProgram($@)                                         @@\
-       LinkRule($@,$(LDOPTIONS),$(objs),locallib $(LDLIBS) syslib)     @@\
-                                                                       @@\
-CenterProgramTarget(program,$(srcs),$(objs),locallib,syslib)           @@\
-SentinelProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\
-PurifyProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\
-ProofProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\
-                                                                       @@\
-InstallProgram(program,$(BINDIR))
-#endif /* ProgramTargetHelperNoMan */
-
-#ifndef CplusplusProgramTargetHelper
-#define	CplusplusProgramTargetHelper(program,srcs,objs,deplib,locallib,syslib) @@\
-ProgramTargetName(program): $(objs) $(deplib)				@@\
-	RemoveTargetProgram($@)						@@\
-	CplusplusLinkRule($@,$(CXXLDOPTIONS),$(objs),locallib $(LDLIBS) syslib) @@\
-									@@\
-CenterProgramTarget(program,$(srcs),$(objs),locallib,syslib)		@@\
-SentinelCplusplusProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\
-PurifyCplusplusProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\
-ProofCplusplusProgramTarget(program,$(objs) $(deplib),$(objs) locallib $(LDLIBS) syslib) @@\
-									@@\
-InstallProgram(program,$(BINDIR))					@@\
-InstallManPage(program,$(MANDIR))
-#endif /* CplusplusProgramTargetHelper */
-
-/*
- * ComplexProgramTarget - generate rules for compiling and linking the 
- * program specified by $(OBJS) and $(SRCS), installing the program and its
- * man page, and generating dependencies.  It should only be used in 
- * Imakefiles that describe a single program.
- */
-#ifndef ComplexProgramTarget
-#define	ComplexProgramTarget(program)					@@\
-        PROGRAM = program						@@\
-									@@\
-AllTarget(program)							@@\
-									@@\
-ProgramTargetHelper(program,SRCS,OBJS,DEPLIBS,$(LOCAL_LIBRARIES),NullParameter) @@\
-									@@\
-DependTarget()								@@\
-LintTarget()								@@\
-									@@\
-clean::									@@\
-	RemoveFile(ProgramTargetName(program))
-#endif /* ComplexProgramTarget */
-
-#ifndef ComplexCplusplusProgramTarget
-#define	ComplexCplusplusProgramTarget(program)				@@\
-        PROGRAM = program						@@\
-									@@\
-AllTarget(program)							@@\
-									@@\
-CplusplusProgramTargetHelper(program,SRCS,OBJS,DEPLIBS,$(LOCAL_LIBRARIES),NullParameter) @@\
-									@@\
-DependTarget()								@@\
-LintTarget()								@@\
-									@@\
-clean::									@@\
-	RemoveFile(ProgramTargetName(program))
-#endif /* ComplexCplusplusProgramTarget */
-
-/*
- * ComplexProgramTargetNoMan - generate rules for compiling and linking
- * the program specified by $(OBJS) and $(SRCS), installing the program 
- * and generating dependencies.  It should only be used in Imakefiles
- * that describe a single program.
- */
-#ifndef ComplexProgramTargetNoMan
-#define        ComplexProgramTargetNoMan(program)                      @@\
-        PROGRAM = program                                              @@\
-                                                                       @@\
-AllTarget(program)                                                     @@\
-                                                                       @@\
-ProgramTargetHelperNoMan(program,SRCS,OBJS,DEPLIBS,$(LOCAL_LIBRARIES),NullParameter) @@\
-                                                                       @@\
-DependTarget()                                                         @@\
-LintTarget()                                                           @@\
-                                                                       @@\
-clean::                                                                @@\
-       RemoveFile(ProgramTargetName(program))
-#endif /* ComplexProgramTargetNoMan */
-
-/*
- * ComplexProgramTarget_1 - generate rules for compiling and linking the
- * program specified by $(OBJS1) and $(SRCS1), installing the program and its
- * man page, and generating dependencies for it and any programs described
- * by $(SRCS2) through $(SRCS10).  It should be used to build the primary 
- * program in Imakefiles that describe multiple programs.
- */
-#ifndef ComplexProgramTarget_1
-#define	ComplexProgramTarget_1(program,locallib,syslib)			@@\
-  OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5) \			@@\
-         $(OBJS6) $(OBJS7) $(OBJS8) $(OBJS9) $(OBJS10)			@@\
-  SRCS = $(SRCS1) $(SRCS2) $(SRCS3) $(SRCS4) $(SRCS5) \			@@\
-         $(SRCS6) $(SRCS7) $(SRCS8) $(SRCS9) $(SRCS10)			@@\
-									@@\
-AllTarget($(PROGRAMS))							@@\
-									@@\
-ProgramTargetHelper(program,SRCS1,OBJS1,DEPLIBS1,locallib,syslib)	@@\
-									@@\
-DependTarget()								@@\
-LintTarget()								@@\
-									@@\
-clean::									@@\
-	RemoveFiles($(PROGRAMS))
-#endif /* ComplexProgramTarget_1 */
-
-#ifndef ComplexCplusplusProgramTarget_1
-#define	ComplexCplusplusProgramTarget_1(program,locallib,syslib)	@@\
-  OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(OBJS4) $(OBJS5) \			@@\
-         $(OBJS6) $(OBJS7) $(OBJS8) $(OBJS9) $(OBJS10)			@@\
-  SRCS = $(SRCS1) $(SRCS2) $(SRCS3) $(SRCS4) $(SRCS5) \			@@\
-         $(SRCS6) $(SRCS7) $(SRCS8) $(SRCS9) $(SRCS10)			@@\
-									@@\
-AllTarget($(PROGRAMS))							@@\
-									@@\
-CplusplusProgramTargetHelper(program,SRCS1,OBJS1,DEPLIBS1,locallib,syslib)@@\
-									@@\
-DependTarget()								@@\
-LintTarget()								@@\
-									@@\
-clean::									@@\
-	RemoveFiles($(PROGRAMS))
-#endif /* ComplexCplusplusProgramTarget_1 */
-
-/*
- * ComplexProgramTarget_2 - generate rules for compiling and linking the
- * program specified by $(OBJS2) and $(SRCS2) and installing the program and
- * man page.  It should be used to build the second program in Imakefiles 
- * describing more than one program.
- */
-#ifndef ComplexProgramTarget_2
-#define	ComplexProgramTarget_2(program,locallib,syslib)			@@\
-ProgramTargetHelper(program,SRCS2,OBJS2,DEPLIBS2,locallib,syslib)
-#endif /* ComplexProgramTarget_2 */
-
-#ifndef ComplexCplusplusProgramTarget_2
-#define	ComplexCplusplusProgramTarget_2(program,locallib,syslib)	@@\
-CplusplusProgramTargetHelper(program,SRCS2,OBJS2,DEPLIBS2,locallib,syslib)
-#endif /* ComplexCplusplusProgramTarget_2 */
-
-/*
- * ComplexProgramTarget_3 - generate rules for compiling and linking the
- * program specified by $(OBJS3) and $(SRCS3) and installing the program and
- * man page.  It should be used to build the third program in Imakefiles 
- * describing more than one program.
- */
-#ifndef ComplexProgramTarget_3
-#define	ComplexProgramTarget_3(program,locallib,syslib)			@@\
-ProgramTargetHelper(program,SRCS3,OBJS3,DEPLIBS3,locallib,syslib)
-#endif /* ComplexProgramTarget_3 */
-
-#ifndef ComplexCplusplusProgramTarget_3
-#define	ComplexCplusplusProgramTarget_3(program,locallib,syslib)	@@\
-CplusplusProgramTargetHelper(program,SRCS3,OBJS3,DEPLIBS3,locallib,syslib)
-#endif /* ComplexCplusplusProgramTarget_3 */
-
-/*
- * ComplexProgramTarget_4 - generate rules for compiling and linking the
- * program specified by $(OBJS4) and $(SRCS4) and installing the program and
- * man page.  It should be used to build the third program in Imakefiles 
- * describing more than one program.
- */
-#ifndef ComplexProgramTarget_4
-#define	ComplexProgramTarget_4(program,locallib,syslib)			@@\
-ProgramTargetHelper(program,SRCS4,OBJS4,DEPLIBS4,locallib,syslib)
-#endif /* ComplexProgramTarget_4 */
-
-#ifndef ComplexCplusplusProgramTarget_4
-#define	ComplexCplusplusProgramTarget_4(program,locallib,syslib)	@@\
-CplusplusProgramTargetHelper(program,SRCS4,OBJS4,DEPLIBS4,locallib,syslib)
-#endif /* ComplexCplusplusProgramTarget_4 */
-
-/*
- * ComplexProgramTarget_5 - generate rules for compiling and linking the
- * program specified by $(OBJS5) and $(SRCS5) and installing the program and
- * man page.  It should be used to build the third program in Imakefiles 
- * describing more than one program.
- */
-#ifndef ComplexProgramTarget_5
-#define	ComplexProgramTarget_5(program,locallib,syslib)			@@\
-ProgramTargetHelper(program,SRCS5,OBJS5,DEPLIBS5,locallib,syslib)
-#endif /* ComplexProgramTarget_5 */
-
-#ifndef ComplexCplusplusProgramTarget_5
-#define	ComplexCplusplusProgramTarget_5(program,locallib,syslib)	@@\
-CplusplusProgramTargetHelper(program,SRCS5,OBJS5,DEPLIBS5,locallib,syslib)
-#endif /* ComplexCplusplusProgramTarget_5 */
-
-/*
- * ComplexProgramTarget_6 - generate rules for compiling and linking the
- * program specified by $(OBJS6) and $(SRCS6) and installing the program and
- * man page.  It should be used to build the third program in Imakefiles 
- * describing more than one program.
- */
-#ifndef ComplexProgramTarget_6
-#define	ComplexProgramTarget_6(program,locallib,syslib)			@@\
-ProgramTargetHelper(program,SRCS6,OBJS6,DEPLIBS6,locallib,syslib)
-#endif /* ComplexProgramTarget_6 */
-
-#ifndef ComplexCplusplusProgramTarget_6
-#define	ComplexCplusplusProgramTarget_6(program,locallib,syslib)	@@\
-CplusplusProgramTargetHelper(program,SRCS6,OBJS6,DEPLIBS6,locallib,syslib)
-#endif /* ComplexCplusplusProgramTarget_6 */
-
-/*
- * ComplexProgramTarget_7 - generate rules for compiling and linking the
- * program specified by $(OBJS7) and $(SRCS7) and installing the program and
- * man page.  It should be used to build the third program in Imakefiles 
- * describing more than one program.
- */
-#ifndef ComplexProgramTarget_7
-#define	ComplexProgramTarget_7(program,locallib,syslib)			@@\
-ProgramTargetHelper(program,SRCS7,OBJS7,DEPLIBS7,locallib,syslib)
-#endif /* ComplexProgramTarget_7 */
-
-#ifndef ComplexCplusplusProgramTarget_7
-#define	ComplexCplusplusProgramTarget_7(program,locallib,syslib)	@@\
-CplusplusProgramTargetHelper(program,SRCS7,OBJS7,DEPLIBS7,locallib,syslib)
-#endif /* ComplexCplusplusProgramTarget_7 */
-
-/*
- * ComplexProgramTarget_8 - generate rules for compiling and linking the
- * program specified by $(OBJS8) and $(SRCS8) and installing the program and
- * man page.  It should be used to build the third program in Imakefiles 
- * describing more than one program.
- */
-#ifndef ComplexProgramTarget_8
-#define	ComplexProgramTarget_8(program,locallib,syslib)			@@\
-ProgramTargetHelper(program,SRCS8,OBJS8,DEPLIBS8,locallib,syslib)
-#endif /* ComplexProgramTarget_8 */
-
-#ifndef ComplexCplusplusProgramTarget_8
-#define	ComplexCplusplusProgramTarget_8(program,locallib,syslib)	@@\
-CplusplusProgramTargetHelper(program,SRCS8,OBJS8,DEPLIBS8,locallib,syslib)
-#endif /* ComplexCplusplusProgramTarget_8 */
-
-/*
- * ComplexProgramTarget_9 - generate rules for compiling and linking the
- * program specified by $(OBJS9) and $(SRCS9) and installing the program and
- * man page.  It should be used to build the third program in Imakefiles 
- * describing more than one program.
- */
-#ifndef ComplexProgramTarget_9
-#define	ComplexProgramTarget_9(program,locallib,syslib)			@@\
-ProgramTargetHelper(program,SRCS9,OBJS9,DEPLIBS9,locallib,syslib)
-#endif /* ComplexProgramTarget_9 */
-
-#ifndef ComplexCplusplusProgramTarget_9
-#define	ComplexCplusplusProgramTarget_9(program,locallib,syslib)	@@\
-CplusplusProgramTargetHelper(program,SRCS9,OBJS9,DEPLIBS9,locallib,syslib)
-#endif /* ComplexCplusplusProgramTarget_9 */
-
-/*
- * ComplexProgramTarget_10 - generate rules for compiling and linking the
- * program specified by $(OBJS10) and $(SRCS10) and installing the program and
- * man page.  It should be used to build the third program in Imakefiles 
- * describing more than one program.
- */
-#ifndef ComplexProgramTarget_10
-#define	ComplexProgramTarget_10(program,locallib,syslib)		@@\
-ProgramTargetHelper(program,SRCS10,OBJS10,DEPLIBS10,locallib,syslib)
-#endif /* ComplexProgramTarget_10 */
-
-#ifndef ComplexCplusplusProgramTarget_10
-#define	ComplexCplusplusProgramTarget_10(program,locallib,syslib)	@@\
-CplusplusProgramTargetHelper(program,SRCS10,OBJS10,DEPLIBS10,locallib,syslib)
-#endif /* ComplexCplusplusProgramTarget_10 */
-
-#ifndef MoveToBakFile
-#define MoveToBakFile(file) -@if [ -f file ]; then set -x; \		@@\
-	$(MV) file file.bak; else exit 0; fi
-#endif /* MoveToBakFile */
-
-#ifndef RMoveToBakFile
-#define RMoveToBakFile(file) -@if [ -f file ]; then set -x; \		@@\
-	RemoveFile(file.bak); $(MV) file file.bak; \			@@\
-	else exit 0; fi
-#endif /* RMoveToBakFile */
-
-/*
- * ServerTargetWithFlags - generate rules to compile, link, and relink a server
- */
-#ifndef ServerTargetWithFlags
-#define	ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,flags) @@\
-AllTarget(ProgramTargetName(server))					@@\
-ProgramTargetName(server): subdirs objects libs				@@\
-	MoveToBakFile($@)						@@\
-	LinkRule($@,$(LDOPTIONS),objects,libs $(LDLIBS) syslibs) @@\
-									@@\
-Concat(load,server):							@@\
-	MoveToBakFile(ProgramTargetName(server))			@@\
-	LinkRule(ProgramTargetName(server),$(LDOPTIONS),objects,libs $(LDLIBS) syslibs) @@\
-									@@\
-loadX:: Concat(load,server)						@@\
-									@@\
-SentinelProgramTarget(server,subdirs objects libs,objects libs $(LDLIBS) syslibs) @@\
-SentinelLinkTarget(Concat(load,server),server,objects libs $(LDLIBS) syslibs) @@\
-PurifyProgramTarget(server,subdirs objects libs,objects libs $(LDLIBS) syslibs) @@\
-PurifyLinkTarget(Concat(load,server),server,objects libs $(LDLIBS) syslibs) @@\
-ProofProgramTarget(server,subdirs objects libs,objects libs $(LDLIBS) syslibs) @@\
-ProofLinkTarget(Concat(load,server),server,objects libs $(LDLIBS) syslibs) @@\
-									@@\
-InstallProgramWithFlags(server,$(BINDIR),flags)				@@\
-									@@\
-clean::									@@\
-	RemoveFile(ProgramTargetName(server))
-#endif /* ServerTargetWithFlags */
-
-/*
- * ServerTarget - rules to compile, link, and relink a normal server
- */
-#ifndef ServerTarget
-#define	ServerTarget(server,subdirs,objects,libs,syslibs)		@@\
-ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,$(_NOOP_))
-#endif /* ServerTarget */
-
-#if DoRanlibCmd
-#define RanLibrary(args) $(RANLIB) args
-#else
-#define RanLibrary(args) $(_NULLCMD_)
-#endif
-
-#ifndef LibraryTargetName
-#define LibraryTargetName(libname)Concat(lib,libname.a)
-#endif
-
-#ifndef LibraryTargetNameSuffix
-#define LibraryTargetNameSuffix(libname,suffix)Concat3(lib,libname,suffix.a)
-#endif
-
-#ifndef InstallNamedTarget
-#define InstallNamedTarget(step,srcname,flags,dest,dstname)		@@\
-step:: srcname								@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) $(INSTALLFLAGS) flags srcname $(DESTDIR)dest/dstname
-#endif /* InstallNamedTarget */
-
-/*
- * InstallNamedTargetNoClobber - Like InstallNamedTarget, but doesn't
- * do the install if an installed version already exists.  Useful
- * for files that might have local customizations that you don't
- * want to clobber.  Config files are good candidates for this.
- */
-#ifndef InstallNamedTargetNoClobber
-#define InstallNamedTargetNoClobber(step,srcname,flags,dest,dstname)	@@\
-step:: srcname								@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	@if [ -f $(DESTDIR)dest/dstname ]; then \			@@\
-	 echo "Not overwriting existing" $(DESTDIR)dest/dstname; \	@@\
-	else set -x; \							@@\
-	 $(INSTALL) $(INSTALLFLAGS) flags srcname $(DESTDIR)dest/dstname; fi
-#endif /* InstallNamedTargetNoClobber */
-
-#ifndef InstallTarget
-#define InstallTarget(step,file,flags,dest)				@@\
-InstallNamedTarget(step,file,flags,dest,file)
-#endif /* InstallTarget */
-
-/*
- * InstallLibrary - generate rules to install the indicated library.
- */
-#ifndef InstallLibrary
-#define	InstallLibrary(libname,dest)					@@\
-install:: LibraryTargetName(libname)					@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) LibraryTargetName(libname) $(DESTDIR)dest @@\
-	RanLibrary($(RANLIBINSTFLAGS) $(DESTDIR)dest/LibraryTargetName(libname))
-#endif /* InstallLibrary */
-
-
-/*
- * InstallLinkKitLibrary - rule to install Link Kit library.
- *                         (only used for XFree86). This is a no-op
- *                         rule so that Imakefiles on non-XFree86 systems
- *                         continue to build Makefiles correctly.
- */
-#ifndef InstallLinkKitLibrary
-#define InstallLinkKitLibrary(lib,dir)
-#endif
-
-
-/*
- * InstallLinkKitNamedLibrary - rule to install Link Kit library.
- *                         (only used for XFree86). This is a no-op
- *                         rule so that Imakefiles on non-XFree86 systems
- *                         continue to build Makefiles correctly.
- */
-#ifndef InstallLinkKitNamedLibrary
-#define InstallLinkKitNamedLibrary(lib,dlib,dir)
-#endif
-
-
-/*
- * MergeIntoInstalledLibrary - generate rules to merge one library into another
- */
-#ifndef MergeIntoInstalledLibrary
-#define MergeIntoInstalledLibrary(tolib,fromlib)			@@\
-install::  fromlib							@@\
-	$(SCRIPTSRC)/mergelib $(DESTDIR)tolib fromlib
-#endif /* MergeIntoInstalledLibrary */
-
-/*
- * InstallLibraryAlias - generate rules to create a link from one library name
- * to another for the purposes of aliasing.
- */
-#ifndef InstallLibraryAlias
-#define	InstallLibraryAlias(libname,alias,dest)				@@\
-install::								@@\
-	-(cd $(DESTDIR)dest && ( \					@@\
-		RemoveFile(LibraryTargetName(alias)); \			@@\
-		$(LN) LibraryTargetName(libname) LibraryTargetName(alias)))
-#endif /* InstallLibraryAlias */
-
-
-/*
- * InstallLintLibrary - generate rules to install the indicated lint library.
- */
-#ifndef InstallLintLibrary
-#define	InstallLintLibrary(libname,dest)				@@\
-InstallTarget(install.ln,Concat(llib-l,libname.ln),$(INSTLIBFLAGS),dest)
-#endif /* InstallLintLibrary */
-
-
-/*
- * InstallManPageLong - generate rules to install the indicated manual page,
- * giving it an alternate name.  This is used for installing man pages whose
- * base name without the .man suffix would normally be longer than 8 characters
- * (the limit for using source code control systems on files systems with 
- * short file names).
- */
-#ifndef InstallManPageLong
-#define	InstallManPageLong(file,destdir,dest)				@@\
-InstallNamedTarget(install.man,file.man,$(INSTMANFLAGS),destdir,dest.$(MANSUFFIX))
-#endif /* InstallManPageLong */
-
-
-/*
- * InstallManPage - generate rules to install the indicated manual page.
- */
-#ifndef InstallManPage
-#define	InstallManPage(file,destdir)					@@\
-InstallManPageLong(file,destdir,file)
-#endif /* InstallManPage */
-
-
-/*
- * InstallManPageAliases - generate rules to install manual page aliases.
- */
-#ifndef InstallManPageAliases
-#define	InstallManPageAliases(file,destdir,aliases)			@@\
-install.man::								@@\
-	@(TMP=/tmp/tmp.$$$$; \						@@\
-	RemoveFile($${TMP}); \						@@\
-	echo .so `basename destdir`/file.$(MANSUFFIX) > $${TMP}; \	@@\
-	for i in aliases; do (set -x; \					@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.$(MANSUFFIX)); \ @@\
-	done; \								@@\
-	RemoveFile($${TMP}))
-#endif /* InstallManPageAliases */
-
-
-/*
- * InstallGenManPageLong - More general rules for installing manual pages --
- * doesn't assume MANSUFFIX.
- */
-#ifndef InstallGenManPageLong
-#define	InstallGenManPageLong(file,destdir,dest,suffix)			@@\
-install.man:: file.man							@@\
-	MakeDir($(DESTDIR)destdir)					@@\
-	$(INSTALL) -c $(INSTMANFLAGS) file.man $(DESTDIR)destdir/dest.suffix
-#endif /* InstallGenManPageLong */
-
-
-/*
- * InstallGenManPage - general equivalent of InstallManPage
- */
-#ifndef InstallGenManPage
-#define	InstallGenManPage(file,destdir,suffix)				@@\
-InstallGenManPageLong(file,destdir,file,suffix)
-#endif /* InstallGenManPage */
-
-
-/*
- * InstallGenManPageAliases - general equivalent of InstallManPageAliases
- */
-#ifndef InstallGenManPageAliases
-#define	InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
-install.man::								@@\
-	@(TMP=/tmp/tmp.$$$$; \						@@\
-	RemoveFile($${TMP}); \						@@\
-	echo .so `basename destdir`/file.suffix > $${TMP}; \		@@\
-	for i in aliases; do (set -x; \					@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.suffix); \ @@\
-	done; \								@@\
-	RemoveFile($${TMP}))
-#endif /* InstallGenManPageAliases */
-
-/*
- * ManKeywordsTarget - generate the database used by "man -k".
- * This rule updates the index in the directory "manpath", which
- * indexes all the manual pages in the section subdirectories under
- * it.  An update command is defined only on systems that have a
- * per MANPATH element index.  If the OS supports only one system-wide
- * database, we don't update it, because then we can't do cross
- * installations or use a non-empty DESTDIR for testing.
- */
-#ifndef ManKeywordsTarget
-#define ManKeywordsTarget(manpath) man_keywords::
-#endif
-
-/*
- * InstallNamedNonExec - generate rules to install a data file
- */
-#ifndef InstallNamedNonExec
-#define	InstallNamedNonExec(srcname,dstname,dest)			@@\
-InstallNamedTarget(install,srcname,$(INSTDATFLAGS),dest,dstname)
-#endif /* InstallNamedNonExec */
-
-
-/*
- * InstallLinkKitNamedNonExec - rule for installing server Link Kit files.
- *                         (only used for XFree86). This is a no-op
- *                         rule so that Imakefiles on non-XFree86 systems
- *                         continue to build Makefiles correctly.
- */
-#ifndef InstallLinkKitNamedNonExec
-#define InstallLinkKitNamedNonExec(srcname,dstname,dest)
-#endif
-
-
-/*
- * InstallNonExecFile - generate rules to install a data file
- */
-#ifndef InstallNonExecFile
-#define InstallNonExecFile(file,dest)					@@\
-InstallTarget(install,file,$(INSTDATFLAGS),dest)
-#endif /* InstallNonExecFile */
-
-
-/*
- * InstallNonExecFileNoClobber - install a data file once
- */
-#ifndef InstallNonExecFileNoClobber
-#define InstallNonExecFileNoClobber(file,dest)				@@\
-InstallNamedTargetNoClobber(install,file,$(INSTDATFLAGS),dest,file)
-#endif /* InstallNonExecFileNoClobber */
-
-
-/*
- * InstallLinkKitNonExecFile - rule for installing server Link Kit files.
- *                         (only used for XFree86). This is a no-op
- *                         rule so that Imakefiles on non-XFree86 systems
- *                         continue to build Makefiles correctly.
- */
-#ifndef InstallLinkKitNonExecFile
-#define InstallLinkKitNonExecFile(file,dir)
-#endif
-
-
-/*
- * InstallNonExec - generate rules to install a data file, but does not
- * try to create the destination directory (deprecated)
- */
-#ifndef InstallNonExec
-#define	InstallNonExec(file,dest)					@@\
-install:: file								@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) file $(DESTDIR)dest
-#endif /* InstallNonExec */
-
-
-/*
- * InstallProgramWithFlags - generate rules to install an executable program
- * using given install flags.
- */
-#ifndef InstallProgramWithFlags
-#define InstallProgramWithFlags(program,dest,flags)			@@\
-InstallTarget(install,ProgramTargetName(program),$(INSTPGMFLAGS) flags,dest)
-#endif /* InstallProgramWithFlags */
-
-
-/*
- * InstallProgram - generate rules to install an executable program using any
- * special install flags set in $(INSTALLFLAGS).
- */
-#ifndef InstallProgram
-#define	InstallProgram(program,dest)					@@\
-InstallProgramWithFlags(program,dest,NullParameter)
-#endif /* InstallProgram */
-
-
-
-/*
- * InstallScript - install a shell script.
- */
-#ifndef InstallScript
-#define	InstallScript(program,dest)					@@\
-InstallNamedTarget(install,program.script,$(INSTBINFLAGS),dest,program)
-#endif /* InstallScript */
-
-
-/*
- * InstallNamedProg - install a program with renaming and no stripping.
- */
-#ifndef InstallNamedProg
-#define InstallNamedProg(srcname,dstname,dest)				@@\
-InstallNamedTarget(install,srcname,$(INSTBINFLAGS),dest,dstname)
-#endif /* InstallNamedProg */
-
-
-/*
- * InstallNamedProgNoClobber - Like InstallNamedProg, but doesn't
- * do the install if an installed version already exists.
- */
-#ifndef InstallNamedProgNoClobber
-#define InstallNamedProgNoClobber(srcname,dstname,dest)			@@\
-InstallNamedTargetNoClobber(install,srcname,$(INSTBINFLAGS),dest,dstname)
-#endif /* InstallNamedProgNoClobber */
-
-
-/*
- * InstallLinkKitNamedProg - rule for installing server Link Kit files.
- *                         (only used for XFree86). This is a no-op
- *                         rule so that Imakefiles on non-XFree86 systems
- *                         continue to build Makefiles correctly.
- */
-#ifndef InstallLinkKitNamedProg
-#define InstallLinkKitNamedProg(srcname,dstname,dest)
-#endif
-
-
-/*
- * MakeFlagsToShellFlags - set variables before starting a loop.
- * makeflags is the set of "make" flags to check.
- * shellcmd is the shell command to execute if any of the flags are set.
- *
- * The usual use of this rule is to translate make's "don't quit on error"
- * flags into the equivalent for the shell.  To do this, "make -i" always
- * becomes "set +e".  "make -k" should also turn on "set +e" if the target
- * is building subdirectories.  That is, subdirectories are independent
- * and should appear to be multiple targets, even though they are
- * implemented in a loop in a single target.
- */
-#ifndef MakeFlagsToShellFlags
-#define MakeFlagsToShellFlags(makeflags,shellcmd)\
-	for flag in ${MAKEFLAGS} ''; do \				@@\
-	  case "$$flag" in *=*) ;; *[makeflags]*) shellcmd;; esac; done
-#endif
-
-/*
- * MakeNamedTargetSubdir - do make in a subdir.
- */
-#ifndef MakeNamedTargetSubdir
-#define MakeNamedTargetSubdir(dir,flags,subname)\
-		(cd dir && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \	@@\
-			flags subname)
-#endif
-
-/*
- * LinkFileList - link a list of files from one place to another
- */
-#ifndef LinkFileList
-#define LinkFileList(step,list,dir,sub)					@@\
-step:: list								@@\
-	@MakeFlagsToShellFlags(i,set +e); \				@@\
-	echo "	cd" dir; cd dir && \					@@\
-	for i in list; do (set -x; RemoveFile($$i); $(LN) sub/$$i .); done
-#endif
-
-
-/*
- * LinkVarDirectory
- *
- * Make links from $LIBDIR (<ProjectRoot>/lib/X11) to /var/X11/
- * For example /usr/X11R6/lib/X11/xdm ==> /var/X11/xdm so that X can be
- * run from a read-only volume like a CD-ROM.
- */
-#ifndef LinkVarDirectory
-#if HasVarDirectory && HasSymLinks
-#define LinkVarDirectory(mdir,cdir,rdir,ldir)				@@\
-install::								@@\
-	MakeDir(Concat($(DESTDIR)$(LIBDIR)/,cdir))			@@\
-	MakeDir(Concat($(VARDIR)/,mdir))				@@\
-	@MakeFlagsToShellFlags(i,set +e); \				@@\
-	if [ -d Concat($(DESTDIR)$(LIBDIR)/,cdir) ]; then \		@@\
-	  cd Concat($(DESTDIR)$(LIBDIR)/,cdir); \			@@\
-	  if [ -d rdir -a ! -h rdir ]; then \				@@\
-	    (cd rdir; tar cf - . | (cd Concat($(VARDIR)/,mdir); tar xf -; exit 0); exit 0); \ @@\
-	  fi; \								@@\
-	  $(RM) -r rdir; \						@@\
-	  $(LN) Concat($(VARDIR)/,mdir) ldir; \				@@\
-	fi
-#else
-#define LinkVarDirectory(mdir,cdir,rdir,ldir)
-#endif
-#endif
-
-
-/*
- * InstallMultipleDestFlags - generate rules to install multiple files at
- * once during a particular step in the build using a specific set of install 
- * flags.
- */
-#ifndef InstallMultipleDestFlags
-#define InstallMultipleDestFlags(step,list,dest,flags)			@@\
-step:: list								@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	@MakeFlagsToShellFlags(i,set +e); \				@@\
-	for i in list; do \						@@\
-		(set -x; $(INSTALL) $(INSTALLFLAGS) flags $$i $(DESTDIR)dest); \	@@\
-	done
-#endif /* InstallMultipleDestFlags */
-
-
-/*
- * InstallLinkKitMultipleDestFlags - rule for installing server Link Kit files.
- *                         (only used for XFree86). This is a no-op
- *                         rule so that Imakefiles on non-XFree86 systems
- *                         continue to build Makefiles correctly.
- */
-#ifndef InstallLinkKitMultipleDestFlags
-#define InstallLinkKitMultipleDestFlags(list,dest,flags)
-#endif
-
-
-/*
- * InstallMultipleDest - generate rules to install multiple files at once
- * during a particular step in the build using any install flags set in 
- * $(INSTDATFLAGS).
- */
-#ifndef InstallMultipleDest
-#define InstallMultipleDest(step,list,dest)				@@\
-InstallMultipleDestFlags(step,list,dest,$(INSTDATFLAGS))
-#endif /* InstallMultipleDest */
-
-/*
- * InstallMultiple - generate rules to install multiple files at once 
- * during the install step of the build using any install flags set in 
- * $(INSTALLFLAGS).
- */
-#ifndef InstallMultiple
-#define	InstallMultiple(list,dest)					@@\
-InstallMultipleDest(install,list,dest)
-#endif /* InstallMultiple */
-
-
-/*
- * InstallMultipleFlags - generate rules to install multiple files at once
- * during the install step of the build using the given install flags.
- */
-#ifndef InstallMultipleFlags
-#define InstallMultipleFlags(list,dest,flags)				@@\
-InstallMultipleDestFlags(install,list,dest,flags)
-#endif /* InstallMultipleFlags */
-
-
-/*
- * InstallMultipleMan - generate rules to install a variety of manual pages
- * during the install.man step of the build.
- */
-#ifndef InstallMultipleMan
-#define InstallMultipleMan(list,dest)					@@\
-InstallMultipleDestFlags(install.man,list,dest,$(INSTMANFLAGS))
-#endif /* InstallMultipleMan */
-
-/*
- * IncludeMakefile - rule to include another Makefile.
- * Must not generate an error or even a warning if the named file
- * is not present, since we use this to include Makefile.dep, which
- * may not be built yet.
- * This is defined non-null iff HasMakefileSafeInclude is YES.
- * The double-@ is to ensure no leading spaces on the line.
- */
-#ifndef IncludeMakefile
-#if HasClearmake
-#define IncludeMakefile(file) @@sinclude file
-#else
-#if HasBsdMake
-#define IncludeMakefile(file) @@# dependencies are in .depend
-#else
-#define IncludeMakefile(file) /**/
-#endif
-#endif
-#endif
-
-/*
- * DependDependencyStatement - Used by DependDependency to set up the
- * most specific dependency, which differs based on whether we support
- * a separate Makefile.dep on this platform.
- */
-#ifndef DependDependencyStatement
-#if HasMakefileSafeInclude
-#define DependDependencyStatement()					@@\
-DependFileName:: ProgramTargetName($(DEPEND))
-#else
-#define DependDependencyStatement()					@@\
-depend:: ProgramTargetName($(DEPEND))
-#endif
-#endif
-
-/*
- * DependDependency - generate rules to build the makedepend program if 
- * this Imakefile is within the source tree.
- */
-#ifndef DependDependency
-#ifdef UseInstalled
-#define DependDependency() /**/
-#else
-#define DependDependency() 						@@\
-DependDependencyStatement()						@@\
-									@@\
-NoCmpScript(ProgramTargetName($(DEPEND)))				@@\
-									@@\
-ProgramTargetName($(DEPEND)):						@@\
-	@echo "checking $@ over in $(DEPENDSRC) first..."; \		@@\
-	cd $(DEPENDSRC) && $(MAKE); \					@@\
-	echo "okay, continuing in $(CURRENT_DIR)"
-
-#endif /* UseInstalled */
-#endif /* DependDependency */
-
-
-/*
- * DependTarget - generate rules to compute dependencies for all files listed
- * in $(SRCS).
- */
-#ifndef DependTarget
-#if HasMakefileSafeInclude
-#define DependTarget()							@@\
-DependDependency()							@@\
-									@@\
-depend:: DependFileName							@@\
-									@@\
-DependFileName::							@@\
-	RemoveFile($@)							@@\
-	RunProgram(DEPEND,-f- $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS)) > $@
-#else /* HasMakefileSafeInclude */
-#define	DependTarget()							@@\
-DependDependency()							@@\
-									@@\
-depend::								@@\
-	RunProgram(DEPEND,$(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS))
-#endif /* HasMakefileSafeInclude else */
-#endif /* DependTarget */
-
-/*
- * DependTarget3 - generate rules to compute dependencies for all files given.
- */
-#ifndef DependTarget3
-#if HasMakefileSafeInclude
-#define DependTarget3(srcs1,srcs2,srcs3)				@@\
-DependDependency()							@@\
-									@@\
-depend:: DependFileName							@@\
-									@@\
-DependFileName::							@@\
-	RemoveFile($@)							@@\
-	RunProgram(DEPEND,-f- $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs1) > $@	@@\
-	RunProgram(DEPEND,-f- $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs2) >> $@	@@\
-	RunProgram(DEPEND,-f- $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs3) >> $@
-#else /* HasMakefileSafeInclude */
-#define	DependTarget3(srcs1,srcs2,srcs3)				@@\
-DependDependency()							@@\
-									@@\
-depend::								@@\
-	RunProgram(DEPEND,$(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs1)	@@\
-	RunProgram(DEPEND,-a $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs2)	@@\
-	RunProgram(DEPEND,-a $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs3)
-#endif /* HasMakefileSafeInclude else */
-#endif /* DependTarget3 */
-
-
-/*
- * CleanTarget - generate rules to remove any garbage files
- */
-#ifndef CleanTarget
-#define	CleanTarget()							@@\
-clean::									@@\
-	$(RM) FilesToClean ExtraFilesToClean "#"*			@@\
-									@@\
-ProofCleanTarget()
-#endif /* CleanTarget */
-
-
-/*
- * TagsTarget - generate rules to compute tags files for C source code.
- */
-#ifndef TagsTarget
-#define	TagsTarget()							@@\
-tags::									@@\
-	$(TAGS) -w *.[ch]						@@\
-	$(TAGS) -xw *.[ch] > TAGS
-#endif /* TagsTarget */
-
-
-/*
- * ImakeDependency - generate rules to compile imake if this Imakefile is
- * within the source tree.
- */
-#ifndef ImakeDependency
-#ifdef UseInstalled
-#define ImakeDependency(target) /**/
-#else
-#define ImakeDependency(target)						@@\
-target:: ProgramTargetName($(IMAKE))					@@\
-									@@\
-NoCmpScript(ProgramTargetName($(IMAKE)) $(IMAKE).Osuf)			@@\
-									@@\
-ProgramTargetName($(IMAKE)) $(IMAKE).Osuf:				@@\
-	-@(cd $(IMAKESRC) && if [ -f Makefile ]; then \			@@\
-	echo "checking $@ in $(IMAKESRC) first..."; $(MAKE) all; else \	@@\
-	echo "bootstrapping $@ from Makefile.ini in $(IMAKESRC) first..."; \	@@\
-	$(MAKE) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"; fi; \	@@\
-	echo "okay, continuing in $(CURRENT_DIR)")
-#endif /* UseInstalled */
-#endif /* ImakeDependency */
-
-
-/*
- * BuildMakefileTarget - generate rules to build a Makefile from an Imakefile
- * and any special imake flags.  This is generally done automatically by the
- * template or by any special Imakefiles.  The first argument exists just
- * because imakeflags is usually empty and some preprocessors will complain
- * if an empty argument is passed as the sole argument to a macro.
- */
-#ifndef BuildMakefileTarget
-#define	BuildMakefileTarget(notused,imakeflags)				@@\
-ImakeDependency(Makefile)						@@\
-									@@\
-Makefile:: 								@@\
-	RMoveToBakFile(Makefile)					@@\
-	$(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) imakeflags
-
-#endif /* BuildMakefileTarget */
-
-
-/*
- * MakefileTarget - generate rules to build a normal Makefile.
- */
-#ifndef MakefileTarget
-#define MakefileTarget()						@@\
-BuildMakefileTarget(Imakefile,NullParameter)
-#endif /* MakefileTarget */
-
-
-/*
- * LibMkdir - helper for creating library object subdirectories
- */
-#ifndef LibMkdir
-#define LibMkdir(dir) DirFailPrefix@if [ -d dir ]; then exit 0; else set -x; mkdir dir; fi
-#endif
-
-#ifndef LibMkdirLinkSubdirs
-#define LibMkdirLinkSubdirs(dir) DirFailPrefix@if [ -d dir ]; then \	@@\
-	    exit 0; \							@@\
-	else \								@@\
-	    echo "mkdir dir"; mkdir dir; \				@@\
-	    for i in $(SUBDIRS); do \					@@\
-	      j=`echo "$$i" | sed -e 's;[^/]\{1,\};..;g'`; \		@@\
-	      $(MKDIRHIER) "dir/`dirname $$i`"; \			@@\
-	      echo $(LN) "$$j/$$i/dir" "dir/$$i"; \			@@\
-	      $(LN) "$$j/$$i/dir" "dir/$$i"; \				@@\
-	    done; \							@@\
-	fi
-#endif
-
-/*
- * LibCleanDir - helper for cleaning library object subdirectories
- */
-#ifndef LibCleanDir
-#define LibCleanDir(dir) -@if [ -d dir ]; then \			@@\
-		set -x; $(RM) -r dir; else exit 0; fi
-#endif
-
-/*
- * LintLibReferences - variables for lint libraries
- */
-#ifndef LintLibReferences
-#define LintLibReferences(varname,libname,libsource)			@@\
-Concat(LINT,varname) = _UseCat($(LINTLIBDIR)/llib-l,libsource/llib-,libname.ln)
-#endif
-
-
-/*
- * UnsharedLibReferences - variables for unshared libraries
- */
-#ifndef UnsharedLibReferences
-#define UnsharedLibReferences(varname,libname,libsource)		@@\
-ProjectUnsharedLibReferences(varname,libname,libsource,$(BUILDLIBDIR))
-#endif
-
-/*
- * ProjectUnsharedLibReferences - variables for unshared libraries
- */
-#ifndef ProjectUnsharedLibReferences
-#define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir)	@@\
-Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/,buildlibdir/,LibraryTargetName(libname))	@@\
-Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname)		@@\
-LintLibReferences(varname,libname,libsource)
-#endif
-
-/*
- * SharedLibDependencies - shared library dependencies
- */
-#ifndef SharedLibDependencies
-#define SharedLibDependencies(libname,libsource,revname) /**/
-#endif
-
-/*
- * SharedDSLibDependencies - shared library dependencies with data separation
- */
-#ifndef SharedDSLibDependencies
-#define SharedDSLibDependencies(libname,libsource,revname) /**/
-#endif
-
-/*
- * SharedLibReferences - variables for shared libraries
- */
-#ifndef SharedLibReferences
-#define SharedLibReferences(varname,libname,libsource,revname,rev)	@@\
-revname = rev								@@\
-Concat3(DEP,varname,LIB) = SharedLibDependencies(libname,libsource,revname) @@\
-Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname)		@@\
-LintLibReferences(varname,libname,libsource)
-#endif
-
-/*
- * SharedDSLibReferences - variables for shared libraries with data separation
- */
-#ifndef SharedDSLibReferences
-#define SharedDSLibReferences(varname,libname,libsource,revname,rev)	@@\
-revname = rev								@@\
-Concat3(DEP,varname,LIB) = SharedDSLibDependencies(libname,libsource,revname) @@\
-Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname)		@@\
-LintLibReferences(varname,libname,libsource)
-#endif
-
-/*
- * CPPOnlyCompile - run C compiler's preprocessor only
- */
-#ifndef CPPOnlyCompile
-#define CPPOnlyCompile(src,options) RemoveFile($@)			@@\
-	ClearmakeOSName \
-	$(CC) -E $(CFLAGS) options src > $@
-#endif
-
-/*
- * ObjectCompile - compile fragment for a normal object file
- */
-#ifndef ObjectCompile
-#define ObjectCompile(options) RemoveFile($@)				@@\
-	ClearmakeOSName \
-	$(CC) -c $(CFLAGS) options $*.c
-#endif
-
-#ifndef ObjectCplusplusCompile
-#define ObjectCplusplusCompile(options) RemoveFile($@)			@@\
-	ClearmakeOSName \
-	$(CXX) -c $(CXXFLAGS) options $*.CCsuf
-#endif
-
-/*
- * NormalLibObjCompile - compile fragment for a normal library object file
- */
-#ifndef NormalLibObjCompile
-#define NormalLibObjCompile(options) ObjectCompile(options)
-#endif
-
-#ifndef NormalLibObjCplusplusCompile
-#define NormalLibObjCplusplusCompile(options) ObjectCplusplusCompile(options)
-#endif
-
-/*
- * NormalSharedLibObjCompile - compile fragment for shared objects
- */
-#ifndef NormalSharedLibObjCompile
-#define NormalSharedLibObjCompile(options) NormalLibObjCompile(options $(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS))
-#endif
-
-#ifndef NormalSharedLibObjCplusplusCompile
-#define NormalSharedLibObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options $(SHLIBDEF) $(SHAREDCODEDEF) $(CXXPICFLAGS))
-#endif
-
-/*
- * LibObjCompile - compile fragment for unshared/profiled/debugged objects
- */
-#ifndef LibObjCompile
-#if HasGcc || HasGcc2
-#define LibObjCompile(dir,options) RemoveFiles($@ dir/$@)		@@\
-	ClearmakeOSName \
-	$(CC) -c $(CCOPTIONS) $(ALLDEFINES) options $*.c -o dir/$@
-#else
-#define LibObjCompile(dir,options) RemoveFiles($@ dir/$@)		@@\
-	ClearmakeOSName \
-	$(CC) -c $(CCOPTIONS) $(ALLDEFINES) options $*.c		@@\
-	$(MV) $@ dir/$@
-#endif
-#endif
-
-#ifndef LibObjCplusplusCompile
-#if HasGcc || HasGcc2
-#define LibObjCplusplusCompile(dir,options) RemoveFiles($@ dir/$@)	@@\
-	ClearmakeOSName \
-	$(CXX) -c $(CXXOPTIONS) $(CXXDEFINES) options $*.CCsuf -o dir/$@
-#else
-#define LibObjCplusplusCompile(dir,options) RemoveFiles($@ dir/$@)	@@\
-	ClearmakeOSName \
-	$(CXX) -c $(CXXOPTIONS) $(CXXDEFINES) options $*.CCsuf		@@\
-	$(MV) $@ dir/$@
-#endif
-#endif
-
-/*
- * DebuggedLibObjCompile - compile fragment for debugged objects
- */
-#ifndef DebuggedLibObjCompile
-#define DebuggedLibObjCompile(options) LibObjCompile(debugger,DebuggableCDebugFlags options)
-#endif
-
-#ifndef DebuggedLibObjCplusplusCompile
-#define DebuggedLibObjCplusplusCompile(options) LibObjCplusplusCompile(debugger,DebuggableCplusplusDebugFlags options)
-#endif
-
-/*
- * ProfiledLibObjCompile - compile fragment for profiled objects
- */
-#ifndef ProfiledLibObjCompile
-#define ProfiledLibObjCompile(options) LibObjCompile(profiled,ProfiledCDebugFlags options)
-#endif
-
-#ifndef ProfiledLibObjCplusplusCompile
-#define ProfiledLibObjCplusplusCompile(options) LibObjCplusplusCompile(profiled,ProfiledCplusplusDebugFlags options)
-#endif
-
-/*
- * UnsharedLibObjCompile - compile fragment for unshared objects
- */
-#ifndef UnsharedLibObjCompile
-#define UnsharedLibObjCompile(options) LibObjCompile(unshared,$(CDEBUGFLAGS) options)
-#endif
-
-#ifndef UnsharedLibObjCplusplusCompile
-#define UnsharedLibObjCplusplusCompile(options) LibObjCplusplusCompile(unshared,$(CXXDEBUGFLAGS) options)
-#endif
-
-/*
- * SharedLibObjCompile - compile fragment for shared objects
- */
-#ifndef SharedLibObjCompile
-#define SharedLibObjCompile(options) LibObjCompile(shared,options $(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) $(CDEBUGFLAGS))
-#endif
-
-/*
- * NormalLibraryObjectRule - for simple libraries
- */
-#ifndef NormalLibraryObjectRule
-#define	NormalLibraryObjectRule()					@@\
-.c.Osuf:								@@\
-	NormalLibObjCompile($(_NOOP_))
-#endif /* NormalLibraryObjectRule */
-
-#ifndef NormalCplusplusObjectRule
-#define NormalCplusplusObjectRule()					@@\
-.CCsuf.Osuf:								@@\
-	NormalLibObjCplusplusCompile($(_NOOP_))
-#endif
-
-#ifndef NormalFortranObjectRule
-#define NormalFortranObjectRule()					@@\
-.f.Osuf:								@@\
-	RemoveFile($@)							@@\
-	ClearmakeOSName \
-	$(FC) -c $(FCFLAGS) $*.f
-#endif
-
-/*
- * SpecialObjectRule - generate rules to compile a file with special flags.
- */
-#ifndef SpecialObjectRule
-#define SpecialObjectRule(objs,depends,options)				@@\
-objs:	depends								@@\
-	ObjectCompile(options)
-#endif /* SpecialObjectRule */
-
-#ifndef SpecialCplusplusObjectRule
-#define SpecialCplusplusObjectRule(baseobj,basedep,options)		@@\
-baseobj.Osuf:	basedep.CCsuf						@@\
-	ObjectCplusplusCompile(options)
-#endif /* SpecialCplusplusObjectRule */
-
-/*
- * SpecialCObjectRule - generate rules to compile a C file with special flags.
- *			also handles CodeCenter rules
- */
-#ifndef SpecialCObjectRule
-#define SpecialCObjectRule(basename,depends,options)			@@\
-SpecialObjectRule(basename.Osuf,basename.c depends,options)		@@\
-									@@\
-basename.i: basename.c depends						@@\
-	CPPOnlyCompile(basename.c,options)				@@\
-									@@\
-CenterLoadTarget(debug_src,basename.c,NullParameter,$(ALLDEFINES) options)
-#endif /* SpecialCObjectRule */
-
-
-#ifndef ObjectFromSpecialSource
-#define ObjectFromSpecialSource(dst,src,flags)				@@\
-NoConfigRec(dst.c)							@@\
-									@@\
-dst.c:  src.c								@@\
-	RemoveFile($@)							@@\
-	$(LN) $? $@							@@\
-									@@\
-SpecialCObjectRule(dst,NullParameter,flags)				@@\
-									@@\
-includes:: dst.c							@@\
-									@@\
-depend::  dst.c								@@\
-									@@\
-clean::									@@\
-	RemoveFile(dst.c)
-#endif /* ObjectFromSpecialSource */
-
-#ifndef LexFileExplicit
-#if HasClearmake		/* provide a place to hang ClearmakeOSName */
-#define LexFileExplicit(file)						@@\
-file.c: file.l								@@\
-	ClearmakeOSName \
-	$(LEX) $(LFLAGS) file.l						@@\
-	$(MV) lex.yy.c file.c
-#else
-#define LexFileExplicit(file) /* the default rule is fine */
-#endif
-#endif
-
-#ifndef LexFile
-#define LexFile(file)							@@\
-LexFileExplicit(file)							@@\
-									@@\
-depend:: file.c								@@\
-									@@\
-clean::									@@\
-	RemoveFiles(lex.yy.c file.c)
-#endif /* LexFile */
-
-#ifndef YaccFile
-#if HasGnuMake
-#define YaccFile(file,flags)						@@\
-depend:: file.c								@@\
-									@@\
-file.h: file.c								@@\
-									@@\
-file.c: file.y								@@\
-	ClearmakeOSName \
-	$(YACC) flags file.y						@@\
-	$(MV) y.tab.c file.c						@@\
-	@if [ -f y.tab.h ]; then set -x; $(MV) y.tab.h file.h; \	@@\
-	else exit 0; fi							@@\
-									@@\
-clean::									@@\
-	RemoveFiles(y.tab.c y.tab.h file.h file.c)
-#else
-#define YaccFile(file,flags)						@@\
-depend:: file.c								@@\
-									@@\
-file.h file.c: file.y							@@\
-	ClearmakeOSName \
-	$(YACC) flags file.y						@@\
-	$(MV) y.tab.c file.c						@@\
-	@if [ -f y.tab.h ]; then set -x; $(MV) y.tab.h file.h; \	@@\
-	else exit 0; fi							@@\
-									@@\
-clean::									@@\
-	RemoveFiles(y.tab.c y.tab.h file.h file.c)
-#endif
-#endif /* YaccFile */
-
-#ifndef YaccFileNoFlags
-#define YaccFileNoFlags(file)						@@\
-depend:: file.c								@@\
-									@@\
-file.c: file.y								@@\
-	ClearmakeOSName \
-	$(YACC) file.y							@@\
-	$(MV) y.tab.c file.c						@@\
-									@@\
-clean::									@@\
-	RemoveFiles(y.tab.c file.c)
-#endif /* YaccFileNoFlags */
-
-
-#ifndef MakeLibrary
-#define MakeLibrary(libname,objlist) $(AR) libname objlist
-#endif
-
-#ifndef LinkBuildLibrary
-#ifdef UseInstalled
-#define LinkBuildLibrary(lib) $(_NULLCMD_)
-#else
-#define LinkBuildLibrary(lib) MakeDir($(BUILDLIBDIR))			@@\
-	RemoveFile($(BUILDLIBDIR)/lib)					@@\
-	cd $(BUILDLIBDIR) && $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/lib .
-#endif
-#endif /* LinkBuildLibrary */
-
-#ifndef _LinkBuildLibrary /* will get redefined elsewhere */
-#define _LinkBuildLibrary(lib) $(_NULLCMD_)
-#endif /* _LinkBuildLibrary */
-
-/*
- * NormalLibraryTarget - generate rules to create a library.
- */
-#ifndef NormalLibraryTarget
-#define	NormalLibraryTarget(libname,objlist)				@@\
-AllTarget(LibraryTargetName(libname))					@@\
-									@@\
-LibraryTargetName(libname): objlist $(EXTRALIBRARYDEPS)			@@\
-	RemoveFile($@)							@@\
-	MakeLibrary($@,objlist)						@@\
-	RanLibrary($@)							@@\
-	_LinkBuildLibrary($@)
-#endif /* NormalLibraryTarget */
-
-
-/*
- * NormalLibraryTarget2 - generate rules to create a library in two steps.
- * This is used to create libraries with large numbers of files.
- */
-#ifndef NormalLibraryTarget2
-#define	NormalLibraryTarget2(libname,objlist1,objlist2)			@@\
-AllTarget(LibraryTargetName(libname))					@@\
-									@@\
-LibraryTargetName(libname): objlist1 objlist2 $(EXTRALIBRARYDEPS)	@@\
-	RemoveFile($@)							@@\
-	MakeLibrary($@,objlist1)					@@\
-	MakeLibrary($@,objlist2)					@@\
-	RanLibrary($@)							@@\
-	_LinkBuildLibrary($@)
-#endif /* NormalLibraryTarget2 */
-
-
-/*
- * NormalLibraryTarget3 - generate rules to create a library in three steps.
- * This is used to create libraries with very large numbers of files.
- */
-#ifndef NormalLibraryTarget3
-#define	NormalLibraryTarget3(libname,objlist1,objlist2,objlist3)	@@\
-AllTarget(LibraryTargetName(libname))					@@\
-									@@\
-LibraryTargetName(libname): objlist1 objlist2 objlist3 $(EXTRALIBRARYDEPS)	@@\
-	RemoveFile($@)							@@\
-	MakeLibrary($@,objlist1)					@@\
-	MakeLibrary($@,objlist2)					@@\
-	MakeLibrary($@,objlist3)					@@\
-	RanLibrary($@)							@@\
-	_LinkBuildLibrary($@)
-#endif /* NormalLibraryTarget3 */
-
-
-/*
- * NormalDepLibraryTarget - generate rules to create a library.
- */
-#ifndef NormalDepLibraryTarget
-#define	NormalDepLibraryTarget(libname,deplist,objlist)			@@\
-AllTarget(LibraryTargetName(libname))					@@\
-									@@\
-LibraryTargetName(libname): deplist $(EXTRALIBRARYDEPS)			@@\
-	RemoveFile($@)							@@\
-	MakeLibrary($@,objlist)						@@\
-	RanLibrary($@)							@@\
-	_LinkBuildLibrary($@)
-#endif /* NormalDepLibraryTarget */
-
-
-/*
- * UnsharedLibraryTarget - generate rules to create a library.
- */
-#ifndef UnsharedLibraryTarget
-#define	UnsharedLibraryTarget(libname,objlist,down,up)			@@\
-AllTarget(LibraryTargetName(libname))					@@\
-									@@\
-LibraryTargetName(libname): objlist $(EXTRALIBRARYDEPS)			@@\
-	RemoveFile($@)							@@\
-	(cd down && MakeLibrary(up/$@,objlist))				@@\
-	RanLibrary($@)							@@\
-	_LinkBuildLibrary($@)
-#endif /* UnsharedLibraryTarget */
-
-
-/*
- * UnsharedLibraryTarget3 - generate rules to create a library in three steps.
- * This is used to create libraries with very large numbers of files.
- */
-#ifndef UnsharedLibraryTarget3
-#define	UnsharedLibraryTarget3(libname,objlist1,objlist2,objlist3,down,up) @@\
-AllTarget(LibraryTargetName(libname))					@@\
-									@@\
-LibraryTargetName(libname): objlist1 objlist2 objlist3 $(EXTRALIBRARYDEPS)	@@\
-	RemoveFile($@)							@@\
-	(cd down && MakeLibrary(up/$@,objlist1))			@@\
-	(cd down && MakeLibrary(up/$@,objlist2))			@@\
-	(cd down && MakeLibrary(up/$@,objlist3))			@@\
-	RanLibrary($@)							@@\
-	_LinkBuildLibrary($@)
-#endif /* UnsharedLibraryTarget3 */
-
-
-/*
- * SubdirLibraryRule -
- */
-#ifndef SubdirLibraryRule
-#define	SubdirLibraryRule(objlist)					@@\
-all:: DONE								@@\
-									@@\
-DONE: objlist								@@\
-	RemoveFile($@)							@@\
-	touch $@							@@\
-									@@\
-clean::									@@\
-	RemoveFile(DONE)
-#endif /* SubdirLibraryRule */
-
-
-/*
- * ProfiledLibraryTarget - generate rules to create a profiled library.
- */
-#ifndef ProfiledLibraryTarget
-#define	ProfiledLibraryTarget(libname,objlist)				@@\
-AllTarget(LibraryTargetNameSuffix(libname,_p))				@@\
-									@@\
-LibraryTargetNameSuffix(libname,_p): objlist $(EXTRALIBRARYDEPS)	@@\
-	RemoveFile($@)							@@\
-	cd profiled && MakeLibrary(../$@,objlist)			@@\
-	RanLibrary($@)
-
-#endif /* ProfiledLibraryTarget */
-
-
-/*
- * DebuggedLibraryTarget - generate rules to create a debuggable library.
- */
-#ifndef DebuggedLibraryTarget
-#define	DebuggedLibraryTarget(libname,objlist)				@@\
-AllTarget(LibraryTargetNameSuffix(libname,_d))				@@\
-									@@\
-LibraryTargetNameSuffix(libname,_d): objlist $(EXTRALIBRARYDEPS)	@@\
-	RemoveFile($@)							@@\
-	cd debugger && MakeLibrary(../$@,objlist)			@@\
-	RanLibrary($@)
-
-#endif /* DebuggedLibraryTarget */
-
-
-/*
- * AliasedLibraryTarget - generate rules to link one library to another.
- */
-#ifndef AliasedLibraryTarget
-#define	AliasedLibraryTarget(libname,alias)				@@\
-AllTarget(LibraryTargetName(alias))					@@\
-									@@\
-LibraryTargetName(alias): LibraryTargetName(libname)			@@\
-	RemoveFile($@)							@@\
-	$(LN) LibraryTargetName(libname) $@				@@\
-									@@\
-clean::									@@\
-	RemoveFile(LibraryTargetName(alias))
-#endif /* AliasedLibraryTarget */
-
-
-/*
- * NormalRelocatableTarget - generate rules to produce a relocatable object
- * file instead of a library.  
- */
-#ifndef NormalRelocatableTarget
-#define	NormalRelocatableTarget(objname,objlist)			@@\
-AllTarget(objname.Osuf)							@@\
-									@@\
-objname.Osuf: objlist $(EXTRALIBRARYDEPS)				@@\
-	RemoveFile($@)							@@\
-	$(LD) $(LDCOMBINEFLAGS) objlist -o $@
-#endif /* NormalRelocatableTarget */
-
-
-/*
- * ProfiledRelocatableTarget - generate rules to produce a profiled relocatable
- * object file instead of a library.
- */
-#ifndef ProfiledRelocatableTarget
-#define	ProfiledRelocatableTarget(objname,objlist)			@@\
-AllTarget(Concat(objname,_p.Osuf))					@@\
-									@@\
-Concat(objname,_p.Osuf): objlist $(EXTRALIBRARYDEPS)			@@\
-	RemoveFile($@)							@@\
-	$(LD) -X -r objlist -o $@
-
-#endif /* ProfiledRelocatableTarget */
-
-
-/*
- * DebuggedRelocatableTarget - generate rules to produce a debuggable 
- * relocatable object file instead of a library.
- */
-#ifndef DebuggedRelocatableTarget
-#define	DebuggedRelocatableTarget(objname,objlist)			@@\
-AllTarget(Concat(objname,_d.Osuf))					@@\
-									@@\
-Concat(objname,_d.Osuf): objlist $(EXTRALIBRARYDEPS)			@@\
-	RemoveFile($@)							@@\
-	$(LD) -X -r objlist -o $@
-
-#endif /* DebuggedRelocatableTarget */
-
-
-/*
- * LintLibraryTarget - generate rules to create a lint library.  Note that the
- * lint library is always forced to be newer than the library itself.
- */
-#ifndef LintLibraryTarget
-#define	LintLibraryTarget(libname,srclist)				@@\
-lintlib:: Concat(llib-l,libname.ln)					@@\
-									@@\
-Concat(llib-l,libname.ln): srclist $(EXTRALIBRARYDEPS)			@@\
-	RemoveFile($@)							@@\
-	$(LINT) Concat($(LINTLIBFLAG),libname) $(LINTFLAGS) srclist
-#endif /* LintLibraryTarget */
-
-
-/*
- * NormalLintTarget - generate rules to lint a set of sources.
- */
-#ifndef NormalLintTarget
-#define NormalLintTarget(srclist)					@@\
-lint:									@@\
-	$(LINT) $(LINTFLAGS) srclist $(LINTLIBS)			@@\
-lint1:									@@\
-	$(LINT) $(LINTFLAGS) $(FILE) $(LINTLIBS)
-#endif /* NormalLintTarget */
-
-
-/*
- * LintTarget - generate rules to lint $(SRCS)
- */
-#ifndef LintTarget
-#define LintTarget()							@@\
-NormalLintTarget($(SRCS))
-#endif
-
-
-/*
- * LinkSourceFile - snag source file from some other directory
- */
-#ifndef LinkSourceFile
-#define LinkSourceFile(src,dir)						@@\
-src:  dir/src								@@\
-	RemoveFile($@)							@@\
-	$(LN) $? $@							@@\
-									@@\
-NoConfigRec(src)							@@\
-									@@\
-includes:: src								@@\
-									@@\
-depend:: src								@@\
-									@@\
-clean::									@@\
-	RemoveFile(src)
-#endif
-
-
-/*
- * LinkFile - link a file
- */
-#ifndef LinkFile
-#define LinkFile(tofile,fromfile)					@@\
-tofile:: fromfile							@@\
-	RemoveFile($@)							@@\
-	$(LN) $? $@							@@\
-									@@\
-NoConfigRec(tofile)							@@\
-									@@\
-includes:: tofile							@@\
-									@@\
-depend:: tofile								@@\
-									@@\
-clean::									@@\
-	RemoveFile(tofile)
-#endif
-
-
-#ifndef MakeSubincludesForBuild
-#define MakeSubincludesForBuild(step,dir,srclist)			@@\
-step::  dir srclist							@@\
-	@-(list=`echo srclist | sed -e 's/[^ ]*\///g'`; \		@@\
-		set -x; cd dir && RemoveFiles($$list))			@@\
-	@for i in srclist; do \						@@\
-		(set -x; cd dir && $(LN) ../$$i .); \			@@\
-	done								@@\
-									@@\
-dir::									@@\
-	$(MKDIRHIER) dir						@@\
-									@@\
-clean::									@@\
-	@-(if [ -d dir ]; then \					@@\
-		list=`echo srclist | sed -e 's/[^ ]*\///g'`; \		@@\
-		set -x; cd dir && RemoveFile($$list); else exit 0; fi)
-#endif
-
-
-/*
- * LangNamedTargetSubdirs - recursively make a series of steps
- */
-#ifndef LangNamedTargetSubdirs
-#define LangNamedTargetSubdirs(lang,name,dirs,verb,flags,subname)	@@\
-name::									@@\
-	@MakeFlagsToShellFlags(ik,set +e); \				@@\
-	for i in dirs ;\						@@\
-	do \								@@\
-		echo verb "in $(CURRENT_DIR)/$$i..."; \			@@\
-		(cd $$i && LANG=lang $(MAKE) $(MFLAGS) flags subname);\ @@\
-	done
-#endif
-
-
-/*
- * NamedMakeSubdirs - generate rules to do makes in the given subdirectories.
- * If you want CDEBUGFLAGS passed along to subdirectories, provide a line like
- * the following in the appropriate Imakefile
- * 
- *         #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
- */
-#ifndef LangNamedMakeSubdirs
-#define LangNamedMakeSubdirs(lang,name,dirs) \
-LangNamedTargetSubdirs(lang,name,dirs,"making" name,PassCDebugFlags,all)
-#endif /* LangNamedMakeSubdirs */
-
-#ifndef LangMakeSubdirs
-#define LangMakeSubdirs(lang,dirs)					@@\
-LangNamedMakeSubdirs(lang,all,dirs)
-#endif /* LangMakeSubdirs */
-
-
-
-/*
- * NamedTargetSubdirs - recursively make a series of steps
- */
-#ifndef NamedTargetSubdirs
-#define NamedTargetSubdirs(name,dirs,verb,flags,subname)		@@\
-name::									@@\
-	@MakeFlagsToShellFlags(ik,set +e); \				@@\
-	for i in dirs ;\						@@\
-	do \								@@\
-		echo verb "in $(CURRENT_DIR)/$$i..."; \			@@\
-		MakeNamedTargetSubdir($$i,flags,subname); \		@@\
-	done
-#endif
-
-
-/*
- * NamedMakeSubdirs - generate rules to do makes in the given subdirectories.
- * If you want CDEBUGFLAGS passed along to subdirectories, provide a line like
- * the following in the appropriate Imakefile
- * 
- *         #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
- */
-#ifndef NamedMakeSubdirs
-#define NamedMakeSubdirs(name,dirs) \
-NamedTargetSubdirs(name,dirs,"making" name,PassCDebugFlags,all)
-#endif /* NamedMakeSubdirs */
-
-#ifndef MakeSubdirs
-#define MakeSubdirs(dirs)						@@\
-NamedMakeSubdirs(all,dirs)
-#endif /* MakeSubdirs */
-
-
-/*
- * DependSubdirs - generate rules to recursively compute dependencies as
- * part of the make depend step.
- */
-#ifndef DependSubdirs
-#define DependSubdirs(dirs) \
-NamedTargetSubdirs(depend,dirs,"depending",NullParameter,depend)
-#endif /* DependSubdirs */
-
-
-/*
- * ForceSubdirs - force make to build subdirectories
- */
-#ifndef ForceSubdirs
-#if !HasBsdMake
-#define ForceSubdirs(dirs)						@@\
-dirs: FRC								@@\
-	@echo "making all in $(CURRENT_DIR)/$@..."			@@\
-	@MakeNamedTargetSubdir($@,PassCDebugFlags,all)			@@\
-									@@\
-FRC:
-#else
-/* For BSD 4.4 make */
-#define ForceSubdirs(dirs)						@@\
-dirs: .EXEC								@@\
-	@cd $@ ; echo "making all in $(CURRENT_DIR)/$@..."; \		@@\
-	$(MAKE) $(MFLAGS) PassCDebugFlags all				@@\
-									@@\
-.EXEC:
-#endif
-#endif /* ForceSubdirs */
-
-/*
- * InstallSubdirs - generate rules to recursively install programs and files.
- */
-#ifndef InstallSubdirs
-#define InstallSubdirs(dirs) \
-NamedTargetSubdirs(install,dirs,"installing",DESTDIR=$(DESTDIR),install)
-#endif /* InstallSubdirs */
-
-
-/*
- * InstallManSubdirs - generate rules to recursively install manual pages.
- */
-#ifndef InstallManSubdirs
-#define InstallManSubdirs(dirs) \
-NamedTargetSubdirs(install.man,dirs,"installing man pages",DESTDIR=$(DESTDIR),install.man)
-#endif /* InstallManSubdirs */
-
-
-/*
- * IncludesSubdirs - generate rules to recursively put include files in build
- */
-#ifndef IncludesSubdirs
-#define IncludesSubdirs(dirs) \
-NamedTargetSubdirs(includes,dirs,including,NullParameter,includes)
-#endif
-
-
-/*
- * InstallLinkKitSubdirs - generate rules to recursively install server Link
- *                         Kit (only used for XFree86). This is a no-op
- *                         rule so that Imakefiles on non-XFree86 systems
- *                         continue to build Makefiles correctly.
- */
-#ifndef InstallLinkKitSubdirs
-#define InstallLinkKitSubdirs(dirs)
-#endif
-
-
-/*
- * CleanSubdirs - generate rules to recursively clean out garbage files.
- */
-#define BootstrapCleanSubdirs /**/	/* used at top-level */
-#ifndef NamedCleanSubdirs
-#define NamedCleanSubdirs(name,dirs) \
-NamedTargetSubdirs(name,dirs,"cleaning",BootstrapCleanSubdirs,clean)
-#endif /* NamedCleanSubdirs */
-
-#ifndef CleanSubdirs
-#define CleanSubdirs(dirs) \
-NamedCleanSubdirs(clean,dirs)
-#endif
-
-
-/*
- * TagSubdirs - generate rules to recursively create tags files.
- */
-#ifndef NamedTagSubdirs
-#define NamedTagSubdirs(name,dirs) \
-NamedTargetSubdirs(name,dirs,"tagging",TAGS='$(TAGS)',tags)
-#endif /* TagSubdirs */
-
-#ifndef TagSubdirs
-#define TagSubdirs(dirs) \
-NamedTagSubdirs(tags,dirs)
-#endif
-
-/*
- * MakeLintSubdirs - generate rules to recursively lint directories as part 
- * of the named step.
- */
-#ifndef MakeLintSubdirs
-#define MakeLintSubdirs(dirs,target,subtarget) \
-NamedTargetSubdirs(target,dirs,"linting" for target and subtarget,DESTDIR=$(DESTDIR) LINTOPTS='$(LINTOPTS)',subtarget)
-#endif /* MakeLintSubdirs */
-
-
-/*
- * LintSubdirs - generate rules to recursively lint directories as part of 
- * the make lint step.
- */
-#ifndef LintSubdirs
-#define LintSubdirs(dirs)						@@\
-MakeLintSubdirs(dirs,lint,lint)
-#endif /* LintSubdirs */
-
-
-/*
- * MakeLintLibSubdirs - generate rules to recursively create lint libraries.
- */
-#ifndef MakeLintLibSubdirs
-#define MakeLintLibSubdirs(dirs)					@@\
-MakeLintSubdirs(dirs,lintlib,lintlib)
-#endif /* MakeLintLibSubdirs */
-
-
-/*
- * MakeMakeSubdirs - generate rules to recursively recreate Makefiles as part
- * of the specified step in the build.  If $(TOP) is set to an absolute path, 
- * do not prepend the ../ prefix.  This makes running things outside of the 
- * source tree much easier.
- * $(ONESUBDIR)/Makefile exists as a separate, explicit target so that
- * clearmake will know what its goal is and do wink-in.
- */
-#ifndef MakeMakeSubdirs
-#define MakeMakeSubdirs(dirs,target)					@@\
-$(ONESUBDIR)/Makefile:							@@\
-	@MakeFlagsToShellFlags(n,executeit="no"); \			@@\
-	cd $(ONESUBDIR) && \						@@\
-	if [ "$$executeit" != "no" ]; then \				@@\
-		ImakeSubCmdHelper -DTOPDIR=$(IMAKETOP) -DCURDIR=$(ONECURDIR)$(ONESUBDIR); \ @@\
-	fi;								@@\
-									@@\
-target::								@@\
-	-@MakeFlagsToShellFlags(ik,set +e); \				@@\
-	MakeFlagsToShellFlags(n,executeit="no"); \			@@\
-	for i in dirs ;\						@@\
-	do \								@@\
-		case "$(CURRENT_DIR)" in \				@@\
-		.) curdir= ;; \						@@\
-		*) curdir=$(CURRENT_DIR)/ ;; \				@@\
-		esac; \							@@\
-		echo "making Makefiles in $$curdir$$i..."; \		@@\
-		itmp=`echo $$i | sed -e 's;^\./;;g' -e 's;/\./;/;g'`; \	@@\
-		curtmp="$(CURRENT_DIR)" \				@@\
-		toptmp=""; \						@@\
-		case "$$itmp" in \					@@\
-		    ../?*) \ 						@@\
-			while echo "$$itmp" | grep '^\.\./' > /dev/null;\	@@\
-			  do \						@@\
-			     toptmp="/`basename $$curtmp`$$toptmp"; \	@@\
-			     curtmp="`dirname $$curtmp`"; \		@@\
-			     itmp="`echo $$itmp | sed 's;\.\./;;'`"; \	@@\
-			  done \					@@\
-		    ;; \						@@\
-		esac; \							@@\
-		case "$$itmp" in \					@@\
-		*/?*/?*/?*/?*)	newtop=../../../../..;; \		@@\
-		*/?*/?*/?*)	newtop=../../../..;; \			@@\
-		*/?*/?*)	newtop=../../..;; \			@@\
-		*/?*)		newtop=../..;; \			@@\
-		*)		newtop=..;; \				@@\
-		esac; \							@@\
-		newtop="$$newtop$$toptmp"; \				@@\
-		case "$(TOP)" in \					@@\
-		/?*) imaketop=$(TOP) \					@@\
-		     imakeprefix= ;; \					@@\
-		.) imaketop=$$newtop \					@@\
-		   imakeprefix=$$newtop/ ;; \				@@\
-		*) imaketop=$$newtop/$(TOP) \				@@\
-		   imakeprefix=$$newtop/ ;; \				@@\
-		esac; \							@@\
-		RemoveFile($$i/Makefile.bak); \				@@\
-		if [ -f $$i/Makefile ]; then \				@@\
-			echo "	$(MV) Makefile Makefile.bak"; \		@@\
-			if [ "$$executeit" != "no" ]; then \		@@\
-				$(MV) $$i/Makefile $$i/Makefile.bak; \	@@\
-			fi; \						@@\
-		fi; \							@@\
-		$(MAKE) $(MFLAGS) $(MAKE_OPTS) ONESUBDIR=$$i ONECURDIR=$$curdir IMAKETOP=$$imaketop IMAKEPREFIX=$$imakeprefix $$i/Makefile; \	@@\
-		if [ -d $$i ] ; then \					@@\
-			cd $$i; \					@@\
-			$(MAKE) $(MFLAGS) Makefiles; \			@@\
-			cd $$newtop; \					@@\
-		else \							@@\
-			exit 1; \					@@\
-		fi; \							@@\
-	done
-
-#ifdef UseInstalled
-#define ImakeSubCmdHelper $(IMAKE_CMD)
-#else
-#define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) $(IMAKE_DEFINES)
-#endif
-
-#endif /* MakeMakeSubdirs */
-
-
-/*
- * MakefileSubdirs - generate rules to create Makefiles.
- */
-#ifndef MakefileSubdirs
-#define MakefileSubdirs(dirs)						@@\
-MakeMakeSubdirs(dirs,Makefiles)
-#endif /* MakefileSubdirs */
-
-/*
- * Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM
- * to cpp, because that trick does not work on all ANSI C preprocessors.
- * Also delete line numbers from the cpp output (-P is not portable, I guess).
- */
-#ifndef CppSedMagic
-#define CppSedMagic sed -e '/^#  *[0-9][0-9]*  *.*$$/d' -e '/^XCOMM$$/s//#/' -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/#/'
-#endif /* CppSedMagic */
-
-#ifndef CppFileTarget
-#define CppFileTarget(dst,src,defs,deplist)				@@\
-dst::  src deplist							@@\
-	RemoveFile($@)							@@\
-	ClearmakeOSName \
-	$(CPP) CppNoLineInfoOption defs <src | CppSedMagic >$@		@@\
-									@@\
-clean::									@@\
-	RemoveFiles(dst)
-#endif /* CppFileTarget */
-
-/*
- * CppScriptTarget - generate rules to create a shell script by running the
- * input through cpp.  If the ExecableScripts configuration parameter is not
- * set, then make sure that the first line begins with a colon.
- */
-#ifndef CppScriptTarget
-#if ExecableScripts		/* can use #! instead of colon */
-#define CppScriptTarget(dst,src,defs,deplist)				@@\
-dst::	src deplist							@@\
-	RemoveFile($@)							@@\
-	ClearmakeOSName \
-	$(CPP) CppNoLineInfoOption defs <src | CppSedMagic >$@		@@\
-	chmod a+x $@							@@\
-									@@\
-clean::									@@\
-	RemoveFiles(dst)
-#else
-#define CppScriptTarget(dst,src,defs,deplist)				@@\
-dst::  src deplist							@@\
-	RemoveFile($@)							@@\
-	ClearmakeOSName \
-	echo \: >$@							@@\
-	sed '1d' src | $(CPP) CppNoLineInfoOption defs | CppSedMagic >>$@	@@\
-	chmod a+x $@							@@\
-									@@\
-clean::									@@\
-	RemoveFile(dst)
-#endif /* ExecableScripts */
-#endif /* CppScriptTarget */
-
-
-/*
- * MakeScriptFromCpp - generate rules to create a script from a file with a
- * .cpp suffix.
- */
-#ifndef MakeScriptFromCpp
-#define MakeScriptFromCpp(name,defs)					@@\
-CppScriptTarget(name,name.cpp,defs,NullParameter)
-#endif /* MakeScriptFromCpp */
-
-#ifndef CppSourceFile
-#define CppSourceFile(dst,src,defs,deplist)				@@\
-CppFileTarget(dst,src,defs,deplist)					@@\
-									@@\
-includes:: dst								@@\
-									@@\
-depend:: dst
-#endif /* CppFileTarget */
-
-/*
- * MakeDirectories - generate rules to create a hierarchy of directories.
- */
-#ifndef MakeDirectories
-#define MakeDirectories(step,dirs)					@@\
-step::									@@\
-	DirFailPrefix@MakeFlagsToShellFlags(i,set +e); \		@@\
-	for i in dirs; do if [ -d $(DESTDIR)$$i ]; then \		@@\
-		set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i); fi; \ @@\
-	done
-#endif /* MakeDirectories */
-
-
-/*
- * AllTarget - generate rules to build necessary things during make all.
- */
-#ifndef AllTarget
-#define AllTarget(depends)						@@\
-all:: depends
-#endif /* AllTarget */
-
-#ifdef DefineOldLibraryRules
-#include <oldlib.rules>
-#endif
-
-#ifndef StaticLibrary
-#define StaticLibrary(libpath,libname) Concat3(libpath,/,LibraryTargetName(libname))
-#endif
-
-/*
- * MakeMutex - generate mutex rules for parallel make
- */
-#ifndef MakeMutex
-#ifdef MutexDirective
-#define MakeMutex(targets)						@@\
-MutexDirective:	targets
-#endif /* MutexDirective */
-#endif /* MakeMutex */
--- a/Xvnc/config/cf/Imake.tmpl
+++ /dev/null
@@ -1,1433 +0,0 @@
-XCOMM ----------------------------------------------------------------------
-XCOMM Makefile generated from IMAKE_TEMPLATE and INCLUDE_IMAKEFILE
-XCOMM $TOG: Imake.tmpl /main/245 1997/05/20 10:05:47 kaleb $
-XCOMM
-XCOMM
-XCOMM
-XCOMM
-XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.32.2.8 1998/02/08 11:19:24 dawes Exp $
-XCOMM ----------------------------------------------------------------------
-
-/*
- * generic imake template
- */
-
-/*
- * Modify Imake.cf when adding a new architecture, do not modify this file.
- * Platform-specific parameters may be set in the appropriate <vendor>.cf
- * configuration files.  Site-specific parameters should be set in the file
- * site.def.  Full rebuilds are recommended if any parameters are changed.
- * If your C preprocessor does not define any unique symbols, you will need
- * to set BOOTSTRAPCFLAGS when rebuilding imake (usually when doing
- * "make World" the first time).
- */
-
-#define ImakeConfigRelease 6
-
-#define	YES	1
-#define NO	0
-
-/* Ensure that "all" is the default target in the Makefile. */
-all::
-
-.SUFFIXES: .i
-
-#include <Imake.cf>
-
-XCOMM -----------------------------------------------------------------------
-XCOMM site-specific configuration parameters that need to come before
-XCOMM the platform-specific parameters - edit site.def to change
-#define BeforeVendorCF
-#include <site.def>
-#undef BeforeVendorCF
-
-#if defined(HasGcc2) && !defined(HasGcc)
-# define HasGcc HasGcc2
-#endif
-
-#ifndef HasClearmake
-# define HasClearmake NO
-#endif
-
-/*
- * ClearmakeOSName - insert the current OS type into the clearmake
- * build script, so .o files from different platforms cannot be winked in.
- * If clearmake finds the build script for two .o files is the same, it
- * will share the .o, even across different architectures.  Inserting the
- * O/S name into the build script in a comment prevents unwanted sharing.
- * Note the trailing double-@ in the macro: end a line using this macro
- * with backslash without the double-@ usually used.
- * Like this:
- *
- * #define SomeRule() @@\
- *     something or other @@\
- *     ClearmakeOSName \
- *     something else @@\
- *     and more
- */
-#ifndef ClearmakeOSName
-# if HasClearmake
-#  define ClearmakeOSName @ XCOMM $(OSNAME) @@
-# else
-#  define ClearmakeOSName /**/
-# endif
-#endif
-
-#if HasClearmake
-# ifndef MakeCmd
-#  define MakeCmd clearmake
-# endif
-#endif
-
-#if HasClearmake
-XCOMM ----------------------------------------------------------------------
-.c.o:
-	ClearmakeOSName	$(CC) -c $(CFLAGS) $*.c
-#endif
-
-XCOMM ----------------------------------------------------------------------
-XCOMM platform-specific configuration parameters - edit MacroFile to change
-#include MacroIncludeFile
-
-XCOMM ----------------------------------------------------------------------
-XCOMM site-specific configuration parameters that go after
-XCOMM the platform-specific parameters - edit site.def to change
-#define AfterVendorCF
-#include <site.def>
-#undef AfterVendorCF
-
-/*
- * defaults for various generic parameters; set in site.def if needed
- */
-
-/* the following are needed before we can include Imake.rules */
-
-#ifndef HasVarDirectory
-#define HasVarDirectory		NO
-#endif
-#ifndef HasSymLinks
-#define HasSymLinks		YES
-#endif
-#ifndef SystemV
-#define SystemV			NO	/* SYSV (R3) */
-#endif
-#ifndef SystemV4
-#define SystemV4		NO	/* SVR4 */
-#endif
-#ifndef HasCodeCenter
-#define HasCodeCenter		NO
-#endif
-#ifndef HasSentinel
-#define HasSentinel		NO
-#endif
-#ifndef HasPurify
-#define HasPurify		NO
-#endif
-#ifndef HasTestCenter
-#define HasTestCenter		NO
-#endif
-#ifndef HasBsdMake
-#define HasBsdMake		NO
-#endif
-#ifndef HasGnuMake
-#define HasGnuMake		NO
-#endif
-#ifndef HasParallelMake
-#define HasParallelMake		NO
-#endif
-#ifndef RemoveTargetProgramByMoving
-#define RemoveTargetProgramByMoving NO
-#endif
-#ifndef DoRanlibCmd
-#if SystemV || SystemV4
-#define DoRanlibCmd NO
-#else
-#define DoRanlibCmd YES
-#endif
-#endif
-#ifndef ExecableScripts
-#if SystemV
-#define ExecableScripts		NO
-#else
-#define ExecableScripts		YES	/* kernel exec() can handle #! */
-#endif
-#endif
-
-#ifndef HasMakefileSafeInclude	    /* -include or sinclude in a Makefile */
-#if HasClearmake || HasBsdMake
-#define HasMakefileSafeInclude YES
-#else
-#define HasMakefileSafeInclude NO   /* see also vendor-specific .cf files */
-#endif
-#endif
-
-#include <Imake.rules>
-
-#ifndef HasSharedLibraries
-#define HasSharedLibraries NO
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion          0
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion          0
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion          0
-#endif
-#ifndef UnalignedReferencesAllowed
-#define UnalignedReferencesAllowed NO	/* if arbitrary deref is okay */
-#endif
-#ifndef AvoidNullMakeCommand
-#if !HasBsdMake
-#define AvoidNullMakeCommand NO
-#else
-#define AvoidNullMakeCommand YES
-#endif
-#endif
-#if AvoidNullMakeCommand
-#ifndef NullMakeCommand
-#define NullMakeCommand		@ echo -n
-#endif
-/*
- * An obscure bug in BSD4.3's original make causes it not to recognize a
- * macro definition if the macro name starts with a non-alpha and in
- * column one.
- */
- _NULLCMD_ = NullMakeCommand
-#endif
-
-#ifndef CrossCompiling
-#define CrossCompiling		NO
-#endif
-#ifndef BourneShell			/* to force shell in makefile */
-#define BourneShell		/bin/sh
-#endif
-#ifndef ConstructMFLAGS
-#if SystemV
-#define ConstructMFLAGS		YES	/* build MFLAGS from MAKEFLAGS */
-#else
-#define ConstructMFLAGS		NO	/* build MFLAGS from MAKEFLAGS */
-#endif
-#endif
-
-#ifndef ConstructMAKEFLAGS		/* needed on old BSD-based? */
-#define ConstructMAKEFLAGS	NO	/* build MAKEFLAGS from MFLAGS */
-#endif
-
-#ifndef HasLargeTmp
-#define HasLargeTmp		NO	/* be paranoid */
-#endif
-
-#ifndef HasBSD44Sockets
-#define HasBSD44Sockets		NO
-#endif
-#ifndef HasSockets
-#define HasSockets		YES
-#endif
-#ifndef HasStreams
-#define HasStreams		!HasSockets
-#endif
-#ifndef HasDECnet
-#define HasDECnet		NO
-#endif
-#ifndef HasPoll
-#if SystemV || SystemV4
-#define HasPoll			YES
-#else
-#define HasPoll			NO
-#endif
-#endif
-#ifndef HasVFork
-#if SystemV
-#define HasVFork		NO	/* not yet... */
-#else
-#define HasVFork		YES
-#endif
-#endif
-#ifndef HasSetUserContext
-#define HasSetUserContext	NO
-#endif
-#ifndef HasLibCrypt
-#define HasLibCrypt		NO
-#endif
-#ifndef HasPutenv
-#define HasPutenv		NO	/* assume not */
-#endif
-#ifndef HasVoidSignalReturn
-#define HasVoidSignalReturn	YES	/* assume yes */
-#endif
-#ifndef HasBsearch
-#define HasBsearch		YES	/* assume yes */
-#endif
-#ifndef HasSnprintf
-#define HasSnprintf		NO	/* assume not */
-#endif
-#ifndef HasMkstemp
-#define HasMkstemp		NO	/* assume not */
-#endif
-#ifndef HasFortran
-#define HasFortran		NO
-#endif
-#ifndef HasCplusplus
-#if HasGcc2ForCplusplus
-#define HasCplusplus		YES
-#else
-#define HasCplusplus		NO
-#endif
-#endif
-#ifndef HasNdbm
-#define HasNdbm			NO
-#endif
-#ifndef HasSecureRPC
-#define HasSecureRPC		NO	/* if you have Secure RPC */
-#endif
-#ifndef HasKrb5
-#define HasKrb5			NO      /* if you have Kerberos V5 */
-#endif
-#ifndef HasLatex
-#define HasLatex		YES
-#endif
-#ifndef HasShm
-#if SystemV || SystemV4
-#define HasShm			YES
-#else
-#define HasShm			NO
-#endif
-#endif
-#ifndef HasCbrt
-#define HasCbrt			YES
-#endif
-#ifndef HasFfs
-#define HasFfs			YES
-#endif
-#ifndef HasFfsl
-#define HasFfsl			NO
-#endif
-#ifndef HasZlib
-#define HasZlib			NO
-#endif
-#if !HasZlib		/* GzipLibrary was valid only if HasZlib */
-#define GzipLibrary -L/usr/local/lib -lz
-#endif
-#ifndef GzipLibrary	/* if OS config didn't define it, assume it's -lz */
-#define GzipLibrary -lz
-#endif
-#if HasKrb5
-#ifndef Krb5Includes
-#define Krb5Includes -I/krb5/include
-#endif
-#ifndef Krb5Libraries
-#define Krb5Libraries -L/krb5/lib -L/usr/isode/lib -lkrb5 -lcrypto -lisode -lcom_err -ldbm
-#endif
-#else
-#undef Krb5Includes
-#define Krb5Includes /**/
-#undef Krb5Libraries
-#define Krb5Libraries /**/
-#endif
-#ifndef UseGnuMalloc
-#define UseGnuMalloc		NO
-#endif
-#ifndef GnuMallocLibrary
-#define GnuMallocLibrary -lgmalloc
-#endif
-#ifndef MallocLibraries
-#if UseGnuMalloc
-#define MallocLibraries	GnuMallocLibrary
-#else
-#define MallocLibraries	/**/
-#endif
-#endif
-#ifndef HasTk
-#define HasTk NO
-#endif
-#ifndef TkLibName
-#if HasTk
-#define TkLibName tk
-#else
-#define TkLibName
-#endif
-#endif
-TKLIBNAME = TkLibName
-#ifndef TkLibDir
-#if HasTk
-#define TkLibDir /usr/local/lib
-#else
-#define TkLibDir
-#endif
-#endif
-TKLIBDIR = TkLibDir
-#ifndef TkIncDir
-#if HasTk
-#define TkIncDir /usr/local/include
-#else
-#define TkIncDir
-#endif
-#endif
-#ifndef TkLibrary
-#ifdef HasTk
-#define TkLibrary Concat(-L,$(TKLIBDIR)) Concat(-l,$(TKLIBNAME))
-#else
-#define TkLibrary
-#endif
-#endif
-#ifndef HasTcl
-#define HasTcl NO
-#endif
-#ifndef TclLibName
-#if HasTcl
-#define TclLibName tcl
-#else
-#define TclLibName
-#endif
-#endif
-TCLLIBNAME = TclLibName
-#ifndef TclLibDir
-#if HasTcl
-#define TclLibDir /usr/local/lib
-#else
-#define TclLibDir
-#endif
-#endif
-TCLIBDIR = TclLibDir
-#ifndef TclIncDir
-#if HasTcl
-#define TclIncDir /usr/local/include
-#else
-#define TclIncDir
-#endif
-#endif
-#ifndef TclLibrary
-#ifdef HasTcl
-#define TclLibrary Concat(-L,$(TCLLIBDIR)) Concat(-l,$(TCLLIBNAME))
-#else
-#define TclLibrary
-#endif
-#endif
-#ifndef NeedConstPrototypes
-#define NeedConstPrototypes	NO
-#endif
-#ifndef NeedVarargsPrototypes
-#define NeedVarargsPrototypes	NO
-#endif
-#ifndef NeedNestedPrototypes
-#define NeedNestedPrototypes	NO
-#endif
-#ifndef NeedFunctionPrototypes
-#define NeedFunctionPrototypes (NeedVarargsPrototypes || NeedNestedPrototypes)
-#endif
-#ifndef NeedWidePrototypes
-#define NeedWidePrototypes	YES	/* mix and match ANSI-C, non-ANSI */
-#endif
-
-#ifndef StripInstalledPrograms
-#define StripInstalledPrograms NO	/* leave symbol table just in case */
-#endif
-#ifndef UseCCMakeDepend			/* use slow cc -E script */
-#define UseCCMakeDepend NO
-#endif
-#ifndef UseGccMakeDepend		/* use slowish but correct gcc -M */
-#define UseGccMakeDepend NO
-#endif
-
-/* DefaultUsrBin is independent of ProjectRoot.
-   This is a directory where programs will be found even if PATH
-   is not set, for example when coming in remotely via rsh. */
-#ifndef DefaultUsrBin
-#define	DefaultUsrBin /usr/bin
-#endif
-
-#ifndef UsrLibDir
-#ifdef ProjectRoot
-#define UsrLibDir Concat(ProjectRoot,/lib)
-#ifndef AlternateUsrLibDir
-#define AlternateUsrLibDir YES
-#endif
-#else
-#define UsrLibDir /usr/lib
-#ifndef AlternateUsrLibDir
-#define AlternateUsrLibDir NO
-#endif
-#endif
-#else
-#ifndef AlternateUsrLibDir
-#define AlternateUsrLibDir YES
-#endif
-#endif
-#ifndef VarLibDir
-#ifdef ProjectVar
-#define VarLibDir Concat(ProjectVar,/lib)
-#else
-#define VarLibDir /var/lib
-#endif
-#endif
-
-#ifndef ShLibDir
-#define ShLibDir UsrLibDir
-#endif
-#ifndef IncRoot
-#ifdef ProjectRoot
-#define IncRoot Concat(ProjectRoot,/include)
-#ifndef AlternateIncRoot
-#define AlternateIncRoot YES
-#endif
-#else
-#define IncRoot /usr/include
-#ifndef AlternateIncRoot
-#define AlternateIncRoot NO
-#endif
-#endif
-#else
-#ifndef AlternateIncRoot
-#define AlternateIncRoot YES
-#endif
-#endif
-#ifndef LintlibDir
-#define LintlibDir $(USRLIBDIR)/lint
-#endif
-#ifndef SystemManDirectory
-#if SystemV4
-#define SystemManDirectory /usr/share/man
-#else
-#define SystemManDirectory /usr/man
-#endif
-#endif
-#ifndef ManDirectoryRoot
-#ifdef ProjectRoot
-#define ManDirectoryRoot Concat(ProjectRoot,/man)
-#else
-#define ManDirectoryRoot SystemManDirectory
-#endif
-#endif
-#ifndef ManPath
-#define ManPath ManDirectoryRoot
-#endif
-#ifndef ManSourcePath
-#define ManSourcePath $(MANPATH)/man
-#endif
-#ifndef ManDir
-#define ManDir $(MANSOURCEPATH)$(MANSUFFIX)
-#endif
-#ifndef LibmanDir
-#define LibmanDir $(MANSOURCEPATH)$(LIBMANSUFFIX)
-#endif
-#ifndef FileManDir
-#define FileManDir $(MANSOURCEPATH)$(FILEMANSUFFIX)
-#endif
-#ifndef ConfigSrc
-#define ConfigSrc $(TOP)/config
-#endif
-#ifndef DependDir
-#if UseCCMakeDepend || UseGccMakeDepend
-#define DependDir $(CONFIGSRC)/util
-#else
-#define DependDir $(CONFIGSRC)/makedepend
-#endif
-#endif
-#ifndef UNCOMPRESSPATH
-#define UNCOMPRESSPATH /usr/ucb/uncompress
-#endif
-#ifndef OptimizedCDebugFlags
-#define OptimizedCDebugFlags -O
-#endif
-#ifndef OptimizedCplusplusDebugFlags
-#define OptimizedCplusplusDebugFlags OptimizedCDebugFlags
-#endif
-#ifndef DebuggableCDebugFlags
-#define DebuggableCDebugFlags -g
-#endif
-#ifndef DebuggableCplusplusDebugFlags
-#define DebuggableCplusplusDebugFlags DebuggableCDebugFlags
-#endif
-#ifndef ProfiledCDebugFlags
-#define ProfiledCDebugFlags -pg
-#endif
-#ifndef ProfiledCplusplusDebugFlags
-#define ProfiledCplusplusDebugFlags ProfiledCDebugFlags
-#endif
-#ifndef NoOpCDebugFlags
-#define NoOpCDebugFlags /**/
-#endif
-#ifndef DefaultCDebugFlags
-#define DefaultCDebugFlags OptimizedCDebugFlags
-#endif
-#ifndef DefaultCplusplusDebugFlags
-#define DefaultCplusplusDebugFlags OptimizedCplusplusDebugFlags
-#endif
-#ifndef DefaultCCOptions
-#define DefaultCCOptions /* floating point, etc. */
-#endif
-#ifndef DefaultCplusplusOptions
-#define DefaultCplusplusOptions /* floating point, etc. */
-#endif
-#ifndef NoRConst
-#define NoRConst NO /* YES if const for structs of funcs is bad */
-#endif
-#ifndef InstPgmFlags
-#define InstPgmFlags -s
-#endif
-#ifndef InstBinFlags
-#define InstBinFlags -m 0755
-#endif
-#ifndef InstUidFlags
-#define InstUidFlags -m 4711
-#endif
-#ifndef InstLibFlags
-#define InstLibFlags -m 0644
-#endif
-#ifndef InstIncFlags
-#define InstIncFlags -m 0444
-#endif
-#ifndef InstManFlags
-#define InstManFlags -m 0444
-#endif
-#ifndef InstDatFlags
-#define InstDatFlags -m 0444
-#endif
-#ifndef InstKmemFlags     /* put -g kmem -m 2711 in site.def... */
-#define InstKmemFlags InstUidFlags
-#endif
-#ifndef ParallelMakeFlags
-#define ParallelMakeFlags /**/
-#endif
-#ifndef ArCmdBase
-#define ArCmdBase ar
-#endif
-#ifndef ArCmd
-#if HasLargeTmp || SystemV4
-#define ArCmd ArCmdBase cq
-#else
-#define ArCmd ArCmdBase clq
-#endif
-#endif
-#ifndef ArAddCmd
-#if HasLargeTmp || SystemV4
-#define ArAddCmd ArCmdBase ru
-#else
-#define ArAddCmd ArCmdBase rul
-#endif
-#endif
-#ifndef ArExtCmd
-#if HasLargeTmp || SystemV4
-#define ArExtCmd ArCmdBase x
-#else
-#define ArExtCmd ArCmdBase xl
-#endif
-#endif
-#ifndef BootstrapCFlags
-#define BootstrapCFlags /**/
-#endif
-#ifndef HasGcc2
-#define HasGcc2 NO
-#endif
-#ifndef HasGcc
-#define HasGcc HasGcc2
-#endif
-#ifndef HasGcc2ForCplusplus
-#define HasGcc2ForCplusplus NO
-#endif
-#ifndef HasCenterLineC
-#define HasCenterLineC NO
-#endif
-#ifndef HasCenterLineCplusplus
-#define HasCenterLineCplusplus NO
-#endif
-#ifndef CcCmd
-#if HasGcc2
-#define CcCmd gcc -fpcc-struct-return 
-#else
-#if HasGcc
-#define CcCmd gcc -fstrength-reduce -fpcc-struct-return 
-#else
-#if HasCenterLineC
-#define CcCmd clcc
-#else
-#define CcCmd cc
-#endif
-#endif
-#endif
-#endif
-#ifndef CplusplusCmd
-#if HasGcc2ForCplusplus
-#define CplusplusCmd g++
-#else
-#define CplusplusCmd CC
-#endif
-#endif
-#ifndef CplusplusFilt
-# define CplusplusFilt	c++filt
-#endif
-#ifndef CplusplusLibC
-#define CplusplusLibC /**/
-#endif
-#ifndef CplusplusStandardDefines
-#define CplusplusStandardDefines StandardDefines
-#endif
-#ifndef CplusplusExtraDefines
-#define CplusplusExtraDefines /**/
-#endif
-#ifndef CplusplusExtraIncludes
-#define CplusplusExtraIncludes /**/
-#endif
-#ifndef CplusplusDependIncludes
-#define CplusplusDependIncludes /**/
-#endif
-#ifndef CplusplusOptions
-#define CplusplusOptions /**/
-#endif
-#ifndef CplusplusSpecialOptions
-#define CplusplusSpecialOptions /**/
-#endif
-#if HasFortran
-#ifndef FortranCmd
-#define FortranCmd f77
-#endif
-#ifndef FortranFlags
-#define FortranFlags /**/
-#endif
-#ifndef FortranDebugFlags	/* for -O or -g */
-#define FortranDebugFlags /**/
-#endif
-#endif
-#ifndef AsCmd
-#define AsCmd as
-#endif
-#ifndef CompressCmd
-#define CompressCmd compress
-#endif
-#ifndef GzipCmd
-#define GzipCmd gzip
-#endif
-#ifndef CppCmd
-#define CppCmd /lib/cpp
-#endif
-#ifndef CppNoLineInfoOption
-#define CppNoLineInfoOption /**/
-#endif
-#ifndef PreProcessCmd
-#define PreProcessCmd CcCmd -E
-#endif
-#ifndef InstallCmd		/* hack should be in project */
-#if SystemV || SystemV4
-#ifdef UseInstalled		/* assume BINDIR in path */
-#define InstallCmd bsdinst
-#else
-#define InstallCmd $(SHELL) $(CONFIGSRC)/util/bsdinst.sh
-#endif
-#else
-#define InstallCmd install
-#endif
-#endif
-#ifndef InstallFlags
-#define InstallFlags -c
-#endif
-#ifndef LdCmd
-#define LdCmd ld
-#endif
-#ifndef LexCmd
-#define LexCmd lex
-#endif
-#ifndef LexLib
-#define LexLib -ll
-#endif
-#ifndef YaccCmd
-#define YaccCmd yacc
-#endif
-#ifndef CplusplusYaccCmd
-#define CplusplusYaccCmd YaccCmd
-#endif
-#ifndef LintCmd
-#define LintCmd lint
-#endif
-#ifndef LintLibFlag
-#if SystemV || SystemV4
-#define LintLibFlag -o
-#else
-#define LintLibFlag -C
-#endif
-#endif
-#ifndef LintOpts
-#if SystemV || SystemV4
-#define LintOpts -bh
-#else
-#define LintOpts -axz
-#endif
-#endif
-#ifndef CpCmd
-#define CpCmd cp
-#endif
-#ifndef LnCmd /* can use cp instead of ln if necessary */
-#if HasSymLinks
-#define LnCmd ln -s
-#else
-#define LnCmd ln
-#endif
-#endif
-#ifndef MakeCmd
-#define MakeCmd make
-#endif
-#ifndef MvCmd
-#define MvCmd mv -f
-#endif
-#ifndef RanlibCmd
-#define RanlibCmd ranlib
-#endif
-#ifndef RanlibInstFlags
-#define RanlibInstFlags /**/
-#endif
-#ifndef RmCmd
-#define RmCmd rm -f
-#endif
-#ifndef StandardIncludes	/* for platform-specifics */
-#define StandardIncludes /**/
-#endif
-#ifndef StandardDefines
-#if SystemV
-#define StandardDefines -DSYSV
-#else
-#if SystemV4
-#define StandardDefines -DSVR4
-#else
-#define StandardDefines /**/
-#endif
-#endif
-#endif
-#ifndef StandardCppDefines
-#define StandardCppDefines StandardDefines
-#endif
-#ifndef Malloc0ReturnsNull
-#if UseGnuMalloc
-#define Malloc0ReturnsNull YES
-#else
-#define Malloc0ReturnsNull NO
-#endif
-#endif
-#if Malloc0ReturnsNull
-#ifndef Malloc0ReturnsNullDefines
-#define Malloc0ReturnsNullDefines -DMALLOC_0_RETURNS_NULL
-#endif
-#endif
-#ifndef ToolkitStringsABIOptions
-#define ToolkitStringsABIOptions /**/
-#endif
-#ifndef NdbmDefines
-#if HasNdbm
-#define NdbmDefines -DNDBM
-#else
-#define NdbmDefines /**/
-#endif
-#endif
-#ifndef LdPreLib
-#if !defined(UseInstalled)
-#define LdPreLib -L$(BUILDLIBDIR)
-#else
-#if AlternateUsrLibDir
-#define LdPreLib -L$(USRLIBDIR)
-#else
-#define LdPreLib /**/
-#endif
-#endif
-#endif
-#ifndef LdPostLib
-#if !defined(UseInstalled) && AlternateUsrLibDir && !HasLdRunPath
-#define LdPostLib -L$(USRLIBDIR)
-#else
-#define LdPostLib /**/
-#endif
-#endif
-#ifndef MathLibrary
-#define MathLibrary -lm
-#endif
-#ifndef DBMLibrary
-#define DBMLibrary -ldbm
-#endif
-#ifndef DlLibrary
-#define DlLibrary -ldl
-#endif
-#ifndef ExtraLibraries
-#if SystemV4
-#if HasSockets
-#define ExtraLibraries -lsocket -lnsl -lw
-#else
-#define ExtraLibraries -lnsl -lw
-#endif
-#else
-#define ExtraLibraries /**/
-#endif
-#endif
-#ifndef ExtraLoadOptions
-#define ExtraLoadOptions /**/
-#endif
-#ifndef ExtraLoadFlags
-#define ExtraLoadFlags /**/
-#endif
-#ifndef LdCombineFlags
-#if SystemV4
-#define LdCombineFlags -r
-#else
-#define LdCombineFlags -X -r
-#endif
-#endif
-#ifndef LdStripFlags
-#define LdStripFlags -x
-#endif
-#ifndef TagsCmd
-#define TagsCmd ctags
-#endif
-#ifndef LoaderLibPrefix
-#define LoaderLibPrefix /**/
-#endif
-#ifndef ImakeCmd
-#ifdef UseInstalled		/* assume BINDIR in path */
-#define ImakeCmd imake
-#else
-#define ImakeCmd $(IMAKESRC)/imake
-#endif
-#endif
-#ifndef DependCmd
-#if UseGccMakeDepend
-#ifdef UseInstalled		/* assume BINDIR in path */
-#define DependCmd gccmakedep
-#else
-#define DependCmd $(DEPENDSRC)/gccmakedep
-#endif
-#else
-#ifdef UseInstalled		/* assume BINDIR in path */
-#define DependCmd makedepend
-#else
-#define DependCmd $(DEPENDSRC)/makedepend
-#endif
-#endif
-#endif
-#ifndef DependFlags
-#define DependFlags /**/
-#endif
-#ifndef DependFileName
-#if !HasBsdMake
-#define DependFileName Makefile.dep
-#else
-#define DependFileName .depend
-#endif
-#endif
-#ifndef ExportListCmd
-# ifndef ExportListGenSource
-#  define ExportListCmd		/**/
-# else
-#  if !defined(UseInstalled)
-#   define ExportListCmd		$(CONFIGSRC)/util/exportlistgen
-#  else
-#   define ExportListCmd		exportlistgen
-#  endif
-# endif
-#endif
-#ifndef MkdirHierCmd
-#ifdef UseInstalled		/* assume BINDIR in path */
-#define MkdirHierCmd mkdirhier
-#else
-#define MkdirHierCmd $(SHELL) $(CONFIGSRC)/util/mkdirhier.sh
-#endif
-#endif
-#ifndef TroffCmd
-#define TroffCmd psroff
-#endif
-#ifndef NroffCmd
-#define NroffCmd nroff
-#endif
-#ifndef MsMacros
-#define MsMacros -ms
-#endif
-#ifndef ManMacros
-#define ManMacros -man
-#endif
-#ifndef TblCmd
-#define TblCmd tbl
-#endif
-#ifndef EqnCmd
-#define EqnCmd eqn
-#endif
-#ifndef NeqnCmd
-#define NeqnCmd neqn
-#endif
-#ifndef ColCmd
-#define ColCmd col
-#endif
-#ifndef DvipsCmd
-#define DvipsCmd dvips
-#endif
-#ifndef LatexCmd
-#define LatexCmd latex
-#endif
-#if HasSentinel
-#ifndef SentinelCmd
-#define SentinelCmd sentinel
-#endif
-#ifndef SentinelOptions
-#define SentinelOptions /**/
-#endif
-#endif
-#if HasPurify
-#ifndef PurifyCmd
-#define PurifyCmd purify
-#endif
-#ifndef PurifyOptions
-#define PurifyOptions /**/
-#endif
-#endif
-#if HasTestCenter
-#ifndef ProofCmd
-#define ProofCmd proof
-#endif
-#ifndef ProofOptions
-#define ProofOptions /**/
-#endif
-#endif
-#ifndef PathSeparator
-#define PathSeparator /
-#endif
-#ifndef Osuf
-#define Osuf o
-#endif
-#ifndef CCsuf
-#define CCsuf cc
-#endif
-#ifndef SHsuf
-#define SHsuf sh
-#endif
-#ifndef ManSuffix
-#define ManSuffix	n		/* use just one tab or cpp will die */
-#endif
-#ifndef LibManSuffix
-#define LibManSuffix	3		/* use just one tab or cpp will die */
-#endif
-#ifndef FileManSuffix
-#if SystemV || SystemV4 || defined(OSF1Architecture)
-#define FileManSuffix	4		/* use just one tab or cpp will die */
-#else
-#define FileManSuffix	5		/* use just one tab or cpp will die */
-#endif
-#endif
-#ifndef ExpandManNames
-#if SystemV
-#define ExpandManNames NO
-#else
-#define ExpandManNames YES
-#endif
-#endif
-#ifndef TOPDIR
-#define TOPDIR .
-#endif
-#ifndef CURDIR
-#define CURDIR .
-#endif
-#ifndef SiteIConfigFiles
-#define SiteIConfigFiles /**/
-#endif
-#ifndef OtherIConfigFiles
-#define OtherIConfigFiles /**/
-#endif
-#ifndef ExtraFilesToClean
-#define ExtraFilesToClean /**/
-#endif
-#ifndef FilesToClean
-#define FilesToClean *.CKP *.ln *.BAK *.bak *.Osuf core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut 
-#endif
-
-          PATHSEP = PathSeparator
-            SHELL = BourneShell
-
-              TOP = TOPDIR
-      CURRENT_DIR = CURDIR
-
-            IMAKE = ImakeCmd
-           DEPEND = DependCmd
-        MKDIRHIER = MkdirHierCmd
-    EXPORTLISTGEN = ExportListCmd
-        CONFIGSRC = ConfigSrc
-         IMAKESRC = $(CONFIGSRC)/imake
-        DEPENDSRC = DependDir
-
-          INCROOT = IncRoot		/* base of where to put header files */
-        USRLIBDIR = UsrLibDir		/* nonshared libraries */
-        VARLIBDIR = VarLibDir		/* xdm runtime files */
-         SHLIBDIR = ShLibDir            /* shared libraries */
-       LINTLIBDIR = LintlibDir		/* lint libraries */
-          MANPATH = ManPath		/* top of manual page tree */
-    MANSOURCEPATH = ManSourcePath	/* prefix for man page sources */
-           MANDIR = ManDir		/* man pages for commands */
-        LIBMANDIR = LibmanDir		/* man pages for library routines */
-       FILEMANDIR = FileManDir		/* man pages for config files */
-
-               AR = ArCmd
-  BOOTSTRAPCFLAGS = BootstrapCFlags	/* set if cpp does not have uniq sym */
-               CC = CcCmd
-               AS = AsCmd
-#if HasFortran
-               FC = FortranCmd
-      FDEBUGFLAGS = FortranDebugFlags
-          FCFLAGS = FortranFlags $(FDEBUGFLAGS)
-#endif
-#if HasCplusplus
-
-.SUFFIXES: .CCsuf
-
-              CXX = CplusplusCmd
-          CXXFILT = CplusplusFilt
-           CXXLIB = CplusplusLibC
-    CXXDEBUGFLAGS = DefaultCplusplusDebugFlags
-CXXDEPENDINCLUDES = CplusplusDependIncludes
- CXXEXTRA_DEFINES = CplusplusExtraDefines
-CXXEXTRA_INCLUDES = CplusplusExtraIncludes
-   CXXSTD_DEFINES = CplusplusStandardDefines $(CXXPROJECT_DEFINES)
-       CXXOPTIONS = CplusplusOptions
-      CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) 
-       CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES)
-         CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
-#endif
-         COMPRESS = CompressCmd
-          GZIPCMD = GzipCmd
-              CPP = CppCmd $(STD_CPP_DEFINES)		/* simple filters */
-    PREPROCESSCMD = PreProcessCmd $(STD_CPP_DEFINES)	/* prefered; mdep */
-          INSTALL = InstallCmd
-     INSTALLFLAGS = InstallFlags
-               LD = LdCmd
-              LEX = LexCmd
-           LEXLIB = LexLib
-             YACC = YaccCmd
-           CCYACC = CplusplusYaccCmd
-             LINT = LintCmd
-      LINTLIBFLAG = LintLibFlag
-         LINTOPTS = LintOpts
-               LN = LnCmd
-             MAKE = MakeCmd
-               MV = MvCmd
-               CP = CpCmd
-#if DoRanlibCmd
-           RANLIB = RanlibCmd
-  RANLIBINSTFLAGS = RanlibInstFlags
-#endif
-               RM = RmCmd
-        MANSUFFIX = ManSuffix		/* suffix for command man pages */
-     LIBMANSUFFIX = LibManSuffix	/* suffix for library man pages */
-    FILEMANSUFFIX = FileManSuffix	/* suffix for config file man pages */
-            TROFF = TroffCmd
-            NROFF = NroffCmd
-         MSMACROS = MsMacros
-        MANMACROS = ManMacros
-              TBL = TblCmd
-              EQN = EqnCmd
-             NEQN = NeqnCmd
-              COL = ColCmd
-#if HasLatex
-            DVIPS = DvipsCmd
-            LATEX = LatexCmd
-#endif
-#if HasSentinel
-         SENTINEL = SentinelCmd
-  SENTINELOPTIONS = SentinelOptions
-#endif
-#if HasPurify
-           PURIFY = PurifyCmd
-    PURIFYOPTIONS = PurifyOptions
-#endif
-#if HasTestCenter
-           PROOF = ProofCmd
-    PROOFOPTIONS = ProofOptions
-#endif
-     STD_INCLUDES = StandardIncludes
-  STD_CPP_DEFINES = StandardCppDefines $(PROJECT_DEFINES)
-      STD_DEFINES = StandardDefines $(PROJECT_DEFINES)
- EXTRA_LOAD_FLAGS = ExtraLoadFlags
-  EXTRA_LDOPTIONS = ExtraLoadOptions
-  EXTRA_LIBRARIES = MallocLibraries ExtraLibraries Krb5Libraries
-             TAGS = TagsCmd
-#if ConstructMFLAGS
-           MFLAGS = -$(MAKEFLAGS)
-#endif
-#if ConstructMAKEFLAGS
-        MAKEFLAGS = $(MFLAGS)
-#endif
-   PARALLELMFLAGS = ParallelMakeFlags
-#if HasSharedLibraries
-    SHAREDCODEDEF = SharedCodeDef
-         SHLIBDEF = SharedLibraryDef
-#ifdef SharedLibraryLoadFlags
-     SHLIBLDFLAGS = SharedLibraryLoadFlags
-#endif
-/*
- * Here we set up flags needed to produce position-independent code 
- * when doing C and C++ compilation.  The default if you specify C
- * PIC flags without also specifying C++ PIC flags is to assume that 
- * the C flags work for both.  If your C++ compiler requires different
- * flags, specify them explicitly in PositionIndependentCplusplusFlags.
- */
-#ifdef PositionIndependentCFlags
-         PICFLAGS = PositionIndependentCFlags
-#endif
-#ifdef PositionIndependentCplusplusFlags
-      CXXPICFLAGS = PositionIndependentCplusplusFlags
-#else
-#ifdef PositionIndependentCFlags
-      CXXPICFLAGS = PositionIndependentCFlags
-#endif
-#endif
-#endif
-#if !HasVoidSignalReturn
-   SIGNAL_DEFINES = -DSIGNALRETURNSINT
-#endif
-/*
- * The following supports forcing of function prototypes
- */
-#if NeedFunctionPrototypes && NeedVarargsPrototypes && NeedConstPrototypes && NeedNestedPrototypes
-#define _funcprotodef -DFUNCPROTO=15
-#else
-#if NeedFunctionPrototypes && NeedVarargsPrototypes && NeedNestedPrototypes
-#define _funcprotodef -DFUNCPROTO=11
-#else
-#if NeedFunctionPrototypes && NeedNestedPrototypes
-#define _funcprotodef -DFUNCPROTO=9
-#else
-#if NeedFunctionPrototypes && NeedVarargsPrototypes && NeedConstPrototypes
-#define _funcprotodef -DFUNCPROTO=7
-#else
-#if NeedFunctionPrototypes && NeedConstPrototypes
-#define _funcprotodef -DFUNCPROTO=5
-#else
-#if NeedFunctionPrototypes && NeedVarargsPrototypes
-#define _funcprotodef -DFUNCPROTO=3
-#else
-#if NeedFunctionPrototypes
-#define _funcprotodef -DFUNCPROTO
-#else
-#define _funcprotodef /**/
-#endif
-#endif
-#endif
-#endif
-#endif
-#endif
-#endif
-#if NeedWidePrototypes
-#define _wideprotodef /**/
-#else
-#define _wideprotodef -DNARROWPROTO
-#endif
-    PROTO_DEFINES = _funcprotodef _wideprotodef 
-#undef _funcprotodef
-#undef _wideprotodef
-
-#if StripInstalledPrograms
-     INSTPGMFLAGS = InstPgmFlags	/* install flags for stripping */
-#else
-     INSTPGMFLAGS = 
-#endif
-     INSTBINFLAGS = InstBinFlags	/* install flags for programs */
-     INSTUIDFLAGS = InstUidFlags	/* install flags for setuid programs */
-     INSTLIBFLAGS = InstLibFlags	/* install flags for libraries */
-     INSTINCFLAGS = InstIncFlags	/* install flags for headers */
-     INSTMANFLAGS = InstManFlags	/* install flags for man pages */
-     INSTDATFLAGS = InstDatFlags	/* install flags for data files */
-    INSTKMEMFLAGS = InstKmemFlags	/* install flags for /dev/kmem progs */
-
-#ifdef ProjectRoot
-      PROJECTROOT = ProjectRoot
-#endif
-#ifdef UseInstalled
-# if AlternateIncRoot
-#  define TopInclude	-I$(INCROOT)
-# else
-#  define TopInclude	/**/
-# endif
-#else
-# define TopInclude	-I$(TOP)
-#endif
-      CDEBUGFLAGS = DefaultCDebugFlags
-        CCOPTIONS = DefaultCCOptions	/* to distinguish from param flags */
-/*
- * STD_INCLUDES contains system-specific includes
- * TOP_INCLUDES specifies how to get to /usr/include or its build substitute
- * EXTRA_INCLUDES contains project-specific includes set in project incfiles
- * INCLUDES contains client-specific includes set in Imakefile
- * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile
- */
-      ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
-       ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES)
-           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
-        LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
-         LDPRELIB = LdPreLib
-        LDPOSTLIB = LdPostLib
-        LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS)  $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
-     CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
-
-           LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
-#if HasBrokenCCForLink
-           CCLINK = LdCmd
-#else
-#if AlternateUsrLibDir && HasLdRunPath
-       CCENVSETUP = LD_RUN_PATH=$(USRLIBDIRPATH)
-           CCLINK = $(CCENVSETUP) $(CC)
-#else
-           CCLINK = $(CC)
-#endif
-#endif
-#if AlternateUsrLibDir && HasLdRunPath
-      CXXENVSETUP = LD_RUN_PATH=$(USRLIBDIRPATH)
-          CXXLINK = $(CXXENVSETUP) $(CXX)
-#else
-          CXXLINK = $(CXX)
-#endif
-     LDSTRIPFLAGS = LdStripFlags
-   LDCOMBINEFLAGS = LdCombineFlags
-      DEPENDFLAGS = DependFlags
-
-XCOMM Not sure this belongs here
-         TKLIBDIR = TkLibDir
-         TKINCDIR = TkIncDir
-        TKLIBNAME = TkLibName
-        TKLIBRARY = TkLibrary
-        TCLLIBDIR = TclLibDir
-        TCLINCDIR = TclIncDir
-       TCLLIBNAME = TclLibName
-       TCLLIBRARY = TclLibrary
-
-        MACROFILE = MacroFile
-           RM_CMD = $(RM)
-
-    IMAKE_DEFINES = /* leave blank, for command line use only */
-#ifdef UseInstalled
-         IRULESRC = $(CONFIGDIR)	/* used in rules file */
-        IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES)
-#else
-         IRULESRC = $(CONFIGSRC)/cf
-        IMAKE_CMD = $(IMAKE) -I$(IRULESRC) $(IMAKE_DEFINES)
-#endif
-#if !HasClearmake
-     /* clearmake records relevant defines and flags in the build script,
-	so it knows when they change and we don't need this coarser-level
-	dependency.  We also don't want it, since it prevents sharing if
-	even one config file, say site.def or host.def, changes. */
-     ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/X11.tmpl \
-			$(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) \
-			OtherIConfigFiles SiteIConfigFiles $(EXTRA_ICONFIGFILES)
-#endif
-
-#ifndef TopLevelProject
-# define TopLevelProject	X11
-#endif
-#ifndef ProjectRulesFile
-# define ProjectRulesFile	Concat3(<,TopLevelProject,.rules>)
-#endif
-#include ProjectRulesFile
-#ifndef LocalRulesFile
-/* need this to make ANSI-style preprocessors happy */
-#define LocalRulesFile <noop.rules>
-#endif
-#include LocalRulesFile
-
-/*
- * get project-specific configuration and rules
- */
-#ifndef ProjectTmplFile
-#define ProjectTmplFile		Concat3(<,TopLevelProject,.tmpl>)
-#endif
-#include ProjectTmplFile
-#ifndef LocalTmplFile
-/* need this to make ANSI-style preprocessors happy */
-#define LocalTmplFile <noop.rules>
-#endif
-#include LocalTmplFile
-
-#ifdef FixupLibReferences
-FixupLibReferences()
-#endif
-
-/* ConfigDir comes from X11.tmpl */
-        CONFIGDIR = ConfigDir		/* build configuration information */
-#if HasClearmake
-           OSNAME = OSName
-#endif
-    USRLIBDIRPATH = UsrLibDirPath
-        LDPRELIBS = LdPreLibs
-       LDPOSTLIBS = LdPostLibs
-     TOP_INCLUDES = TopIncludes
-  PROJECT_DEFINES = ProjectDefines
-#if HasCplusplus
-CXXPROJECT_DEFINES = CplusplusProjectDefines
-#endif
-
-XCOMM ----------------------------------------------------------------------
-XCOMM start of Imakefile
-#include INCLUDE_IMAKEFILE
-
-XCOMM ----------------------------------------------------------------------
-XCOMM common rules for all Makefiles - do not edit
-
-.c.i:
-	CPPOnlyCompile($*.c,$(_NOOP_))
-/*
- * These need to be here so that rules in Imakefile occur first;  the blank
- * emptyrule is to make sure that an empty Imakefile does not default to make
- * clean.
- */
-emptyrule::
-
-CleanTarget()
-
-#ifndef IHaveSpecialMakefileTarget
-MakefileTarget()
-#endif
-
-TagsTarget()
-#ifdef MakefileAdditions
-MakefileAdditions()
-#endif
-
-CenterLoadTarget(debug_src,$(SRCS),NullParameter,$(ALLDEFINES))
-
-CenterLoadTarget(debug_obj,$(OBJS),NullParameter,$(ALLDEFINES))
-
-ManKeywordsTarget($(MANPATH))
-
-#ifdef IHaveSubdirs
-XCOMM ----------------------------------------------------------------------
-XCOMM rules for building in SUBDIRS - do not edit
-
-InstallSubdirs($(SUBDIRS))
-InstallManSubdirs($(SUBDIRS))
-InstallLinkKitSubdirs($(SUBDIRS))
-CleanSubdirs($(SUBDIRS))
-TagSubdirs($(SUBDIRS))
-MakefileSubdirs($(SUBDIRS))
-IncludesSubdirs($(SUBDIRS))
-
-#endif
-
-/* must be after all install.man rules that install anything */
-#if MakeManKeywords		/* typically only at top level */
-install.man:: man_keywords
-#endif
-
-#ifndef IHaveSubdirs
-XCOMM ----------------------------------------------------------------------
-XCOMM empty rules for directories that do not have SUBDIRS - do not edit
-
-install::
-	@echo "install in $(CURRENT_DIR) done"
-
-install.man::
-	@echo "install.man in $(CURRENT_DIR) done"
-
-install.linkkit::
-	@echo "install.linkkit in $(CURRENT_DIR) done"
-
-Makefiles::
-
-includes::
-
-depend::
-
-#endif /* if subdirectory rules are needed */
-
-XCOMM ----------------------------------------------------------------------
-XCOMM dependencies generated by makedepend
-IncludeMakefile(DependFileName)
--- a/Xvnc/config/cf/Imakefile
+++ /dev/null
@@ -1,142 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/38 1996/11/07 14:43:46 kaleb $
-XCOMM $XFree86: xc/config/cf/Imakefile,v 3.13.2.2 1997/07/27 02:41:03 dawes Exp $
-
-XCOMM Some compilers generate fatal errors if an -L directory does
-XCOMM not exist.  Since BUILDLIBDIR may not exist yet suppress its use.
-         LDPRELIB =
-        LDPRELIBS =
-
-#ifdef LocalConfigFiles
-LOCALFILES = LocalConfigFiles
-#endif
-
-#ifndef InstallEmptyHostDef
-HOSTDEFFILES = \
-host.def
-#endif
-
-DEFFILES = \
-xf86site.def \
-$(HOSTDEFFILES) \
-site.def
-
-RULEFILES = \
-Imake.rules \
-Motif.rules \
-Win32.rules \
-X11.rules \
-bsdLib.rules \
-cde.rules \
-hpLib.rules \
-ibmLib.rules \
-lnxLib.rules \
-lnxdoc.rules \
-necLib.rules \
-noop.rules \
-oldlib.rules \
-os2.rules \
-os2Lib.rules \
-os2Lib.rules \
-osfLib.rules \
-scoLib.rules \
-sgiLib.rules \
-sunLib.rules \
-sv3Lib.rules \
-sv4Lib.rules \
-xf86.rules
-
-TMPLFILES = \
-Imake.tmpl \
-Library.tmpl \
-Motif.tmpl \
-Server.tmpl \
-ServerLib.tmpl \
-Threads.tmpl \
-WinLib.tmpl \
-X11.tmpl \
-bsdLib.tmpl \
-cde.tmpl \
-hpLib.tmpl \
-ibmLib.tmpl \
-lnxLib.tmpl \
-lnxdoc.tmpl \
-necLib.tmpl \
-os2Lib.tmpl \
-osfLib.tmpl \
-sgiLib.tmpl \
-sunLib.tmpl \
-sv3Lib.tmpl \
-sv4Lib.tmpl \
-xf86.tmpl
-
-CFFILES = \
-Imake.cf \
-Amoeba.cf \
-DGUX.cf \
-FreeBSD.cf \
-Mips.cf \
-NetBSD.cf \
-OpenBSD.cf \
-Oki.cf \
-Win32.cf \
-apollo.cf \
-bsd.cf \
-bsdi.cf \
-convex.cf \
-cray.cf \
-fujitsu.cf \
-generic.cf \
-hp.cf \
-ibm.cf \
-isc.cf \
-linux.cf \
-luna.cf \
-macII.cf \
-mach.cf \
-minix.cf \
-moto.cf \
-ncr.cf \
-nec.cf \
-os2.cf \
-osf1.cf \
-pegasus.cf \
-sco.cf \
-sco5.cf \
-sequent.cf \
-sgi.cf \
-sony.cf \
-sun.cf \
-svr3.cf \
-svr4.cf \
-ultrix.cf \
-usl.cf \
-lynx.cf \
-x386.cf \
-xfree86.cf
-
-INSTFILES = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES) $(LOCALFILES)
-
-all::
-
-InstallMultipleDestFlags(install,$(INSTFILES),$(CONFIGDIR),$(INSTDATFLAGS))
-InstallLinkKitMultipleDestFlags($(INSTFILES),$(LINKKITDIR)/config/cf,$(INSTDATFLAGS))
-
-#ifdef InstallEmptyHostDef
-install::
-	@(TMP=/tmp/tmp.$$$$; \
-	RemoveFile($${TMP}); \
-	echo "" > $${TMP}; \
-	$(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) $${TMP} \
-		$(DESTDIR)$(CONFIGDIR)/host.def; \
-	RemoveFile($${TMP}))
-
-#ifdef XFree86Version
-install.linkkit::
-	@(TMP=/tmp/tmp.$$$$; \
-	RemoveFile($${TMP}); \
-	echo "" > $${TMP}; \
-	$(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) $${TMP} \
-		$(DESTDIR)$(LINKKITDIR)/config/cf/host.def; \
-	RemoveFile($${TMP}))
-#endif
-#endif
--- a/Xvnc/config/cf/Library.tmpl
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
- * Library imakefile info  - this contains any special redefinitions, etc.
- * that Imakefiles in the various library subtrees will need.
- *
- * Before including this, you must set the following boolean variables:
- * DoNormalLib, DoSharedLib, DoDebugLib, DoProfileLib
- *
- * To get automatic generation of standard rules, also set the variables:
- * LibName, SoRev, HasSharedData, and optionally HugeLibrary and IncSubdir.
- *
- * To suppress installation of the library define LibInstall NO.
- * To suppress creating (and installing) the library define LibCreate NO.
- * To suppress installing headers define LibHeaders NO.
- * Define LargePICTable YES if large (32-bit) PIC tables are needed.
- */
-
-XCOMM $TOG: Library.tmpl /main/44 1997/04/28 11:47:53 kaleb $
-
-
-
-
-XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.5.2.1 1997/06/11 12:08:29 dawes Exp $
-
-#ifndef LibraryCplusplusOptions
-# if DoSharedLib && defined(SharedLibraryCplusplusOptions)
-#  define LibraryCplusplusOptions SharedLibraryCplusplusOptions
-# else
-#  define LibraryCplusplusOptions DefaultCplusplusOptions
-# endif
-#endif
-#ifndef LibraryDefines
-# define LibraryDefines StandardDefines
-#endif
-#ifndef LibraryCDebugFlags
-# define LibraryCDebugFlags DefaultCDebugFlags
-#endif
-#ifndef LibraryCplusplusDebugFlags
-# define LibraryCplusplusDebugFlags DefaultCplusplusDebugFlags
-#endif
-#ifndef SeparateSharedCompile
-# define SeparateSharedCompile YES
-#endif
-
-#ifndef CplusplusSource
-# ifndef LibraryCcCmd
-#  if DoSharedLib && defined(SharedLibraryCcCmd)
-#   define LibraryCcCmd SharedLibraryCcCmd
-#  else
-#   define LibraryCcCmd CcCmd
-#  endif
-# endif
-# ifndef LibraryCCOptions
-#  if DoSharedLib && defined(SharedLibraryCCOptions)
-#   define LibraryCCOptions SharedLibraryCCOptions
-#  else
-#   define LibraryCCOptions DefaultCCOptions
-#  endif
-# endif
-
-         CC = LibraryCcCmd
-  CCOPTIONS = LibraryCCOptions
-STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
-CDEBUGFLAGS = LibraryCDebugFlags
-# if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
-   PICFLAGS = LargePositionIndependentCFlags
-# endif
-#else
-# ifndef LibraryCplusplusCmd
-#  if DoSharedLib && defined(SharedLibraryCplusplusCmd)
-#   define LibraryCplusplusCmd SharedLibraryCplusplusCmd
-#  else
-#   define LibraryCplusplusCmd CplusplusCmd
-#  endif
-# endif
-# ifndef LibraryCplusplusOptions
-#  if DoSharedLib && defined(SharedLibraryCplusplusOptions)
-#   define LibraryCplusplusOptions SharedLibraryCplusplusOptions
-#  else
-#   define LibraryCplusplusOptions DefaultCplusplusOptions
-#  endif
-# endif
-
-          CXX = LibraryCplusplusCmd
-   CXXOPTIONS = LibraryCplusplusOptions
-  STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
-CXXDEBUGFLAGS = LibraryCplusplusDebugFlags
-# if defined(LargePICTable) && LargePICTable
-#  ifdef LargePositionIndependentCplusplusFlags
-  CXXPICFLAGS = LargePositionIndependentCplusplusFlags
-#  elif defined(LargePositionIndependentCFlags)
-  CXXPICFLAGS = LargePositionIndependentCFlags
-#  endif
-# endif
-#endif
-
-LIB_MT_DEFINES = LibraryMTDefines
-
-#if defined(IHaveSubdirs) && HasSymLinks
-#define _LibMkdir LibMkdirLinkSubdirs
-#else
-#define _LibMkdir LibMkdir
-#endif
-
-#if DoDebugLib
-# define _DebuggedLibMkdir() _LibMkdir(debugger)
-# define _DebuggedObjCompile(options) DebuggedLibObjCompile(options)
-# define _DebuggedObjCplusplusCompile(options) DebuggedLibObjCplusplusCompile(options)
-# define _DebuggedCleanDir() LibCleanDir(debugger)
-#else
-# define _DebuggedLibMkdir() $(_NULLCMD_)
-# define _DebuggedObjCompile(options) $(_NULLCMD_)
-# define _DebuggedObjCplusplusCompile(options) $(_NULLCMD_)
-# define _DebuggedCleanDir() $(_NULLCMD_)
-#endif
-
-#if DoProfileLib
-# define _ProfiledLibMkdir() _LibMkdir(profiled)
-# define _ProfiledObjCompile(options) ProfiledLibObjCompile(options)
-# define _ProfiledObjCplusplusCompile(options) ProfiledLibObjCplusplusCompile(options)
-# define _ProfiledCleanDir() LibCleanDir(profiled)
-#else
-# define _ProfiledLibMkdir() $(_NULLCMD_)
-# define _ProfiledObjCompile(options) $(_NULLCMD_)
-# define _ProfiledObjCplusplusCompile(options) $(_NULLCMD_)
-# define _ProfiledCleanDir() $(_NULLCMD_)
-#endif
-
-#if !DoNormalLib
-# define _NormalLibMkdir() $(_NULLCMD_)
-# define _NormalObjCompile(options) $(_NULLCMD_)
-# define _NormalObjCplusplusCompile(options) $(_NULLCMD_)
-# define _NormalCleanDir() $(_NULLCMD_)
-#else
-# if DoSharedLib && SeparateSharedCompile
-#  define _NormalLibMkdir() _LibMkdir(unshared)
-#  define _NormalObjCompile(options) UnsharedLibObjCompile(options)
-#  define _NormalObjCplusplusCompile(options) UnsharedLibObjCplusplusCompile(options)
-#  define _NormalCleanDir() LibCleanDir(unshared)
-# else
-#  define _NormalLibMkdir() $(_NULLCMD_)
-#  define _NormalObjCompile(options) NormalLibObjCompile(options)
-#  define _NormalObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options)
-#  define _NormalCleanDir() $(_NULLCMD_)
-# endif
-#endif
-
-#if !DoSharedLib || (DoNormalLib && !SeparateSharedCompile)
-# define _SharedObjCompile(options) $(_NULLCMD_)
-# define _SharedObjCplusplusCompile(options) $(_NULLCMD_)
-#else
-# if SeparateSharedCompile
-#  define _SharedObjCompile(options) NormalSharedLibObjCompile(options)
-#  define _SharedObjCplusplusCompile(options) NormalSharedLibObjCplusplusCompile(options)
-#else
-# define _SharedObjCompile(options) NormalLibObjCompile(options)
-# define _SharedObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options)
-#endif
-#endif
-
-#ifndef CplusplusSource
-# define SRCsuf c
-#else
-# define SRCsuf CCsuf
-# ifdef SunArchitecture
-.SUFFIXES: .CCsuf
-# endif
-#endif
-
-#define _CompileObj(target, options)					@@\
-target									@@\
-	_DebuggedObjCompile(options)					@@\
-	_ProfiledObjCompile(options)					@@\
-	_NormalObjCompile(options)					@@\
-	_SharedObjCompile(options)
-
-#ifdef CplusplusSource
-# define _CompileObjCplusplus(target, options)				@@\
-target									@@\
-	_DebuggedObjCplusplusCompile(options)				@@\
-	_ProfiledObjCplusplusCompile(options)				@@\
-	_NormalObjCplusplusCompile(options)				@@\
-	_SharedObjCplusplusCompile(options)
-#else
-# define _CompileObjCplusplus(target, options)
-#endif
-
-#ifndef LibraryObjectRule
-# define LibraryObjectRule()						@@\
-all::									@@\
-	_DebuggedLibMkdir()						@@\
-	_ProfiledLibMkdir()						@@\
-	_NormalLibMkdir()						@@\
-									@@\
-includes::								@@\
-	_DebuggedLibMkdir()						@@\
-	_ProfiledLibMkdir()						@@\
-	_NormalLibMkdir()						@@\
-									@@\
-_CompileObj(.c.Osuf:,$(_NOOP_))						@@\
-_CompileObjCplusplus(.SRCsuf.Osuf:,$(_NOOP_))				@@\
-									@@\
-clean::									@@\
-	_DebuggedCleanDir()						@@\
-	_ProfiledCleanDir()						@@\
-	_NormalCleanDir()						@@\
-
-#endif /* LibraryObjectRule */
-
-#ifndef SpecialLibObjectRule
-# define SpecialLibObjectRule(objs,depends,options)			@@\
-_CompileObj(objs: depends,options)
-#endif /* SpecialLibObjectRule */
-
-#ifndef SpecialCLibObjectRule
-# define SpecialCLibObjectRule(basename,depends,options)		@@\
-_CompileObj(basename.Osuf: basename.SRCsuf depends,options)		@@\
-									@@\
-basename.i: basename.SRCsuf depends					@@\
-	CPPOnlyCompile(basename.SRCsuf,options)				@@\
-									@@\
-CenterLoadTarget(debug_src,basename.SRCsuf,NullParameter,$(ALLDEFINES) options)
-#endif /* SpecialCLibObjectRule */
-
-#ifndef SpecialCplusplusLibObjectRule
-# define SpecialCplusplusLibObjectRule(basename,depends,options)	@@\
-_CompileObjCplusplus(basename.Osuf: basename.SRCsuf depends,options)	@@\
-									@@\
-CenterLoadTarget(debug_src,basename.SRCsuf,NullParameter,$(ALLDEFINES) options)
-#endif /* SpecialCplusplusLibObjectRule */
-
-/*
- * ToolkitMakeStrings generates a string-table, i.e., a C source
- * file and the matching header(s), e.g., Xt's StringDefs.c, StringDefs.h,
- * and Shell.h files; or Motif's XmStrDefs.c and XmStrDefs.h files.
- *
- * The 'files' argument is the list of files that will be produced by
- * this rule, e.g., for Xt they would be "Shell.h StringDefs.c StringDefs.h"
- * and for Motif they would be "XmStrDefs.c XmStrDefs.h".
- *
- * The 'source' argument is the string-list file to be parsed, e.g., in
- * Xt that would be "util/string.list".  For Motif 2.0 it would be
- * "../../tools/makestr/xmstring.list", and for Motif-CDE1 it would be
- * "util/xmstring.list".
- *
- * The 'options' argument is passed by the library's Imakefile, see the
- * Xt Imakefile for an example.  Typically this would be nothing, -intelabi,
- * or -sparcabi; there are other choices, but these are typical.
- *
- * The 'depends' argument names additional files the target files
- * depend on.  It should name the #ctmpl and #htmpl files from the
- * 'source' file.
- *
- * The 'dest' argument is the C source output file.  For Xt this should
- * be "StringDefs.c", and for all versions of Motif it would be "XmStrDefs.c"
- *
- * Headers are generated and named according to data in the 'source'
- * file.
- */
-/*
- * The NoCmpScript
- * prevents clearmake from trying to remake makestrs if it exists.
- * Including both $(MAKESTRS) and $(MAKESTRS).o as primary targets
- * prevents clearmake from trying to recompile makestrs from here.
- * We have includes, not files, depend on makestrs to try to get
- * clearmake to wink in the files.  Bug in clearmake 2.0.2?
- */
-
-#ifndef MakeStringsDependency
-# define MakeStringsDependency						@@\
-MAKESTRS = $(CONFIGSRC)/util/makestrs					@@\
-NoCmpScript(ProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf)		@@\
-									@@\
-ProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf:			@@\
-	cd $(CONFIGSRC)/util && $(MAKE) ProgramTargetName(makestrs)	@@\
-									@@\
-includes:: ProgramTargetName($(MAKESTRS))
-#endif
-#ifndef ToolkitMakeStrings
-# if defined(LibTookitMakeStringsDependency) && LibTookitMakeStringsDependency
-#  define ToolkitMakeStrings(files,source,options,depends,dest)		@@\
-files: source depends							@@\
-	RemoveFiles(files)						@@\
-	RunProgram(MAKESTRS,options < source > dest)			@@\
-									@@\
-AllTarget(files)							@@\
-									@@\
-includes:: files							@@\
-									@@\
-depend:: files								@@\
-									@@\
-clean::									@@\
-	RemoveFiles(files)
-# else
-#  define ToolkitMakeStrings(files,source,options,depends,dest)		@@\
-MakeStringsDependency							@@\
-									@@\
-files: source depends							@@\
-	RemoveFiles(files)						@@\
-	RunProgram(MAKESTRS,options < source > dest)			@@\
-									@@\
-AllTarget(files)							@@\
-									@@\
-includes:: files							@@\
-									@@\
-depend:: files								@@\
-									@@\
-clean::									@@\
-	RemoveFiles(files)
-# endif
-#endif /* ToolkitMakeStrings */
-
-#ifdef LibName
-
-LIBNAME = LibName
-
-# if defined(LibTookitMakeStringsDependency) && LibTookitMakeStringsDependency
-/*
- * Do ToolkitMakeStrings() before BuildIncludes so makestrs is still
- * built first, even if the generated header will be installed.
- */
-MakeStringsDependency
-# endif
-
-LibraryObjectRule()
-
-# undef _LinkBuildLibrary
-# if !defined(LibInstall) || LibInstall
-#  define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)
-# else
-#  define _LinkBuildLibrary(lib) $(_NULLCMD_)
-# endif
-
-# if !defined(LibCreate) || LibCreate
-#  if DoSharedLib
-#   if HugeLibrary && defined(SharedLibraryTarget3)
-SharedLibraryTarget3($(LIBNAME),$(SoRev),$(OBJS1),$(OBJS2),$(OBJS3),.,.)
-#   else
-SharedLibraryTarget($(LIBNAME),$(SoRev),$(OBJS),.,.)
-#   endif
-#   if !defined(LibInstall) || LibInstall
-InstallSharedLibrary($(LIBNAME),$(SoRev),$(SHLIBDIR))
-#   endif
-#   if HasSharedData
-SharedLibraryDataTarget($(LIBNAME),$(SoRev),$(UNSHAREDOBJS))
-#    if !defined(LibInstall) || LibInstall
-InstallSharedLibraryData($(LIBNAME),$(SoRev),$(SHLIBDIR))
-#    endif
-#   endif
-#  endif
-#  if DoNormalLib
-#   if HugeLibrary
-#    if DoSharedLib && SeparateSharedCompile
-UnsharedLibraryTarget3($(LIBNAME),$(OBJS1),$(OBJS2),$(OBJS3),unshared,..)
-#    else
-NormalLibraryTarget3($(LIBNAME),$(OBJS1),$(OBJS2),$(OBJS3))
-#    endif
-#   else
-#    if DoSharedLib && SeparateSharedCompile
-UnsharedLibraryTarget($(LIBNAME),$(OBJS),unshared,..)
-#    else
-NormalLibraryTarget($(LIBNAME),$(OBJS))
-#    endif
-#   endif
-#   if !defined(LibInstall) || LibInstall
-InstallLibrary($(LIBNAME),$(USRLIBDIR))
-#   endif
-#  endif
-#  if DoProfileLib
-ProfiledLibraryTarget($(LIBNAME),$(OBJS))
-#   if !defined(LibInstall) || LibInstall
-InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
-#   endif
-#  endif
-#  if DoDebugLib
-DebuggedLibraryTarget($(LIBNAME),$(OBJS))
-#   if !defined(LibInstall) || LibInstall
-InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
-#   endif
-#  endif
-
-LintLibraryTarget($(LIBNAME),$(SRCS))
-#  if !defined(LibInstall) || LibInstall
-InstallLintLibrary($(LIBNAME),$(LINTLIBDIR))
-#  endif
-# else /* not LibCreate */
-#  if HugeLibrary
-AllTarget($(OBJS1))
-AllTarget($(OBJS2))
-AllTarget($(OBJS3))
-#  else
-AllTarget($(OBJS))
-#  endif
-# endif /* LibCreate */
-# ifdef IncSubdir
-#  ifdef IncSubSubdir
-BuildIncludes($(HEADERS),IncSubdir/IncSubSubdir,../..)
-InstallMultipleFlags($(HEADERS),$(INCDIR)/IncSubdir/IncSubSubdir,$(INSTINCFLAGS))
-#  else
-BuildIncludes($(HEADERS),IncSubdir,..)
-InstallMultipleFlags($(HEADERS),$(INCDIR)/IncSubdir,$(INSTINCFLAGS))
-#  endif
-# else
-#  ifndef CplusplusSource
-#   if !defined(LibHeaders) || LibHeaders
-BuildIncludesTop($(HEADERS))
-InstallMultipleFlags($(HEADERS),$(INCDIR),$(INSTINCFLAGS))
-#   endif
-#  endif
-# endif
-
-NormalLintTarget($(SRCS))
-#endif /* defined(LibName) */
--- a/Xvnc/config/cf/Mips.cf
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Set version numbers before making makefiles.
- * 
- * X11r5 only builds using the berkeley libraries and compiler.  Make
- * sure your path includes /bsd43/bin before /bin/ or /usr/bin.
- */
-
-#ifndef OSName
-#define OSName            RISCOS
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion    4
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion    50
-#endif
-
-XCOMM platform:  $XConsortium: Mips.cf /main/17 1996/09/28 16:06:25 rws $
-XCOMM operating system:  OSName
-
-/***************************************************************************
- *			 Platform-specific parameters                      *
- ***************************************************************************/
-
-#define HasVoidSignalReturn		NO
-#define SetTtyGroup			YES
-#define UnalignedReferencesAllowed	NO     /* if arbitrary deref okay */
-#define HasBsearch			NO
-
-#define MipsArchitecture
-#define MakeEnv -e
-
-#define DefaultCCOptions -signed -systype bsd43 -Olimit 2000 -Wf,-XNd8400,-XNp12000
-#define StandardDefines -DMips -DBSD43
-#define PostIncDir /usr/include/bsd43
-#define ExtraLibraries -lmld
-#define ArCmd ar clr
-#define BootstrapCFlags -DMips
-#define InstallCmd /etc/mipsinstall -f
-#define MakeCmd make MakeEnv
-#define DoRanlibCmd NO
-#define AllocateLocalDefines -DINCLUDE_ALLOCA_H
-
-/***************************************************************************
- *                                                                         *
- *			DEFINE PARAMETERS FOR BUILDING                     *
- *                                                                         *
- ***************************************************************************/
-
-#define XmipsServer	YES
-
-/***************************************************************************
- *                                                                         *
- *	      OVERRIDE ANY CONFIGURATION PARAMETERS FROM Imake.tmpl        *
- *                                                                         *
- ***************************************************************************/
-
-#define SpecialMalloc		NO
-
-#define PrimaryScreenResolution	110
-
-#define ConstructMFLAGS	NO		/* build MFLAGS from MAKEFLAGS */
-
-#define DefaultUserPath /usr/net:/bin:/usr/bin:$(BINDIR):/usr/ucb
-#define DefaultSystemPath /usr/net:/bin:/usr/bin:/etc:$(BINDIR):/usr/ucb
-
-/* mips manuals are really complicated.  This certainly won't work. */
-
-#define ManDirectoryRoot /man/cat
-#define ManSourcePath $(MANPATH)/man
-
-#define InstKmemFlags -g sys -m 2711
--- a/Xvnc/config/cf/Motif.rules
+++ /dev/null
@@ -1,709 +0,0 @@
-/* 
- *  @OSF_COPYRIGHT@
- *  COPYRIGHT NOTICE
- *  Copyright (c) 1990, 1991, 1992, 1993 Open Software Foundation, Inc.
- *  ALL RIGHTS RESERVED (MOTIF). See the file named COPYRIGHT.MOTIF for
- *  the full copyright text.
- *
- * (c) Copyright 1996 Digital Equipment Corporation.
- * (c) Copyright 1996 Hewlett-Packard Company.
- * (c) Copyright 1996 International Business Machines Corp.
- * (c) Copyright 1996 Sun Microsystems, Inc.
- * (c) Copyright 1996 Novell, Inc. 
- * (c) Copyright 1996 FUJITSU LIMITED.
- * (c) Copyright 1996 Hitachi.
- */ 
-XCOMM $TOG: Motif.rules /main/3 1997/03/24 09:10:35 mgreess $
-
-/* Note whether we are the top level project. */
-#ifndef SeenTopLevelProject
-# define SeenTopLevelProject	YES
-# define MotifIsTopLevelProject	YES
-#else
-# define MotifIsTopLevelProject	NO
-#endif
-
-/* Include the X11 project rules file. */
-#include <X11.rules>
-
-
-/* Use the in-tree Motif by default. */
-#ifndef UseInstalledMotif
-# define UseInstalledMotif	NO
-#endif
-#ifdef UseInstalled
-# undef UseInstalledMotif
-# define UseInstalledMotif	YES
-#endif
-
-#ifndef ImportMotif
-# ifdef UseImports
-#  define ImportMotif		YES
-# else
-#  define ImportMotif		NO
-# endif
-#endif
-#if UseInstalledMotif
-# undef ImportMotif
-# define ImportMotif		NO
-#endif
-
-#ifndef MSimpleProgramTarget
-#define MSimpleProgramTarget(program)                                   @@\
-AllTarget(program)                                                      @@\
-	                                                                @@\
-program: program.o $(DEPS) $(DEPLIBS)					@@\
-	RemoveTargetProgram($@)                                         @@\
-	$(CC) -o $@ program.o $(LDOPTIONS) $(DEPS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS)  @@\
-	                                                                @@\
-clean::                                                                 @@\
-	$(RM) program
-#endif
-
-#ifndef MSimpleUilTarget
-#define MSimpleUilTarget(program)                                       @@\
-MSimpleProgramTarget(program)						@@\
-									@@\
-InstallProgram(program,$(BINDIR))					@@\
-									@@\
-MSimpleUidTarget(program)
-#endif
-
-/*
- * UILFLAGS contains site/vendor-specific flags
- * defined by UilFlags, which supposed to be set in *.cf or
- * site.def files.
- * LOCAL_UILFLAGS(_n) contains client-specific uil flags set in Imakefile
- */
-
-#ifndef MSimpleUidTarget
-#define MSimpleUidTarget(program)                                       @@\
-AllTarget(program.uid)                                                  @@\
-	                                                                @@\
-program.uid: program.uil $(DEPUIL)                                      @@\
-	RemoveTargetProgram($@)                                         @@\
-	$(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS) -o $@ program.uil $(UIL_INCLUDES)	@@\
-	                                                                @@\
-InstallNonExecFile(program.uid,$(UIDDIR))                               @@\
-                                                                        @@\
-clean::                                                                 @@\
-	$(RM) program.uid
-#endif
-
-#ifndef MSimpleUidLocaleTarget
-#define MSimpleUidLocaleTarget(program,locale)                          @@\
-AllTarget(program.uid)                                                  @@\
-	                                                                @@\
-program.uid: program.uil $(DEPUIL)                                      @@\
-	RemoveTargetProgram($@)                                         @@\
-	$(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS) -o $@ program.uil $(UIL_INCLUDES)	@@\
-	                                                                @@\
-InstallNonExecFile(program.uid,$(LIBDIR)/locale/uid)                    @@\
-                                                                        @@\
-clean::                                                                 @@\
-	$(RM) program.uid
-#endif
-
-#ifndef MComplexUidTarget_1
-#define MComplexUidTarget_1(program)                                    @@\
-	                                                                @@\
-AllTarget(program.uid)                                                  @@\
-	                                                                @@\
-program.uid:  $(UILS1) $(DEPUIL)                                        @@\
-	RemoveTargetProgram($@)                                         @@\
-	$(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS_1) -o $@ program.uil $(UIL_INCLUDES)	@@\
-	                                                                @@\
-InstallNonExecFile(program.uid,$(UIDDIR))                               @@\
-                                                                        @@\
-clean::                                                                 @@\
-	$(RM) program.uid
-#endif
-
-#ifndef MComplexUidTarget_2
-#define MComplexUidTarget_2(program)                                    @@\
-	                                                                @@\
-AllTarget(program.uid)                                                  @@\
-	                                                                @@\
-program.uid:  $(UILS2) $(DEPUIL)                                        @@\
-	RemoveTargetProgram($@)                                         @@\
-	$(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS_2) -o $@ program.uil $(UIL_INCLUDES)	@@\
-	                                                                @@\
-InstallNonExecFile(program.uid,$(UIDDIR))                               @@\
-                                                                        @@\
-clean::                                                                 @@\
-	$(RM) program.uid
-#endif
-
-#ifndef MComplexUidTarget_3
-#define MComplexUidTarget_3(program)                                    @@\
-	                                                                @@\
-AllTarget(program.uid)                                                  @@\
-	                                                                @@\
-program.uid:  $(UILS3) $(DEPUIL)                                        @@\
-	RemoveTargetProgram($@)                                         @@\
-	$(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS_3) -o $@ program.uil $(UIL_INCLUDES)	@@\
-	                                                                @@\
-InstallNonExecFile(program.uid,$(UIDDIR))                               @@\
-                                                                        @@\
-clean::                                                                 @@\
-	$(RM) program.uid
-#endif
-
-#ifndef MComplexUidTarget_4
-#define MComplexUidTarget_4(program)                                    @@\
-	                                                                @@\
-AllTarget(program.uid)                                                  @@\
-	                                                                @@\
-program.uid:  $(UILS4) $(DEPUIL)                                        @@\
-	RemoveTargetProgram($@)                                         @@\
-	$(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS_4) -o $@ program.uil $(UIL_INCLUDES)	@@\
-	                                                                @@\
-InstallNonExecFile(program.uid,$(UIDDIR))                               @@\
-                                                                        @@\
-clean::                                                                 @@\
-	$(RM) program.uid
-#endif
-
-#ifndef MComplexUidTarget_5
-#define MComplexUidTarget_5(program)                                    @@\
-	                                                                @@\
-AllTarget(program.uid)                                                  @@\
-	                                                                @@\
-program.uid:  $(UILS5) $(DEPUIL)                                        @@\
-	RemoveTargetProgram($@)                                         @@\
-	$(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS_5) -o $@ program.uil $(UIL_INCLUDES)	@@\
-	                                                                @@\
-InstallNonExecFile(program.uid,$(UIDDIR))                               @@\
-                                                                        @@\
-clean::                                                                 @@\
-	$(RM) program.uid
-#endif
-
-#ifndef MComplexUidTarget_6
-#define MComplexUidTarget_6(program)                                    @@\
-	                                                                @@\
-AllTarget(program.uid)                                                  @@\
-	                                                                @@\
-program.uid:  $(UILS6) $(DEPUIL)                                        @@\
-	RemoveTargetProgram($@)                                         @@\
-	$(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS_6) -o $@ program.uil $(UIL_INCLUDES)	@@\
-	                                                                @@\
-InstallNonExecFile(program.uid,$(UIDDIR))                               @@\
-                                                                        @@\
-clean::                                                                 @@\
-	$(RM) program.uid
-#endif
-
-#ifndef MComplexUidTarget_7
-#define MComplexUidTarget_7(program)                                    @@\
-	                                                                @@\
-AllTarget(program.uid)                                                  @@\
-	                                                                @@\
-program.uid:  $(UILS7) $(DEPUIL)                                        @@\
-	RemoveTargetProgram($@)                                         @@\
-	$(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS_7) -o $@ program.uil $(UIL_INCLUDES)	@@\
-	                                                                @@\
-InstallNonExecFile(program.uid,$(UIDDIR))                               @@\
-                                                                        @@\
-clean::                                                                 @@\
-	$(RM) program.uid
-#endif
-
-#ifndef MComplexUidTarget_8
-#define MComplexUidTarget_8(program)                                    @@\
-	                                                                @@\
-AllTarget(program.uid)                                                  @@\
-	                                                                @@\
-program.uid:  $(UILS8) $(DEPUIL)                                        @@\
-	RemoveTargetProgram($@)                                         @@\
-	$(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS_8) -o $@ program.uil $(UIL_INCLUDES)	@@\
-	                                                                @@\
-InstallNonExecFile(program.uid,$(UIDDIR))                               @@\
-                                                                        @@\
-clean::                                                                 @@\
-	$(RM) program.uid
-#endif
-
-#ifndef MComplexUidTarget_9
-#define MComplexUidTarget_9(program)                                    @@\
-	                                                                @@\
-AllTarget(program.uid)                                                  @@\
-	                                                                @@\
-program.uid:  $(UILS9) $(DEPUIL)                                        @@\
-	RemoveTargetProgram($@)                                         @@\
-	$(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS_9) -o $@ program.uil $(UIL_INCLUDES)	@@\
-	                                                                @@\
-InstallNonExecFile(program.uid,$(UIDDIR))                               @@\
-                                                                        @@\
-clean::                                                                 @@\
-	$(RM) program.uid
-#endif
-
-#ifndef MComplexUidTarget_10
-#define MComplexUidTarget_10(program)                                   @@\
-	                                                                @@\
-AllTarget(program.uid)                                                  @@\
-	                                                                @@\
-program.uid:  $(UILS10) $(DEPUIL)                                       @@\
-	RemoveTargetProgram($@)                                         @@\
-	$(CLIENTENVSETUP) $(UIL) $(UILFLAGS) $(LOCAL_UILFLAGS_10) -o $@ program.uil $(UIL_INCLUDES)	@@\
-	                                                                @@\
-InstallNonExecFile(program.uid,$(UIDDIR))                               @@\
-                                                                        @@\
-clean::                                                                 @@\
-	$(RM) program.uid
-#endif
-
-#ifndef MComplexProgramTarget
-#define	MComplexProgramTarget(program,locallib,syslib)			@@\
-        PROGRAM = program						@@\
-									@@\
-AllTarget(program)							@@\
-									@@\
-program: $(OBJS) $(DEPLIBS)						@@\
-	RemoveTargetProgram($@)						@@\
-	$(CC) -o $@ $(LDOPTIONS) $(OBJS) locallib $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS)	@@\
-									@@\
-CenterProgramTarget(program,$(SRCS),$(OBJS),locallib,syslib)		@@\
-									@@\
-InstallProgram(program,$(BINDIR))					@@\
-									@@\
-install.man::								@@\
-	@echo To install documentation for $(PROGRAM), consult the Release Notes	@@\
-	@echo and/or README file in the current directory.		@@\
-DependTarget()								@@\
-LintTarget()								@@\
-									@@\
-clean::									@@\
-	$(RM) $(PROGRAM)
-#endif
-
-#ifndef MComplexProgramTarget_1
-#define	MComplexProgramTarget_1(program,locallib,syslib)		@@\
-            OBJS = $(OBJS1) $(OBJS2) $(OBJS3)				@@\
-            SRCS = $(SRCS1) $(SRCS2) $(SRCS3)				@@\
-									@@\
-AllTarget($(PROGRAMS))							@@\
-									@@\
-program: $(OBJS1) $(DEPLIBS1)						@@\
-	RemoveTargetProgram($@)						@@\
-	$(CC) -o $@ $(LDOPTIONS) $(OBJS1) locallib $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS)	@@\
-									@@\
-CenterProgramTarget(program,$(SRCS1),$(OBJS1),locallib,syslib)		@@\
-									@@\
-InstallProgram(program,$(BINDIR))					@@\
-									@@\
-install.man::								@@\
-	@echo To install documentation for $(PROGRAMS), consult the Release Notes	@@\
-	@echo and/or README file in the current directory.		@@\
-DependTarget()								@@\
-LintTarget()								@@\
-									@@\
-clean::									@@\
-	$(RM) $(PROGRAMS)
-#endif
-
-#ifndef MComplexProgramTarget_2
-#define	MComplexProgramTarget_2(program,locallib,syslib)		@@\
-program: $(OBJS2) $(DEPLIBS2)						@@\
-	RemoveTargetProgram($@)						@@\
-	$(CC) -o $@ $(LDOPTIONS) $(OBJS2) locallib $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS)	@@\
-									@@\
-CenterProgramTarget(program,$(SRCS2),$(OBJS2),locallib,syslib)		@@\
-									@@\
-InstallProgram(program,$(BINDIR))
-#endif
-
-#ifndef MComplexProgramTarget_3
-#define	MComplexProgramTarget_3(program,locallib,syslib)		@@\
-        PROGRAM_3 = program					@@\
-program: $(OBJS3) $(DEPLIBS3)						@@\
-	RemoveTargetProgram($@)						@@\
-	$(CC) -o $@ $(LDOPTIONS) $(OBJS3) locallib $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS)	@@\
-									@@\
-CenterProgramTarget(program,$(SRCS3),$(OBJS3),locallib,syslib)		@@\
-									@@\
-InstallProgram(program,$(BINDIR))
-#endif
-
-#ifndef MComplexProgramTarget_4
-#define	MComplexProgramTarget_4(program,locallib,syslib)		@@\
-        PROGRAM_4 = program					@@\
-program: $(OBJS4) $(DEPLIBS4)						@@\
-	RemoveTargetProgram($@)						@@\
-	$(CC) -o $@ $(LDOPTIONS) $(OBJS4) locallib $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS)	@@\
-									@@\
-CenterProgramTarget(program,$(SRCS4),$(OBJS4),locallib,syslib)		@@\
-									@@\
-InstallProgram(program,$(BINDIR))
-#endif
-
-#ifndef MComplexProgramTarget_5
-#define	MComplexProgramTarget_5(program,locallib,syslib)		@@\
-        PROGRAM_5 = program					@@\
-program: $(OBJS5) $(DEPLIBS5)						@@\
-	RemoveTargetProgram($@)						@@\
-	$(CC) -o $@ $(LDOPTIONS) $(OBJS5) locallib $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS)	@@\
-									@@\
-CenterProgramTarget(program,$(SRCS5),$(OBJS5),locallib,syslib)		@@\
-									@@\
-InstallProgram(program,$(BINDIR))
-#endif
-
-#ifndef MComplexProgramTarget_6
-#define	MComplexProgramTarget_6(program,locallib,syslib)		@@\
-        PROGRAM_6 = program					@@\
-program: $(OBJS6) $(DEPLIBS6)						@@\
-	RemoveTargetProgram($@)						@@\
-	$(CC) -o $@ $(LDOPTIONS) $(OBJS6) locallib $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS)	@@\
-									@@\
-CenterProgramTarget(program,$(SRCS6),$(OBJS6),locallib,syslib)		@@\
-									@@\
-InstallProgram(program,$(BINDIR))
-#endif
-
-#ifndef MComplexProgramTarget_7
-#define	MComplexProgramTarget_7(program,locallib,syslib)		@@\
-        PROGRAM_7 = program					@@\
-program: $(OBJS7) $(DEPLIBS7)						@@\
-	RemoveTargetProgram($@)						@@\
-	$(CC) -o $@ $(LDOPTIONS) $(OBJS7) locallib $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS)	@@\
-									@@\
-CenterProgramTarget(program,$(SRCS7),$(OBJS7),locallib,syslib)		@@\
-									@@\
-InstallProgram(program,$(BINDIR))
-#endif
-
-#ifndef MComplexProgramTarget_8
-#define	MComplexProgramTarget_8(program,locallib,syslib)		@@\
-        PROGRAM_8 = program					@@\
-program: $(OBJS8) $(DEPLIBS8)						@@\
-	RemoveTargetProgram($@)						@@\
-	$(CC) -o $@ $(LDOPTIONS) $(OBJS8) locallib $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS)	@@\
-									@@\
-CenterProgramTarget(program,$(SRCS8),$(OBJS8),locallib,syslib)		@@\
-									@@\
-InstallProgram(program,$(BINDIR))
-#endif
-
-#ifndef MComplexProgramTarget_9
-#define	MComplexProgramTarget_9(program,locallib,syslib)		@@\
-        PROGRAM_9 = program					@@\
-program: $(OBJS9) $(DEPLIBS9)						@@\
-	RemoveTargetProgram($@)						@@\
-	$(CC) -o $@ $(LDOPTIONS) $(OBJS9) locallib $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS)	@@\
-									@@\
-CenterProgramTarget(program,$(SRCS9),$(OBJS9),locallib,syslib)		@@\
-									@@\
-InstallProgram(program,$(BINDIR))
-#endif
-
-#ifdef AUTOMATION
-#ifndef TestPPTarget
-#define TestPPTarget(root)						@@\
-all:: root.Scr root.Dat							@@\
-									@@\
-root.Dat: root.dat							@@\
-	$(RM) root.Dat							@@\
-	$(COMMONPP) $(DEFINES) root.dat					@@\
-root.Scr: root.scr							@@\
-	$(RM) root.Scr							@@\
-	$(COMMONPP) $(DEFINES) root.scr
-#endif 
-#else
-#ifndef TestPPTarget
-#define TestPPTarget(root)                                              @@\
-all:: root.Dat                                                          @@\
-                                                                        @@\
-root.Dat: root.dat                                                      @@\
-	$(RM) root.Dat                                                  @@\
-	$(COMMONPP) $(DEFINES) root.dat
-#endif
-#endif
-
-#ifdef AUTOMATION
-#ifndef TestPPTargetScr
-#define TestPPTargetScr(root)                                           @@\
-all:: root.Scr                                                          @@\
-                                                                        @@\
-root.Scr: root.scr							@@\
-	$(RM) root.Scr							@@\
-	$(COMMONPP) $(DEFINES) root.scr
-#endif
-#else
-#ifndef TestPPTargetScr
-#define TestPPTargetScr(root)  /**/
-#endif
-#endif
-
-#ifdef AUTOMATION
-#ifndef TestPPTargetDat
-#define TestPPTargetDat(root)                                              @@\
-all:: root.Dat                                                          @@\
-                                                                        @@\
-root.Dat: root.dat                                                      @@\
-	$(RM) root.Dat                                                  @@\
-	$(COMMONPP) $(DEFINES) root.dat
-#endif
-#endif
-#ifndef AUTOMATION
-#ifndef TestPPTargetDat
-#define TestPPTargetDat(root)                                              @@\
-all:: root.Dat                                                          @@\
-                                                                        @@\
-root.Dat: root.dat                                                      @@\
-	$(RM) root.Dat                                                  @@\
-	$(COMMONPP) $(DEFINES) root.dat
-#endif
-#endif
-
-
-#ifndef NO_AUTOMATION
-#ifndef RunTarget
-#define RunTarget()							@@\
-all::	RUN								@@\
-									@@\
-RUN:	always								@@\
-	$(GENRUN) $(CURRENT_DIR) $(MTOP) $(DEFINES)			@@\
-									@@\
-always: 								@@\
-	$(RM) RUN
-#endif
-#else
-#ifdef UseVista
-#ifndef RunTarget
-#define RunTarget()							@@\
-all::	RUN								@@\
-									@@\
-RUN:	always								@@\
-	$(MANRUN) $(CURRENT_DIR) $(MTOP) $(DEFINES)			@@\
-									@@\
-always: 								@@\
-	$(RM) RUN
-#endif
-#else
-#ifdef UsePurify
-#ifndef RunTarget
-#define RunTarget()							@@\
-all::	RUN								@@\
-									@@\
-RUN:	always								@@\
-	$(MANRUN) $(CURRENT_DIR) $(MTOP) $(DEFINES)			@@\
-									@@\
-always: 								@@\
-	$(RM) RUN
-#endif
-#else
-#ifndef RunTarget
-#define RunTarget()							@@\
-all::	RUN								@@\
-									@@\
-RUN:	always								@@\
-									@@\
-always: 								@@\
-
-#endif
-#endif
-#endif
-#endif
-#ifdef UseVista
-#ifndef VistaMapRule
-#define VistaMapRule(targetmap,depend)					@@\
-all:: targetmap								@@\
-									@@\
-targetmap: depend 							@@\
-	$(RM) $(MTOP)/tests/Vista/targetmap				@@\
-	CATCMD *.M > $(MTOP)/tests/Vista/targetmap
-#endif
-#ifndef ComplexVistaMapRule
-#define ComplexVistaMapRule(program,filelist)				@@\
-all::	program.M							@@\
-									@@\
-program.M: filelist							@@\
-	$(RM) program.vista.tmpfile					@@\
-	touch program.vista.tmpfile					@@\
-	@case '${MFLAGS}' in *[ik]*) set +e;; esac;			@@\
-	@for i in filelist; do \					@@\
-		cat `basename $$i .o`.M >> program.vista.tmpfile ; done	@@\
-	$(RM) program.M							@@\
-	$(MV) program.vista.tmpfile program.M				@@\
-									@@\
-clean::									@@\
-	$(RM) *.M
-#endif
-
-#endif
-
-/*  Rule for making shadow trees.	*/
-#ifndef MakeShadowTree
-#define MakeShadowTree(name,dirs)			@@\
-all::							@@\
-	@case '${MFLAGS}' in *[ik]*) set +e;; esac;	@@\
-	MakeDir(name)					@@\
-	@for i in dirs; \				@@\
-        do if [ -d $$i/name ]; then \			@@\
-        exit 0; else set -x; mkdir $$i/name; fi \	@@\
-	done						@@\
-	@for i in dirs; \				@@\
-	do if [ -r name/$$i ]; then \			@@\
-		set +x; \				@@\
-		else (set -x; $(LN) ../$$i/name  name/$$i); fi \@@\
-	done
-#endif
-
-#ifdef BuildPlusPlus
-
-/* Rules for C++ */
-
-/*
- * "CPlusPlusObjectCompile" - compile fragment for a normal C++ object file
-*/
-#ifndef CPlusPlusObjectCompile
-#define CPlusPlusObjectCompile(options) $(RM) $@                       @@\
-	$(CPLUSPLUSCOM) -c $(CPLUSPLUSFLAGS) options $*.cxx
-#endif
-
-#ifndef CPlusPlusObjectRule
-#define CPlusPlusObjectRule()						@@\
-.cxx.o:									@@\
-	CPlusPlusObjectCompile($(_NOOP_))
-#endif /* CPlusPlusObjectRule */
-
-#ifndef MCPlusPlusSimpleProgramTarget
-#define MCPlusPlusSimpleProgramTarget(program)                          @@\
-AllTarget(program)                                                      @@\
-	                                                                @@\
-program: program.o $(DEPS) $(DEPLIBS)					@@\
-	RemoveTargetProgram($@)                                         @@\
-	$(CPLUSPLUSLINKCOM) -o $@ program.o $(LDOPTIONS) $(DEPS) $(LOCAL_LIBRARIES) $(CPLUSPLUSLIBS) $(LDLIBS) $(EXTRA_LOAD_FLAGS)  @@\
-	                                                                @@\
-clean::                                                                 @@\
-	$(RM) program
-#endif
-
-#ifndef MCPlusPlusComplexProgramTarget
-#define	MCPlusPlusComplexProgramTarget(program,locallib,syslib)		@@\
-        PROGRAM = program						@@\
-									@@\
-AllTarget(program)							@@\
-									@@\
-program: $(OBJS) $(DEPLIBS)						@@\
-	RemoveTargetProgram($@)						@@\
-	$(CPLUSPLUSLINKCOM) -o $@ $(LDOPTIONS) $(OBJS) locallib $(CPLUSPLUSLIBS) $(LDLIBS) syslib $(EXTRA_LOAD_FLAGS)	@@\
-									@@\
-CenterProgramTarget(program,$(SRCS),$(OBJS),locallib,syslib)		@@\
-									@@\
-InstallProgram(program,$(BINDIR))					@@\
-									@@\
-install.man::								@@\
-	@echo To install documentation for $(PROGRAM), consult the Release Notes	@@\
-	@echo and/or README file in the current directory.		@@\
-DependTarget()								@@\
-LintTarget()								@@\
-									@@\
-clean::									@@\
-	$(RM) $(PROGRAM)
-#endif
-
-#endif /* BuildPlusPlus */
-
-/* Rules for message catalog building */
-#ifndef Real_MessageCatalogRule
-#define Real_MessageCatalogRule(prefix)					@@\
-prefix.cat Concat(prefix,MsgCatI.h):					@@\
-	$(RM) Concat(prefix,MsgCatI.h) prefix.cat $(MLOCSRC)/C/msg/prefix.msg	@@\
-	$(MKCATTOOL) Concat(prefix,MsgCatI.h) prefix.msg > $(MLOCSRC)/C/msg/prefix.msg	@@\
-	$(GENCAT) prefix.cat $(MLOCSRC)/C/msg/prefix.msg		@@\
-									@@\
-includes:: prefix.cat Concat(prefix,MsgCatI.h)				@@\
-									@@\
-depend:: prefix.cat Concat(prefix,MsgCatI.h)				@@\
-									@@\
-all:: prefix.cat							@@\
-									@@\
-clean::									@@\
-	$(RM) prefix.cat Concat(prefix,MsgCatI.h)
-#endif
-#define Stub_MessageCatalogRule(prefix)	/**/
-
-
-/* The X BuildLibDir is now an import, not an export. */
-#if UseImports || ImportX11
-# ifndef XBuildLibDir
-#  define XBuildLibDir $(TOP)/imports/x11/lib
-# endif
-#endif
-
-
-/* Search the Motif ProjectRoot too if it is different. */
-#ifdef MotifProjectRoot
-# define MUsrLibDirPath	Concat(XUsrLibDirPath,:$(MPROJECTROOT)/lib)
-#else
-# define MUsrLibDirPath	XUsrLibDirPath
-#endif
-#ifdef UsrLibDirPath
-# undef UsrLibDirPath
-#endif
-#define UsrLibDirPath	MUsrLibDirPath
-
-#if ImportMotif
-# define MLdPreLibs	-L$(MLIBSRC)
-#elif defined(UseInstalledMotif) && defined(MotifProjectRoot)
-# define MLdPreLibs	-L$(MPROJECTROOT)/lib
-#else
-# define MLdPreLibs	/**/
-#endif
-#ifdef LdPreLibs
-# undef LdPreLibs
-#endif
-#define LdPreLibs	LdPreLib MLdPreLibs XLdPreLibs
-
-#ifdef LdPostLibs
-# undef LdPostLibs
-#endif
-#ifdef MotifProjectRoot
-# define MLdPostLibs	-L$(MPROJECTROOT)/lib
-#else
-# define MLdPostLibs	/**/
-#endif
-#define LdPostLibs	LdPostLib MLdPostLibs XLdPostLibs
-
-#ifdef TopIncludes
-# undef TopIncludes
-#endif
-#define TopIncludes	TopInclude $(TOP_MOTIF_INCLUDES) $(TOP_X_INCLUDES)
-
-#if UseInstalledMotif && defined(MotifProjectRoot)
-# define MotifBuildLibPath	$(MPROJECTROOT)/lib
-#elif UseInstalledMotif
-# define MotifBuildLibPath	$(USRLIBDIR)
-#elif ImportMotif
-# define MotifBuildLibPath	$(MLIBSRC)
-#else
-# define MotifBuildLibPath	$(TOP)/exports/lib
-#endif
-#ifdef BuildLibPath
-# undef BuildLibPath
-#endif
-#ifdef SystemBuildLibPath
-# define BuildLibPath	$(MOTIFENVLIBDIR):$(XENVLIBDIR):$(SYSTEMENVLIBDIR)
-#else
-# define BuildLibPath	$(MOTIFENVLIBDIR):$(XENVLIBDIR)
-#endif
-
-#ifndef MotifProjectDefines
-# define MotifProjectDefines	MotifDefines MessageCatalogDefines
-#endif
-#ifdef ProjectDefines
-# undef ProjectDefines
-#endif
-#define ProjectDefines	X11ProjectDefines MotifProjectDefines
-
-#ifndef MotifCplusplusProjectDefines
-# define MotifCplusplusProjectDefines	MotifProjectDefines
-#endif
-#ifdef CplusplusProjectDefines
-# undef CplusplusProjectDefines
-#endif
-#define CplusplusProjectDefines	\
-	X11CplusplusProjectDefines MotifCplusplusProjectDefines
--- a/Xvnc/config/cf/Motif.tmpl
+++ /dev/null
@@ -1,568 +0,0 @@
-/* 
- *  @OSF_COPYRIGHT@
- *  COPYRIGHT NOTICE
- *  Copyright (c) 1990, 1991, 1992, 1993 Open Software Foundation, Inc.
- *  ALL RIGHTS RESERVED (MOTIF). See the file named COPYRIGHT.MOTIF for
- *  the full copyright text.
- *
- * (c) Copyright 1996 Digital Equipment Corporation.
- * (c) Copyright 1996 Hewlett-Packard Company.
- * (c) Copyright 1996 International Business Machines Corp.
- * (c) Copyright 1996 Sun Microsystems, Inc.
- * (c) Copyright 1996 Novell, Inc. 
- * (c) Copyright 1996 FUJITSU LIMITED.
- * (c) Copyright 1996 Hitachi.
- */ 
-XCOMM $XConsortium: Motif.tmpl /main/2 1996/12/04 10:12:55 swick $
-
-/* Include the X11 project template file. */
-#include <X11.tmpl>
-
-#ifdef AUTOMATION
-# ifndef Automation
-#  define Automation 	YES
-# endif
-#else
-# define NO_AUTOMATION
-#endif
-
-#ifdef USE_VISTACC
-# ifndef UseVista
-#  define UseVista
-# endif
-# ifndef CATCMD
-#  define CATCMD cat
-# endif
-#endif
-
-#ifdef USE_PURIFY
-# ifndef UsePurify
-#  define UsePurify
-# endif
-#endif
-
-#ifdef DEBUG_GEOMETRY
-# ifndef DebugGeometry
-#  define DebugGeometry YES
-# endif
-#endif
-
-
-#ifndef _MUse
-# if UseInstalledMotif
-#  define _MUse(a,b) a
-# else
-#  define _MUse(a,b) b
-# endif
-#endif
-
-#ifndef _MUseCat
-# if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp)
-#  if UseInstalledMotif
-#   define _MUseCat(a,b,c) a##c
-#  else
-#   define _MUseCat(a,b,c) b##c
-#  endif
-# else
-#  if UseInstalledMotif
-#   define _MUseCat(a,b,c) a/**/c
-#  else
-#   define _MUseCat(a,b,c) b/**/c
-#  endif
-# endif
-#endif
-
-#ifndef MTop
-# if ImportMotif
-#  define MTop $(TOP)/imports/motif
-# else
-#  define MTop $(TOP)
-# endif
-#endif
-
-#ifndef BuildDocDir
-# define BuildDocDir $(BUILDINCROOT)/doc
-#endif
-#ifndef BuildLocDir
-# define BuildLocDir $(BUILDINCROOT)/localized
-#endif
-
-#ifndef MotifDefines
-# define MotifDefines /**/
-#endif
-
-#ifndef XmDefines
-# define XmDefines  /**/
-#endif
-
-/* To compile without SHAPE extension, set this to -DNO_SHAPE */
-#ifndef MwmDefines
-# define MwmDefines /**/
-#endif
-
-#ifndef UilFlags
-# define UilFlags /**/
-#endif
-
-#ifndef TestDefines
-# define TestDefines /**/
-#endif
-
-#ifndef AutoDefines
-# if Automation
-#  define AutoDefines -DAUTOMATION
-# else
-#  define AutoDefines /**/
-# endif
-#endif
-
-#ifndef AutoIncludes
-# if Automation
-#  define AutoIncludes -I$(AUTOSCRIPTSRC)
-# else
-#  define AutoIncludes /**/
-# endif
-#endif
-
-#ifdef UsePurify
-# define PurifyFilesToClean *.pure_linkinfo *.pure_hardlink
-#else
-# define PurifyFilesToClean
-#endif
-#if Automation
-# define TestExtraFilesToClean *.Dat *.Scr PurifyFilesToClean
-#else 
-# define TestExtraFilesToClean *.Dat PurifyFilesToClean
-#endif 
-
-#ifndef UsrIncDir
-# define UsrIncDir IncRoot
-#endif
-
-/* Place to install .uid files */
-#ifndef UidDir
-# define UidDir $(LIBDIR)/uid
-#endif
-
-#ifndef XmExtraLibraries
-# define XmExtraLibraries /**/
-#endif
-
-#ifndef YaccFlags
-# define YaccFlags /**/
-#endif
-
-#define MotifSharedRev		2.1
-
-#ifndef SharedLibXm
-# define SharedLibXm		HasSharedLibraries
-#endif
-#ifndef NormalLibXm
-# define NormalLibXm		(!SharedLibXm | ForceNormalLib)
-#endif
-#ifndef DebugLibXm
-# define DebugLibXm		NO
-#endif
-#ifndef ProfileLibXm
-# define ProfileLibXm		NO
-#endif
-#ifndef SharedXmRev
-# define SharedXmRev		MotifSharedRev
-#endif
-
-#ifndef SharedLibMrm
-# define SharedLibMrm		HasSharedLibraries
-#endif
-#ifndef NormalLibMrm
-# define NormalLibMrm		(!SharedLibMrm | ForceNormalLib)
-#endif
-#ifndef DebugLibMrm
-# define DebugLibMrm		NO
-#endif
-#ifndef ProfileLibMrm
-# define ProfileLibMrm		NO
-#endif
-#ifndef SharedMrmRev
-# define SharedMrmRev		MotifSharedRev
-#endif
-
-#ifndef SharedLibUil
-# define SharedLibUil		HasSharedLibraries
-#endif
-#ifndef NormalLibUil
-# define NormalLibUil		(!SharedLibUil | ForceNormalLib)
-#endif
-#ifndef DebugLibUil
-# define DebugLibUil		NO
-#endif
-#ifndef ProfileLibUil
-# define ProfileLibUil		NO
-#endif
-#ifndef SharedUilRev
-# define SharedUilRev		MotifSharedRev
-#endif
-
-#ifndef SharedLibACommon
-# define SharedLibACommon	HasSharedLibraries
-#endif
-#ifndef NormalLibACommon
-# define NormalLibACommon	(!SharedLibACommon | ForceNormalLib)
-#endif
-#ifndef DebugLibACommon
-# define DebugLibACommon	NO
-#endif
-#ifndef ProfileLibACommon
-# define ProfileLibACommon	NO
-#endif
-#ifndef SharedACommonRev
-# define SharedACommonRev	MotifSharedRev
-#endif
-
-#ifndef SharedLibScript
-# define SharedLibScript	HasSharedLibraries
-#endif
-#ifndef NormalLibScript
-# define NormalLibScript	(!SharedLibScript | ForceNormalLib)
-#endif
-#ifndef DebugLibScript
-# define DebugLibScript		NO
-#endif
-#ifndef ProfileLibScript
-# define ProfileLibScript	NO
-#endif
-#ifndef SharedScriptRev
-# define SharedScriptRev	MotifSharedRev
-#endif
-
-#ifndef SharedLibUtil
-# define SharedLibUtil		HasSharedLibraries
-#endif
-#ifndef NormalLibUtil
-# define NormalLibUtil		(!SharedLibUtil | ForceNormalLib)
-#endif
-#ifndef DebugLibUtil
-# define DebugLibUtil		NO
-#endif
-#ifndef ProfileLibUtil
-# define ProfileLibUtil		NO
-#endif
-#ifndef SharedUtilRev
-# define SharedUtilRev		MotifSharedRev
-#endif
-
-#ifndef SharedLibCreate
-# define SharedLibCreate	HasSharedLibraries
-#endif
-#ifndef NormalLibCreate
-# define NormalLibCreate	(!SharedLibCreate | ForceNormalLib)
-#endif
-#ifndef DebugLibCreate
-# define DebugLibCreate		NO
-#endif
-#ifndef ProfileLibCreate
-# define ProfileLibCreate	NO
-#endif
-#ifndef SharedCreateRev
-# define SharedCreateRev	MotifSharedRev
-#endif
-
-#ifndef SharedLibVisual
-# define SharedLibVisual	HasSharedLibraries
-#endif
-#ifndef NormalLibVisual
-# define NormalLibVisual	(!SharedLibVisual | ForceNormalLib)
-#endif
-#ifndef DebugLibVisual
-# define DebugLibVisual		NO
-#endif
-#ifndef ProfileLibVisual
-# define ProfileLibVisual	NO
-#endif
-#ifndef SharedVisualRev
-# define SharedVisualRev	MotifSharedRev
-#endif
-
-#ifndef SharedLibSynth
-# define SharedLibSynth		HasSharedLibraries
-#endif
-#ifndef NormalLibSynth
-# define NormalLibSynth		(!SharedLibSynth | ForceNormalLib)
-#endif
-#ifndef DebugLibSynth
-# define DebugLibSynth		NO
-#endif
-#ifndef ProfileLibSynth
-# define ProfileLibSynth	NO
-#endif
-#ifndef SharedSynthRev
-# define SharedSynthRev		MotifSharedRev
-#endif
-
-#ifndef SharedLibMCommon
-# define SharedLibMCommon	HasSharedLibraries
-#endif
-#ifndef NormalLibMCommon
-# define NormalLibMCommon	(!SharedLibMCommon | ForceNormalLib)
-#endif
-#ifndef DebugLibMCommon
-# define DebugLibMCommon	NO
-#endif
-#ifndef ProfileLibMCommon
-# define ProfileLibMCommon	NO
-#endif
-#ifndef SharedMCommonRev
-# define SharedMCommonRev	MotifSharedRev
-#endif
-
-#ifndef XmClientLibs
-# define XmClientLibs $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(XMEXTRA_LIBS)
-#endif
-#ifndef XmClientDepLibs
-# define XmClientDepLibs $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB)
-#endif
-
-#ifndef MrmClientLibs 
-# define MrmClientLibs $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(XMEXTRA_LIBS)
-#endif
-#ifndef MrmClientDepLibs
-# define MrmClientDepLibs $(DEPMRESOURCELIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB)
-#endif
-
-#ifndef UilClientLibs
-# define UilClientLibs $(UILLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(XMEXTRA_LIBS)
-#endif
-#ifndef UilClientDepLibs
-# define UilClientDepLibs $(DEPUILLIB) $(DEPMRESOURCELIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB)
-#endif
-
-#ifndef TestClientLibs
-# define TestClientLibs $(PURIFYLIBS) $(TESTCOMLIB) \
-		$(AUTOSCRIPTLIB) $(AUTOUTILLIB) \
-		$(AUTOCREATELIB) $(AUTOVISUALLIB) $(AUTOSYNTHLIB) \
-	$(XMLIB) $(TESTGEOLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) \
-	$(AUTOEXTRALIBS) $(XMEXTRA_LIBS)
-#endif
-#ifndef TestUilClientLibs
-# define TestUilClientLibs $(PURIFYLIBS) $(TESTUILCOMLIB) $(TESTCOMLIB) \
-		$(AUTOSCRIPTLIB) $(AUTOUTILLIB) \
-		$(AUTOCREATELIB) $(AUTOVISUALLIB) $(AUTOSYNTHLIB) \
-	$(UILLIB) $(MRESOURCELIB) $(XMLIB) $(TESTGEOLIB) \
-	$(XTOOLLIB) $(XPLIB) $(XLIB) $(AUTOEXTRALIBS) $(XMEXTRA_LIBS)
-#endif
-#ifndef TestClientDepLibs
-# define TestClientDepLibs XmClientDepLibs
-#endif
-#ifndef TestUilClientDepLibs
-# define TestUilClientDepLibs UilClientDepLibs
-#endif
-
-
-              MTOP = MTop
-TOP_MOTIF_INCLUDES = -I$(MINCLUDESRC)
-#if defined(UseInstalled) || (UseInstalledMotif && UseInstalledX11)
-      UIL_INCLUDES = -I$(USRINCDIR)/uil
-#else
-      UIL_INCLUDES = -I$(UILSRC)
-#endif
-#ifdef BuildLibPathVar
-    MOTIFENVLIBDIR = MotifBuildLibPath
-#endif
-
-/* Message catalog usage */
-#ifndef GencatCmd
-# define GencatCmd		gencat
-#endif
-#ifndef GencatFlags
-# define GencatFlags		/**/
-#endif
-#if defined(NoMessageCatalog)
-# define BuildMessageCatalog	NO
-# define MessageCatalogDefines	-DNO_MESSAGE_CATALOG
-#else
-# define BuildMessageCatalog	YES 
-# define MessageCatalogDefines	/**/
-#endif
-#ifndef MessageCatalogRule
-# if BuildMessageCatalog
-#  define MessageCatalogRule(prefix)	Real_MessageCatalogRule(prefix)
-# else
-#  define MessageCatalogRule(prefix)	Stub_MessageCatalogRule(prefix)
-# endif
-#endif
-
-      USRINCDIR = UsrIncDir
-         UIDDIR = UidDir
-        TESTSRC = $(MTOP)/tests
-        TESTLIB = $(TESTSRC)/lib
-  GENERALSRCLIB = $(TESTSRC)/General/lib
-  GENERALSRCBIN = $(TESTSRC)/General/bin
-   MANUALSRCLIB = $(TESTSRC)/Manual/lib
-   MANUALSRCBIN = $(TESTSRC)/Manual/bin
-     AUTOSRCLIB = $(TESTSRC)/Auto/lib
-     AUTOSRCBIN = $(TESTSRC)/Auto/bin
-       COMMONPP = $(GENERALSRCBIN)/Commonpp
-         GENRUN = $(GENERALSRCBIN)/Genrun
-         MANRUN = $(GENERALSRCBIN)/Manrun
-#ifdef DebugLib
-  TESTMALLOCSRC = $(GENERALSRCLIB)/Malloc
-#endif
-#ifdef DebugGeometry
-     TESTGEOSRC = $(TESTLIB)/Geometry
-#endif
-#ifdef Automation
-     TESTCOMSRC = $(AUTOSRCLIB)/Common
-  AUTOSCRIPTSRC = $(AUTOSRCLIB)/Script
-   AUTOSYNTHSRC = $(AUTOSRCLIB)/Synth
-  AUTOCREATESRC = $(AUTOSRCLIB)/Create
-  AUTOVISUALSRC = $(AUTOSRCLIB)/Visual
-    AUTOUTILSRC = $(AUTOSRCLIB)/Util
-  AUTOEXTRALIBS = -ll -ly -lm
-#else
-     TESTCOMSRC = $(MANUALSRCLIB)/Common
-#endif
-
-    BUILDDOCDIR = BuildDocDir
-    BUILDLOCDIR = BuildLocDir
-
-/* MTOOLKITSRC  should be removed */
-    MTOOLKITSRC = $(TOOLKITSRC)
-#if ImportMotif || UseInstalledMotif
-    MINCLUDESRC = $(MTOP)/include
-        MDOCSRC = $(MTOP)/doc
-        MLOCSRC = $(MTOP)/localized
-#else
-    MINCLUDESRC = $(MTOP)/exports/include
-        MLOCSRC = $(MTOP)/exports/localized
-#endif
-        MLIBSRC = $(MTOP)/lib
-     MCLIENTSRC = $(MTOP)/clients
-       MDEMOSRC = $(MTOP)/demos
-     MWIDGETSRC = $(MLIBSRC)/Xm
-   MRESOURCESRC = $(MLIBSRC)/Mrm
-         UILSRC = $(MCLIENTSRC)/uil
-#ifdef MotifProjectRoot
-   MPROJECTROOT = MotifProjectRoot
-#endif
-
-            UIL = _MUse(uil,$(UILSRC)/uil)
-         DEPUIL = _MUseCat($(BINDIR),$(UILSRC),/uil)
-
-   XMEXTRA_LIBS = XmExtraLibraries
-
-/* These libraries use UseInstalledMotif instead of UseInstalled. */
-#undef _Use
-#undef _UseCat
-#define _Use    _MUse
-#define _UseCat _MUseCat
-
-#ifndef MBuildLibDir
-# define MBuildLibDir	BuildLibDir
-#endif
-
-#if SharedLibXm
-SharedLibReferences(XM,Xm,$(MWIDGETSRC),SOXMREV,SharedXmRev)
-#else
-ProjectUnsharedLibReferences(XM,Xm,$(MWIDGETSRC),MBuildLibDir)
-#endif
-
-#if SharedLibMrm
-SharedLibReferences(MRESOURCE,Mrm,$(MRESOURCESRC),SOMRMREV,SharedMrmRev)
-#else
-ProjectUnsharedLibReferences(MRESOURCE,Mrm,$(MRESOURCESRC),MBuildLibDir)
-#endif
-
-#if SharedLibUil
-SharedLibReferences(UIL,Uil,$(UILSRC),SOUILREV,SharedUilRev)
-#else
-ProjectUnsharedLibReferences(UIL,Uil,$(UILSRC),MBuildLibDir)
-#endif
-
-#ifdef DebugGeometry
-ProjectUnsharedLibReferences(TESTGEO,XtGeo,$(TESTGEOSRC),MBuildLibDir)
-#endif
-
-#if Automation
-
-# if SharedLibACommon
-SharedLibReferences(TESTCOM,ACommon,$(TESTCOMSRC),SOACOMMONREV,SharedACommonRev)
-# else
-ProjectUnsharedLibReferences(TESTCOM,ACommon,$(TESTCOMSRC),MBuildLibDir)
-# endif
-
-TESTUILCOMLIB = $(TESTCOMSRC)/libACommonUil.a
-
-# if SharedLibScript
-SharedLibReferences(AUTOSCRIPT,Script,$(AUTOSCRIPTSRC),SOSCRIPTREV,SharedScriptRev)
-# else
-ProjectUnsharedLibReferences(AUTOSCRIPT,Script,$(AUTOSCRIPTSRC),MBuildLibDir)
-# endif
-
-# if SharedLibSynth
-SharedLibReferences(AUTOSYNTH,Synth,$(AUTOSYNTHSRC),SOSYNTHREV,SharedSynthRev)
-# else
-ProjectUnsharedLibReferences(AUTOSYNTH,Synth,$(AUTOSYNTHSRC),MBuildLibDir)
-# endif
-
-# if SharedLibCreate
-SharedLibReferences(AUTOCREATE,Create,$(AUTOCREATESRC),SOCREATEREV,SharedCreateRev)
-# else
-ProjectUnsharedLibReferences(AUTOCREATE,Create,$(AUTOCREATESRC),MBuildLibDir)
-# endif
-
-# if SharedLibVisual
-SharedLibReferences(AUTOVISUAL,Visual,$(AUTOVISUALSRC),SOVISUALREV,SharedVisualRev)
-# else
-ProjectUnsharedLibReferences(AUTOVISUAL,Visual,$(AUTOVISUALSRC),MBuildLibDir)
-# endif
-
-# if SharedLibUtil
-SharedLibReferences(AUTOUTIL,Util,$(AUTOUTILSRC),SOUTILREV,SharedUtilRev)
-# else
-ProjectUnsharedLibReferences(AUTOUTIL,Util,$(AUTOUTILSRC),MBuildLibDir)
-# endif
-
-#else   /* Manual */
-
-# if SharedLibMCommon
-SharedLibReferences(TESTCOM,MCommon,$(TESTCOMSRC),SOMCOMMONREV,SharedMCommonRev)
-# else
-ProjectUnsharedLibReferences(TESTCOM,MCommon,$(TESTCOMSRC),MBuildLibDir)
-# endif
-TESTUILCOMLIB = $(TESTCOMSRC)/libMCommonUil.a
-
-#endif  /* Automation */
-
-
-/* Revert to the normal library rules. */
-#undef _Use
-#undef _UseCat
-#define _Use    _XUse
-#define _UseCat _XUseCat
-
-
-#ifdef UsePurify
-     PURIFYLIBS = $(PURIFYHOME)/purify_stubs.a
-#endif
-  LINTMRESOURCE = $(MRESOURCESRC)/libMrm.a
-LINTXMWIDGETLIB = $(MWIDGETSRC)/llib-l/Xm.ln
-     LINTXMTOOL = $(MTOOLKITSRC)/llib-lXt.ln
-     LINTUILLIB = $(UILSRC)/llib-lUil.ln
-
-      YACCFLAGS = YaccFlags
-       UILFLAGS = UilFlags
-    GENCATFLAGS = GencatFlags
-         GENCAT = GencatCmd $(GENCATFLAGS)
-      MKCATTOOL = $(MLOCSRC)/util/mkcatdefs
-
-         RM_CMD = $(RM) FilesToClean ExtraFilesToClean TestExtraFilesToClean
-
-#if NeedDefaultDepLibs
-# if HasSharedLibraries || defined(UseInstalled)
-        DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB)
-# else
-        DEPLIBS = $(LOCAL_LIBRARIES)
-# endif
-        DEPLIBS1 = $(DEPLIBS)
-        DEPLIBS2 = $(DEPLIBS)
-        DEPLIBS3 = $(DEPLIBS)
-#endif /* NeedDefaultDepLibs */
--- a/Xvnc/config/cf/NetBSD.cf
+++ /dev/null
@@ -1,377 +0,0 @@
-XCOMM platform:  $XConsortium: NetBSD.cf /main/16 1996/10/31 14:47:14 kaleb $
-
-
-
-XCOMM platform:  $XFree86: xc/config/cf/NetBSD.cf,v 3.49.2.9 1997/07/26 06:30:39 dawes Exp $
-
-
-#ifndef OSName
-#define OSName			DefaultOSName OSBinaryType
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion		DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion		DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion		DefaultOSTeenyVersion
-#endif
-
-
-#ifndef OSVendor
-#define	OSVendor	/**/
-#endif
-XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-
-/*
- * C library features
- */
-#if ((OSMajorVersion > 1) || \
-     (OSMajorVersion == 1 && OSMinorVersion > 2) || \
-     (OSMajorVersion == 1 && OSMinorVersion == 2 && OSTeenyVersion > 1))
-#  define HasPoll			YES
-#endif
-#define HasNdbm         	YES
-#define HasPutenv       	YES
-#define HasSnprintf		YES
-#define HasBSD44Sockets 	YES
-#define Malloc0ReturnsNull	NO
-#define SetTtyGroup     	YES
-#define DBMLibrary		/**/
-#ifndef HasLibCrypt
-# define HasLibCrypt		YES
-#endif
-#ifndef HasShm
-# if OSMajorVersion == 0 && OSMinorVersion == 9 && OSTeenyVersion == 2
-/*
- * Shm memory was removed in 0.9B because it was encumbered.
- * A free version was added in 0.9C
- */
-#  define HasShm          	NO
-# else
-#  define HasShm          	YES
-# endif
-#endif
-#define HasWChar32		YES
-/*
- * There's a bug in NetBSD 1.0, 1.1 and 1.2 dlsym()
- */
-#if ((OSMajorVersion == 1 && OSMinorVersion < 2) || \
-     (OSMajorVersion == 1 && OSMinorVersion == 2 && OSTeenyVersion < 2))
-#  define HasDlsymBug		YES
-#endif
-/* Mkstemp is there since 1.2 (at least) */
-#if (!(OSMajorVersion == 0 || \
-       (OSMajorVersion == 1 && OSMinorVersion < 2))) 
-#define HasMkstemp		YES
-#endif
-/*
- * Compiler Features
- */
-#undef HasGcc
-#define HasGcc			YES
-#define HasGcc2			YES
-#ifndef HasGcc2ForCplusplus
-#define HasGcc2ForCplusplus	YES
-#endif
-#define GccUsesGas		YES
-#define UseGas			YES
-#define GnuCpp			YES
-
-#define NeedConstPrototypes	YES
-#define NeedFunctionPrototypes	YES
-#define NeedNestedPrototypes	YES
-#define NeedVarargsPrototypes	YES
-#define NeedWidePrototypes	NO
-
-#define MkdirHierCmd		mkdir -p
-
-#define CppCmd          	/usr/libexec/cpp
-#define StandardCppDefines	-traditional
-#define PreProcessCmd   	CppCmd
-#define PreIncDir		/usr/include
-
-#undef CcCmd
-#define CcCmd 			gcc
-#if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit)
-#define DefaultCCOptions 	/**/
-#else
-#define DefaultCCOptions 	-ansi -Dasm=__asm
-#endif
-
-#define GccGasOption 		-DGCCUSESGAS
-#define AsmDefines 		-DUSE_GAS
-
-/* UseElfFormat defaults to YES if __ELF__ set */
-#ifndef UseElfFormat
-# ifdef __ELF__
-#  undef __ELF__			/* other imake files shouldn't care */
-#  define UseElfFormat YES
-# else
-#  define UseElfFormat NO
-# endif
-#endif
-
-/*
- * Dynamic loading supported starting in 1.0 on a.out platforms,
- * and on all ELF platforms.
- *
- * XXX May not be correct on NetBSD/pmax (ELF, but might not have
- * working shared libs).
- */
-#if ((OSMajorVersion > 0) && \
-     !defined(AlphaArchitecture) && !defined(MipsArchitecture)) || \
-    UseElfFormat
-# ifndef BuildDynamicLoading
-# define BuildDynamicLoading	YES
-# endif
-#endif
-
-#if UseElfFormat
-#define DlLibrary		-rdynamic /* no -ldl yet */
-#else
-#define DlLibrary		/**/
-#endif
-
-#ifdef i386Architecture
-# define OptimizedCDebugFlags 	DefaultGcc2i386Opt
-# if OSMajorVersion < 1
-#  define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
-# else
-#  define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
-# endif
-# if OSMajorVersion == 1 && OSMinorVersion >= 1 || OSMajorVersion >= 2
-#  define ServerExtraSysLibs	-li386 DlLibrary
-# endif
-#else
-# define OptimizedCDebugFlags 	-O2
-# if defined(SparcArchitecture) || defined(AlphaArchitecture)
-#  define ServerOSDefines 	-DDDXOSINIT
-# else
-#  define ServerOSDefines 	/**/
-# endif
-# if BuildDynamicLoading
-#  define ServerExtraSysLibs	DlLibrary
-# else
-#  define ServerExtraSysLibs	/**/
-# endif
-#endif
-#ifdef i386Architecture
-# define ServerExtraDefines GccGasOption XFree86ServerDefines
-# ifndef XFree86ConsoleDefines
-#  define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT
-# endif
-#else
-# if defined(AlphaArchitecture)
-#  define ServerExtraDefines GccGasOption -D_XSERVER64
-# else
-#  define ServerExtraDefines GccGasOption
-# endif
-#endif
-
-#define StandardDefines	-DCSRG_BASED
-#define XawI18nDefines	-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-
-#ifndef ExtraLibraries
-#define ExtraLibraries		/**/
-#endif
-#ifndef UseGnuMalloc
-#  define UseGnuMalloc		YES
-#endif
-#ifndef GnuMallocLibrary
-#define GnuMallocLibrary	-lgnumalloc
-#endif
-
-#if ((OSMajorVersion > 1) || \
-     (OSMajorVersion == 1 && OSMinorVersion > 2) || \
-     (OSMajorVersion == 1 && OSMinorVersion == 2 && OSTeenyVersion > 1))
-#ifndef HasZlib
-#define HasZlib			  YES
-#endif
-#endif 
-
-#define	AdmDir			/var/log
-
-/*
- * Make & install Features
- */
-#define HasBsdMake		YES
-#define StripInstalledPrograms	YES
-#define CompressAllFonts	YES
-#define GzipFontCompression	YES
-#define DefaultUserPath		/bin:/usr/bin:/usr/local/bin:$(BINDIR)
-#define DefaultSystemPath	/sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
-
-#ifdef  InstallCmd
-# undef  InstallCmd
-# define InstallCmd 		/usr/bin/install
-#endif
-
-#ifndef ExtraFilesToClean
-# define ExtraFilesToClean 	*.core
-#endif
-
-/*
- * Documentation formatting
- */
-#define NeqnCmd			neqn -Tlatin1
-#define NroffCmd		nroff -Tlatin1
-#define	EqnCmd 			eqn -Tps
-#define TroffCmd        	groff -Tps
-
-/*
- * To use the NetBSD Aperture driver
- */
-#if defined(i386Architecture)
-#ifndef HasNetBSDApertureDriver
-#define HasNetBSDApertureDriver	YES
-#endif
-#endif
-
-/*
- * ForceSubdirs - force make to build subdirectories
- * 
- * For BSD 4.4 make 
- */
-#define ForceSubdirs(dirs)						@@\
-dirs:	.EXEC								@@\
-	@cd $@ ; echo "making all in $(CURRENT_DIR)/$@..."; \		@@\
-	$(MAKE) $(MFLAGS) PassCDebugFlags all				@@\
-									@@\
-.EXEC:
-
-XCOMM Man pages need to be formatted when installed, so override the default
-XCOMM imake rules.
-
-#define ManSuffix	1
-#define FileManSuffix	5
-#define ManSourcePath	$(MANPATH)/cat
-
-#define InstallManPageLong(file,destdir,dest)                           @@\
-all:: file.0								@@\
-									@@\
-file.0:: file.man							@@\
-	@if [ -f file.man ]; \						@@\
-	then \								@@\
-	cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \	@@\
-	cp /tmp/$$$$.man file.0; \					@@\
-	$(RM) /tmp/$$$$.man; \						@@\
-	fi 								@@\
-									@@\
-install.man::                                                           @@\
-	MakeDir($(DESTDIR)destdir)					@@\
-	-@if [ -f file.0 ]; \						@@\
-	then \								@@\
-	$(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\
-	fi
-
-#define InstallGenManPageLong(file,destdir,dest,suffix)			@@\
-	InstallManPageLong(file,destdir,dest)
-
-#define InstallMultipleManSuffix(list,dest,suff)                        @@\
-install.man:: 								@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	case '${MFLAGS}' in *[i]*) set +e;; esac; \			@@\
-	for i in list; do \                                             @@\
-	  (set -x; \							@@\
-	  cat $$i.suff | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.suff; \	@@\
-	  $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$$$.suff $(DESTDIR)dest/$$i.0; \	@@\
-	  $(RM) /tmp/$$$$.suff); \						@@\
-	done
-
-#define InstallMultipleMan(list,dest)                                   @@\
-	InstallMultipleManSuffix(list,dest,man)
-
-#define InstallManPageAliases(file,destdir,aliases)                     @@\
-install.man:: 								@@\
-	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
-	for i in aliases; do \                                          @@\
-		(set -x; \						@@\
-		$(RM) $(DESTDIR)destdir/$$i.0;\  			@@\
-		(cd $(DESTDIR)/destdir; $(LN) file.0 $$i.0);\ 		@@\
-		); \							@@\
-	done
-
-#define InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
-	InstallManPageAliases(file,destdir,aliases)
-
-/*
- * Shared libraries supported starting in 1.0 on a.out platforms,
- * and on all ELF platforms.
- *
- * XXX May not be correct on NetBSD/pmax (ELF, but might not have
- * working shared libs).
- */
-#if ((OSMajorVersion > 0) && \
-     !defined(AlphaArchitecture) && !defined(MipsArchitecture)) || \
-    UseElfFormat
-# ifndef HasSharedLibraries
-# define HasSharedLibraries	YES
-# endif
-#endif
-
-#ifndef OSBinaryType
-#if UseElfFormat
-#define OSBinaryType	[ELF]
-#else
-#define OSBinaryType	/**/
-#endif
-#endif
-
-#ifndef HasSharedLibraries
-#define HasSharedLibraries	NO
-#endif 
-
-#if HasSharedLibraries
-#include <bsdLib.rules>
-#endif /* HasSharedLibraries */
-
-#ifdef i386Architecture
-# include <xfree86.cf>
-#endif
-
-/*
- * Definitions for the SUN server on NetBSD/sparc
- */
-#ifdef SparcArchitecture
-#ifndef Xsun24Server
-#define Xsun24Server	NO
-#endif
-#ifndef XsunServer
-#define XsunServer	YES
-#endif
-#ifndef XsunMonoServer
-#define XsunMonoServer	YES
-#endif
-#ifndef BuildScreenSaverLibrary
-#define BuildScreenSaverLibrary	YES
-#endif
-/*
- * XFree86 uses its own (more portable) database routines to speed up 
- * the RGB database lookups
- * However, if you want to use ndbm anyway, you can set that to NO in 
- * site.def
- */
-#ifndef UseRgbTxt
-#define UseRgbTxt	YES
-#endif
-#endif
-
-/*
- * Definition for compiling on MIPS machines
- */
-#ifdef MipsArchitecture
-#define PositionIndependentCFlags
-#define SharedLibraryLoadFlags -x -shared --whole-archive -soname `echo $@ |
-sed 's/\.[0-9]*$$//'`
-#define SharedXtReqs $(XLIBONLY) $(SMLIB) $(ICELIB)
-#define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XONLYLIB) $(EXTENSIONLIB)
-#endif
-
-/*
- * Definition for compiling on Alpha machines
- */
-#ifdef AlphaArchitecture
-#define	BuildServer	NO
-#endif
--- a/Xvnc/config/cf/Oki.cf
+++ /dev/null
@@ -1,30 +0,0 @@
-XCOMM platform:  $XConsortium: Oki.cf /main/16 1996/09/28 16:06:53 rws $
-
-#ifndef OSName
-#define OSName			Unix System V/860 Release 4.0 Version 3
-#endif
-XCOMM operating system:  OSName
-#ifndef OSMajorVersion
-#define OSMajorVersion		4
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion		0
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion		3
-#endif
-
-#define BootstrapCFlags		-DOki
-#define SystemV4		YES
-#define HasLdRunPath		YES
-#define ConnectionFlags		-DTCPCONN -DUNIXCONN -DLOCALCONN
-#define SetTtyGroup		YES
-#define HasPutenv		YES
-#define HasPoll                 YES
-#define PatheticCpp		YES
-#define CcCmd			/usr/bin/cc
-#define StandardDefines -DSVR4 -Di860
-#define DefaultCCOptions	-Xa
-#define BuildServer             NO
-#define ToolkitStringsABIOptions -intelabi
-#include <sv4Lib.rules>
--- a/Xvnc/config/cf/OpenBSD.cf
+++ /dev/null
@@ -1,482 +0,0 @@
-XCOMM platform:  $XFree86: xc/config/cf/OpenBSD.cf,v 3.1.2.11 1998/02/15 16:08:33 hohndel Exp $
-XCOMM $OpenBSD: OpenBSD.cf,v 1.11 1997/12/09 03:03:48 gene Exp $
-
-#ifndef OSName
-#define OSName			DefaultOSName OSBinaryType
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion		DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion		DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion		DefaultOSTeenyVersion
-#endif
-
-#ifndef OSVendor
-#define	OSVendor	/**/
-#endif
-XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-
-/*
- * C library features
- */
-#define HasPoll			YES
-#define HasNdbm         	YES
-#define HasPutenv       	YES
-#define HasSnprintf		YES
-#define HasBSD44Sockets 	YES
-#define Malloc0ReturnsNull	NO
-#define SetTtyGroup     	YES
-#define DBMLibrary		/**/
-#define HasLibCrypt		NO
-#define HasShm          	YES
-#define HasWChar32		YES
-#define HasMkstemp		YES
-
-/*
- * Compiler Features
- */
-#undef HasGcc
-#define HasGcc			YES
-#define HasGcc2			YES
-#ifndef HasGcc2ForCplusplus
-#define HasGcc2ForCplusplus	YES
-#endif
-#define GccUsesGas		YES
-#define UseGas			YES
-#define GnuCpp			YES
-
-
-#define NeedConstPrototypes	YES
-#define NeedFunctionPrototypes	YES
-#define NeedNestedPrototypes	YES
-#define NeedVarargsPrototypes	YES
-#define NeedWidePrototypes	NO
-
-#define MkdirHierCmd		mkdir -p
-
-#define CppCmd          	/usr/libexec/cpp
-#define StandardCppDefines	-traditional
-#define PreProcessCmd   	CppCmd
-#define PreIncDir 		DefaultGccIncludeDir
-
-#undef CcCmd
-#define CcCmd 			gcc
-#if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit)
-#define DefaultCCOptions 	/**/
-#else
-#define DefaultCCOptions 	-ansi -Dasm=__asm
-#endif
-
-#define GccGasOption 		-DGCCUSESGAS
-#define AsmDefines 		-DUSE_GAS
-
-
-#ifdef i386Architecture
-# define OptimizedCDebugFlags 	DefaultGcc2i386Opt
-# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
-# define ServerExtraSysLibs	-li386
-#else
-# define OptimizedCDebugFlags 	-O2
-# if defined(SparcArchitecture) || defined(AlphaArchitecture) || defined(AmigaArchitecture) || defined(Sun3Architecture)
-#  define ServerOSDefines 	-DDDXOSINIT
-# else
-#  define ServerOSDefines 	/**/
-# endif
-#endif
-#if defined(i386Architecture) || defined(ArcArchitecture)
-# define ServerExtraDefines GccGasOption XFree86ServerDefines
-# ifndef XFree86ConsoleDefines
-#  if defined(ArcArchitecture)
-#   define XFree86ConsoleDefines -DPCCONS_SUPPORT
-#  else
-#   define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT
-#  endif
-# endif
-#else
-# if defined(AlphaArchitecture)
-#  define ServerExtraDefines GccGasOption -D_XSERVER64
-# else
-#  if !defined(Sun3Architecture)
-#   define ServerExtraDefines GccGasOption
-#  endif
-# endif
-#endif
-
-#define StandardDefines	-DCSRG_BASED
-#define XawI18nDefines	-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-
-
-#ifndef ExtraLibraries
-#define ExtraLibraries		/**/
-#endif
-#define UseGnuMalloc		NO
-
-#define HasZlib			YES
-
-#define	AdmDir			/var/log
-
-/*
- * Make & install Features
- */
-
-#define HasBsdMake		YES
-
-#define StripInstalledPrograms	YES
-#define CompressAllFonts	YES
-#define GzipFontCompression	YES
-#define DefaultUserPath		/bin:/usr/bin:/usr/local/bin:$(BINDIR)
-#define DefaultSystemPath	/sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
-
-#ifdef  InstallCmd
-# undef  InstallCmd
-# define InstallCmd 		/usr/bin/install
-#endif
-
-#ifndef ExtraFilesToClean
-# define ExtraFilesToClean 	*.core
-#endif
-
-/*
- * Documentation formatting
- */
-#define NeqnCmd			neqn -Tlatin1
-#define NroffCmd		nroff -Tlatin1
-#define	EqnCmd 			eqn -Tps
-#define TroffCmd        	groff -Tps
-
-/*
- * To use the NetBSD Aperture driver
- */
-#if defined(i386Architecture)
-#ifndef HasNetBSDApertureDriver
-#define HasNetBSDApertureDriver	YES
-#endif
-#endif
-
-
-
-XCOMM Man pages need to be formatted when installed, so override the default
-XCOMM imake rules.
-
-#define ManSuffix	1
-#define FileManSuffix	5
-#define ManSourcePath	$(MANPATH)/cat
-
-#define InstallManPageLong(file,destdir,dest)                           @@\
-all:: file.0								@@\
-									@@\
-file.0:: file.man							@@\
-	@if [ -f file.man ]; \						@@\
-	then \								@@\
-	cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \	@@\
-	cp /tmp/$$$$.man file.0; \					@@\
-	$(RM) /tmp/$$$$.man; \						@@\
-	fi 								@@\
-									@@\
-install.man::                                                           @@\
-	MakeDir($(DESTDIR)destdir)					@@\
-	-@if [ -f file.0 ]; \						@@\
-	then \								@@\
-	$(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\
-	fi
-
-#define InstallGenManPageLong(file,destdir,dest,suffix)			@@\
-	InstallManPageLong(file,destdir,dest)
-
-#define InstallMultipleManSuffix(list,dest,suff)                        @@\
-install.man:: 								@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	case '${MFLAGS}' in *[i]*) set +e;; esac; \			@@\
-	for i in list; do \                                             @@\
-	  (set -x; \							@@\
-	  cat $$i.suff | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.suff; \	@@\
-	  $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$$$.suff $(DESTDIR)dest/$$i.0; \	@@\
-	  $(RM) /tmp/$$$$.suff); \						@@\
-	done
-
-#define InstallMultipleMan(list,dest)                                   @@\
-	InstallMultipleManSuffix(list,dest,man)
-
-#define InstallManPageAliases(file,destdir,aliases)                     @@\
-install.man:: 								@@\
-	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
-	for i in aliases; do \                                          @@\
-		(set -x; \						@@\
-		$(RM) $(DESTDIR)destdir/$$i.0;\  			@@\
-		(cd $(DESTDIR)/destdir; $(LN) file.0 $$i.0);\ 		@@\
-		); \							@@\
-	done
-
-#define InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
-	InstallManPageAliases(file,destdir,aliases)
-
-
-
-/*
- * Architecture specific sections - put all architecture dependent
- * options and setting here into the correct section
- */
-
-/*
- * Definitions for the alpha architecture
- */
-#ifdef AlphaArchitecture
-
-# define XF86Contrib
-# include <xf86.rules>
-# define BuildServer		NO
-# define XnestServer		NO
-# define XVirtualFramebufferServer	NO
-
- /*
-  * For the current ECOFF system
-  */
-# define HasSharedLibraries	NO
-# define UseElfFormat		NO
-# define BuildDynamicLoading	NO
- /*
-  * For the upcoming ELF system
-  */
-# if 0 /* NOT YET */
-#  define HasSharedLibraries	YES
-#  define UseElfFormat		YES
-#  define BuildDynamicLoading	YES
-# endif
-
-#endif /* AlphaArchitecture */
-
-
-/*
- * Definitions for the i386 architecture
- */
-#ifdef i386Architecture
-
-/*
- * For safety reasons, don't install the X server setuid on OpenBSD
- * use xdm instead
- */
-# define InstallXserverSetUID	NO
-
-# define BuildDynamicLoading	YES
-# include <xfree86.cf>
-
-#endif /* i386Architecture */
-
-
-/*
- * Definitions for the m68k architecture (currently amiga, hp300,
- * mac68k, mvme68k, sun3)
- */
-#ifdef Mc68020Architecture
-
-/*
- * Function CSE makes gas -k not recognize external function calls as lazily
- * resolvable symbols, thus sometimes making ld.so report undefined symbol
- * errors on symbols found in shared library members that would never be 
- * called.  Ask niklas@openbsd.org for details.
- */
-# define PositionIndependentCFlags -fpic -fno-function-cse
-
-#endif /* Mc68020Architecture */
-
-
-/*
- * Definitions for the amiga architecture
- */
-#ifdef AmigaArchitecture
-
-# define XF86Contrib
-# include <xf86.rules>
-# define BuildServer		NO
-
-#endif /* AmigaArchitecture */
-
-
-/*
- * Definitions for the hp300 architecture
- */
-#ifdef Hp300Architecture
-
-# include <xf86.rules>
-# define BuildServer		NO
-
-#endif /* Hp300Architecture */
-
-
-/*
- * Definitions for the mac68k architecture
- */
-#ifdef mac68kArchitecture
-
-# include <xf86.rules>
-# define BuildServer		NO
-
-#endif /* Mac68kArchitecture */
-
-
-/*
- * Definitions for the mvme68k architecture
- */
-#ifdef Mvme68kArchitecture
-
-# include <xf86.rules>
-# define BuildServer		NO
-
-#endif /* Mvme68kArchitecture */
-
-
-/*
- * Definitions for the sun3 architecture
- */
-#ifdef Sun3Architecture
-
-# include <xf86.rules>
-
-# define OptimizedCDebugFlags  -O2
-# define ServerOSDefines       -DDDXOSINIT
-# define BootstrapCFlags       -Dsun3
-# define UnalignedReferencesAllowed YES /* changes _XtCopyArgs() */
-/* Note: -ansi turns off -Dmc68000 */
-# define ServerExtraDefines    GccGasOption -Dmc68000 -Dmc68020
-
-# ifndef Xsun24Server
-#  define Xsun24Server		NO
-# endif
-# ifndef XsunServer
-#  define XsunServer		NO
-# endif
-# ifndef XsunMonoServer
-#  define XsunMonoServer	YES
-# endif
-
-# ifndef BuildXKB
-#  define BuildXKB        	NO
-# endif
-
-# ifndef BuildXKBlib
-#  define BuildXKBlib     	NO
-# endif
-
-# ifndef BuildPexExt
-#  define BuildPexExt 		(XsunServer || Xsun24Server)
-# endif
-
-#endif /* Sun3Architecture */
-
-
-/*
- * Definitions for the mips architecture (currently arc, pmax)
- */
-#ifdef MipsArchitecture
-
- /*
-  * Mips ELF shared libs need some special handling.
-  */
-# define PositionIndependentCFlags
-# define SharedLibraryLoadFlags -x -shared --whole-archive -soname `echo $@ | sed 's/\.[0-9]*$$//'`
-# define SharedXtReqs -L$(BUILDLIBDIR) $(XLIBONLY) $(SMLIB) $(ICELIB)
-# define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XONLYLIB) $(EXTENSIONLIB)
-
-#endif /* MipsArchitecture */
-
-
-/*
- * Definitions for the arc architecture
- */
-#ifdef ArcArchitecture
-
-# include <xfree86.cf>
-
-#endif /* ArcArchitecture */
-
-
-/*
- * Definitions for the pmax architecture
- */
-#ifdef PmaxArchitecture
-
-# include <xf86.rules>
-# define BuildServer		NO
-
-#endif /* PmaxArchitecture */
-
-
-/*
- * Definitions for the sparc architecture
- */
-#ifdef SparcArchitecture
-
-# include <xf86.rules>
-
-# ifndef Xsun24Server
-# define Xsun24Server	YES
-# endif
-# ifndef XsunServer
-# define XsunServer	YES
-# endif
-# ifndef XsunMonoServer
-# define XsunMonoServer	YES
-# endif
-
-#define XkbServerDefines  -DXKB_ALWAYS_USES_SOFT_REPEAT
-
-# ifndef BuildPexExt
-#  define BuildPexExt 	(XsunServer || Xsun24Server)
-# endif
-#endif /* SparcArchitecture */
-
-
-/* End or architecture specific section */
-
-/*
- * Generic settings for all architectures
- */
-
-#ifndef XVirtualFramebufferServer
-# undef BuildServer
-# define BuildServer			YES
-# define XVirtualFramebufferServer	YES
-#endif
-
-#ifndef XnestServer
-# undef BuildServer
-# define BuildServer			YES
-# define XnestServer			YES
-#endif
-
-#ifndef BuildScreenSaverLibrary
-# define BuildScreenSaverLibrary	YES
-#endif
-
-#ifndef ForceNormalLib
-# define ForceNormalLib			YES
-#endif
-
-#ifndef BuildDynamicLoading
-# define BuildDynamicLoading		NO
-#endif
-
-/*
- * XFree86 uses its own (more portable) database routines to speed up 
- * the RGB database lookups
- * However, if you want to use ndbm anyway, you can set that to NO in 
- * site.def
- */
-#ifndef UseRgbTxt
-# define UseRgbTxt			YES
-#endif
-
-#ifndef OSBinaryType
-# if UseElfFormat
-#  define OSBinaryType			[ELF]
-# else 
-#  define OSBinaryType			/**/
-# endif
-#endif
-
-/* This must come last */
-#include <bsdLib.rules>
-
--- a/Xvnc/config/cf/README
+++ /dev/null
@@ -1,681 +0,0 @@
-$TOG: README /main/66 1997/05/20 10:05:36 kaleb $
-
-
-
-
-$XFree86: xc/config/cf/README,v 1.1.1.9.2.3 1998/01/23 12:35:07 dawes Exp $
-
-The easiest way to write an Imakefile is to find another one that does
-something similar and copy/modify it!
-
-To change any of these variables, edit the site.def file.
-
-Imake.tmpl provides defaults for the following variables:
-
-	AlternateIncRoot	compiler needs -I to find project includes
-	AlternateUsrLibDir	linker needs -L to find project libraries
-	ArCmd			command used to create libraries
-	ArCmdBase		program name part of ArCmd
-	ArAddCmd		flags to have ArCmdBase add files to a library
-	ArExtCmd		flags to have ArCmdBase extract files
-	AsCmd			command used to run assembler
-	BootstrapCFlags		missing cpp symbols needed to get started
-	BourneShell		command used to run Bourne Shell
-	CCsuf			suffix that C++ source files have
-	CURDIR			current directory relative to top of sources
-	CcCmd			command to run C compiler
-	CompressCmd		command to run compress program
-	GzipCmd			command to run gzip program
-	ConstructMFLAGS		System V option to set MFLAGS make variable
-	CpCmd			command to copy one file to another
-	CplusplusCmd		command to run C++ compiler
-	CplusplusFilt		command to run C++ name demangler
-	CplusplusYaccCmd	command to produce C++ source from yacc source
-	CppCmd			command to run C preprocessor
-	CrossCompiling		cross compiling? (not fully supported)
-	DebuggableCDebugFlags	C compiler -I's and -D's to turn on debug info
-	DefaultCCOptions	default special C compiler options
-	DefaultCDebugFlags	debug/optimize flags for programs
-	DefaultUsrBin		program directory used even if PATH not set
-	DependFlags		extra makedepend flags
-	DoRanlibCmd		boolean for system uses ranlib
-	EqnCmd			command used for eqn
-	ExecableScripts		boolean for systems that can exec() #!/bin/sh
-	ExpandManNames		boolean to expand man pages names to long form
-	ExtraFilesToClean	extra files to remove on make clean
-	ExtraLibraries		system-specific libraries need to link
-	ExtraLoadFlags		system-specific loader flags
-	FileManSuffix		man suffix for file format pages
-	FilesToClean		files to delete in make clean
-	FortranCmd		command to run Fortran compiler
-	FortranDebugFlags	flags for Fortran debug info
-	FortranFlags		Fortran compiler flags
-	HasBSD44Sockets		boolean for system has BSD4.4 sockets
-	HasBsdMake		use the 4.4BSD variant of the make program?
-	HasBsearch		boolean for libc has bsearch()
-	HasBrokenCCForLink	boolean for brain damaged cc driver
-	HasCenterLineC		boolean for system has CenterLine C compiler
-	HasCenterLineCplusplus	boolean for system has CenterLine C++ compiler
-	HasClearmake		use Clearcase's clearmake make program?
-	HasCodeCenter		boolean for system has CodeCenter
-	HasCplusplus		system has a C++ compiler?
-	HasDECnet		system has DECnet?
-	HasFortran		boolean for system has Fortran compiler
-	HasGcc			boolean for system has GNU gcc compiler
-	HasGcc2			boolean for system has GNU gcc 2.x compiler
-	HasGcc2ForCplusplus	use gcc 2 for C++ programs?
-	HasGnuMake		use the GNU make program?
-	HasKrb5			system has Kerberos version 5 support?
-	HasLargeTmp		boolean for system has /tmp space
-	HasLatex		system has LaTeX document preparation software
-	HasLibCrypt		boolean for system has libcrypt
-	HasNdbm			boolean for system has ndbm routines
-	HasPoll			use poll() syscall?
-	HasPurify		boolean for system has Purify
-	HasPutenv		boolean for libc has putenv()
-	HasSecureRPC		boolean for Sun Secure RPC
-	HasSetUserContext	boolean for setusercontext()
-	HasSentinel		boolean for system has Sentinel available
-	HasSharedLibraries	boolean for system has shared libraries
-	HasShm			boolean for System V shared memory
-	HasSockets		boolean for system has BSD sockets
-	HasStrcasecmp		boolean for system implements str[n]casecmp
-	HasStreams		use STREAMS I/O interface?
-	HasSymLinks		boolean for system has symbolic links
-	HasTestCenter		boolean for system has TestCenter
-	HasVarDirectory		boolean for system has /var
-	HasVFork		boolean for system has vfork()
-	HasVoidSignalReturn	boolean for POSIX signal() procs
-	HasZlib			boolean for system has libz
-	IncRoot			parent of X11 include directory
-	InstBinFlags		install flags for binaries
-	InstDatFlags		install flags for data files
-	InstIncFlags		install flags for header files
-	InstKmemFlags		install flags for xload to get at /dev/kmem
-	InstLibFlags		install flags for libraries
-	InstManFlags		install flags for manual pages
-	InstPgmFlags		install flags for normal programs
-	InstUidFlags		install flags for xterm to chown /dev/ptys
-	InstallCmd		command to install files
-	Krb5Includes		where to include Kerberos header files from
-	Krb5Libraries		where to load Kerberos libraries from
-	LdCmd			command to run loader
-	LdCombineFlags		flags for incremental loading
-	LexCmd			command to run lex
-	LexLib			library for programs using lex output
-	LintCmd			command to run lint
-	LintLibFlag		flags to generate lint libraries
-	LintOpts		lint options to control strictness
-	LnCmd			command to link two files
-	LoaderLibPrefix		loader flags before libraries
-	LocalRulesFile		site-specific file with additional imake rules
-	LocalTmplFile		file with additional imake variables
-	MacroFile		name of machine-dependent config params file
-	MacroIncludeFile	<MacroFile>
-	MakeCmd			command to run make
-	Malloc0ReturnsNull	boolean for malloc(0) == NULL
-	Malloc0ReturnsNullDefines -D's to build libX11/libXt
-	MathLibrary		library for programs using C math functions
-	MsMacros		macro flag for TroffCmd, normally "-ms"
-	MvCmd			command to rename a file
-	NdbmDefines		-D's to turn on use of ndbm routines
-	NeedConstPrototoypes	whether const is supported
-	NeedFunctionPrototypes	whether or not to force function prototypes
-	NeedNestedPrototypes	whether nested prototypes are supported
-	NeedVarargsPrototypes	whether varargs prototypes are supported
-	NeedWidePrototypes	whether or not to widen function prototypes
-	NoOpCDebugFlags		C compiler flags to not debug or optimize
-	NoRConst		YES if const for structs of funcs is bad
-	OSMajorVersion		major version number of operating system
-	OSMinorVersion		minor version number of operating system
-	OptimizedCDebugFlags	C compiler flags to turn on optimization
-	PreProcessCmd		command to run /lib/cpp on scripts
-	RanlibCmd		command to clean up libraries
-	RanlibInstFlags		flags to ranlib after copying
-	RmCmd			command to delete files
-	ShLibDir		directory in which to install shared libraries
-	StandardCppDefines	-D's for running cpp
-	StandardDefines		-D's for running C compiler
-	StandardIncludes	-I's for running C compiler
-	StripInstalledPrograms	boolean for sites that want to install -s
-	SystemV			boolean for systems that are at least SVR2
-	SystemV4		boolean for SVR4 systems
-	TOPDIR			relative path to top of sources
-	TagsCmd			command to run tags
-	TblCmd			command to run tbl
-	TroffCmd		command to run troff to get PostScript
-	UNCOMPRESSPATH		command to run uncompress
-	UnalignedReferencesAllowed	boolean for unaligned copies ok
-	UsrLibDir		directory in which to install libraries
-	VarDirectory		directory in /var for logs, etc., and config
-	YaccCmd			command to run yacc
-
-X11.tmpl provides defaults for the following variables:
-
-	AdmDir			directory containing system log files
-	AllocateLocalDefines	-D's to turn on alloca()
-	BDFTOSNFFILT		command to run bdftosnf
-	BaseExtensionDefines	universal extensions to use
-	BinDir			directory in which to install programs
-	BuildAppgroup		build AppGroup extension
-	BuildFontServer		build font server
-	BuildFonts		build pcf fonts
-	BuildIncRoot		relative path to location of headers in build
-	BuildIncTop		path from build includes directory to top
-	BuildLBX		build LBX (aka X.fast) server extension
-	BuildPexExt		build PEX server extension and fonts
-	BuildPhigs		build Phigs (obsolete)
-	BuildServer		build X server
-	BuildXAudio		build Audio 
-	BuildXAServer		build Audio server
-	BuildXIE		build X Image Extension
-	BuildDIS		build Document Imaging Subset of XIE
-	BuildXCSecurity		Build Security Extension
-	BuildXInputExt		build X Input extension (requires ddx support,
-					which exists only in Xhp)
-	BuildXInputLib		build X Input library
-	BuildXKB		build X Keyboard Extension?
-	BuildXKBlib		build X Keyboard Extension into Xlib?
-	UseXKBInClients		Use XKB functions in normal clients?
-	BuildDBE		build DOUBLE-BUFFER extension
-	BuildMultibuffer	build Multibuffer extension (obsolete)
-	BuildRECORD		Build RECORD extension
-	BuildPlugin		build xrx plug-in for web browsers
-	ConfigDir		install directory for config files
-	ConnectionFlags		-D's for supported transports
-	ContribDir		location of user-contributed sources
-	DebugLibFS		build libFS_d.a
-	DebugLibICE		build libICE_d.a
-	DebugLibPex		build libPEX5_d.a
-	DebugLibSM		build libSM_d.a
-	DebugLibX11		build libX11_d.a
-	DebugLibXau		build libXau_d.a
-	DebugLibXaw		build libXaw_d.a
-	DebugLibXdmcp		build libXdmcp_d.a
-	DebugLibXext		build libXext_d.a
-	DebugLibXi		build libXi_d.a
-	DebugLibXie		build libXie_d.a
-	DebugLibXmu		build libXmu_d.a
-	DebugLibXt		build libXt_d.a
-	DebugLibXtst		build libXtst_d.a
-	DebugLibXag		build libXag_d.a
-	DebugOldX		build liboldX_d.a
-	DefaultFSConfigFile	default font server config file
-	DefaultFontPath		default server font path
-	DefaultRGBDatabase	default server rgb color database
-	DefaultSystemPath	default system xdm PATH environment variable
-	DefaultSystemShell	default /bin/sh
-	DefaultUserPath		default user xdm PATH environment variable
-	DependCmd		command to run makedepend
-	DependDir		build directory containing makedepend program
-	ExtensionDefines	-D's for universal extensions
-	ExtensionOSDefines	-D's for additional extensions
-	FontCompilerFlags	flags for bdftosnf
-	FontDefines		-D's to turn on font options
-	FontDir			directory in which to install fonts
-	FontFilters		-D's to specify font conversion filters
-	FontOSDefines		-D's for which fonts to support
-	ForceNormalLib		force building of .a in addition to shared lib
-	GzipFontCompression	boolean for using gzip instead of compress
-	HasXdmAuth		boolean for using XDM-AUTHORIZATION-1;
-					needs Wraphelp.c, see Release Notes
-	InstallAppDefFiles	install new app defaults files over old?
-	InstallFSConfig		install fs config file over old?
-	InstallLibManPages	boolean for installing library man pages
-	InstallSecurityConfig	install server security policy file over old?
-	InstallXdmConfig	install xdm config files over old?
-	InstallXinitConfig	install xinit config files over old?
-	LibDir			directory in which to install X11 support files
-	LibManSuffix		man suffix for library pages
-	LibmanDir		directory in which to install library man pages
-	LintlibDir		directory in which to install lint libs
-	ManDir			directory in which to install program man pages
-	ManDirectoryRoot	parent of man directories relative to root
-	ManPath			full path of parent directory
-	ManSourcePath		common prefix of man page directories
-	ManSuffix		man suffix for programs
-	NeedDefaultDepLibs	boolean for enabling default DEPLIBS
-	NlsDir			directory in which to install nls files
-	NormalLibFS		build libFS.a
-	NormalLibICE		build libICE.a
-	NormalLibPex		build libPEX5.a
-	NormalLibPhigs		build libphigs.a
-	NormalLibSM		build libSM.a
-	NormalLibX11		build libX11.a
-	NormalLibXau		build libXau.a
-	NormalLibXaw		build libXaw.a
-	NormalLibXdmcp		build libXdmcp.a
-	NormalLibXext		build libXext.a
-	NormalLibXi		build libXi.a
-	NormalLibXie		build libXie.a
-	NormalLibXmu		build libXmu.a
-	NormalLibXt		build libXt.a
-	NormalLibXtst		build libXtst.a
-	NormalLibXag		build libXag.a
-	NormalOldX		build liboldX.a
-	OsNameDefines		beats me
-	PexApiDir		PEX include file location
-	PexCCOptions		special options for building PEX library
-	PexCDebugFlags		special flags for building PEX library
-	PexClientDefines	special -D's for building PEX clients
-	PexDipexDefines		special -D's for building PEX di files
-	PexPhigsDefines		special -D's for building PEX library
-	PexShmIPC		boolean for using shared memory in phigsmon
-	PhigsInclude		include directory for phigs clients
-	PrimaryScreenResolution	resolution of default server screen
-	ProfileLibFS		build libFS_p.a
-	ProfileLibICE		build libICE_p.a
-	ProfileLibPex		build libPEX5_p.a
-	ProfileLibSM		build libSM_p.a
-	ProfileLibX11		build libX11_p.a
-	ProfileLibXau		build libXau_p.a
-	ProfileLibXaw		build libXaw_p.a
-	ProfileLibXdmcp		build libXdmcp_p.a
-	ProfileLibXext		build libXext_p.a
-	ProfileLibXi		build libXi_p.a
-	ProfileLibXie		build libXie_p.a
-	ProfileLibXmu		build libXmu_p.a
-	ProfileLibXt		build libXt_p.a
-	ProfileLibXtst		build libXtst_p.a
-	ProfileLibXag		build libXag_p.a
-	ProfileOldX		build liboldX_p.a
-	ProjectX		version indicating this is the X Window System
-	RemoveTargetProgramByMoving	boolean for rm -f that doesn't
-	SHELLPATH		-D for /bin/sh
-	ServerConfigDir		directory for server security config files
-	ServerDefines		complete -D's for server
-	ServerExtraDefines	special -D's for server
-	ServerOSDefines		OS -D's for server
-	ServerAssertDefines	-DNDEBUG for no assertions, /**/ for assertions
-	SharedLibFS		boolean for making sharable libFS.so
-	SharedLibICE		boolean for making sharable libICE.so
-	SharedLibPex		boolean for making sharable libPEX5.so
-	SharedLibPhigs		boolean for making sharable libphigs.so
-	SharedLibSM		boolean for making sharable libSM.so
-	SharedLibX11		boolean for making sharable libX11.so
-	SharedLibXau		boolean for making sharable libXau.so
-	SharedLibXaw		boolean for making sharable libXaw.so
-	SharedLibXdmcp		boolean for making sharable libXdmcp.so
-	SharedLibXext		boolean for making sharable libXext.so
-	SharedLibXi		boolean for making sharable libXi.so
-	SharedLibXie		boolean for making sharable libXie.so
-	SharedLibXmu		boolean for making sharable libXmu.so
-	SharedLibXt		boolean for making sharable libXt.so
-	SharedLibXtst		boolean for making sharable libXtst.so
-	SharedLibXag		boolean for making sharable libXag.so
-	SharedOldX		boolean for making sharable liboldX.so
-	ShmDefines		MIT-SHM define
-	TwmDir			directory in which to install twm config files
-	UseCCMakeDepend		boolean for using alternate makedepend script
-	UseRgbTxt		use rgb.txt file as is instead of DBM-compiled
-	VendorHasX11R6_3libXext	don't need Security & AppGroup in xrx plug-in
-	XAppLoadDir		directory in which to install app defaults
-	XFileSearchPathBase	base file search path
-	XFileSearchPathDefault	default path to search for app defaults files
-	XInputDefines		XINPUT define
-	XMalloc0ReturnsNullDefines -D's specifically for libX11
-	XawClientDepLibs	DEPLIBS for clients that use Xaw
-	XawClientLibs		LOCAL_LIBRARIES for clients that use Xaw
-	XdmConfigurationSubdirectory	name of default xdm configuration
-	XdmDir			directory in which to install xdm files
-	XdmServersType		type of xdm Xservers file to install
-	XinitDir		directory in which to install xinit files
-	XPrintDir		parent of X Print server config directory
-	XprtServer		build the X Print server
-	XmanLocalSearchPath	non-standard path for man pages
-	XtErrorPrefix		leading text in XtError() msg; eg. 'X Toolkit '
-	XtWarningPrefix		leading text in XtWarning()msg, same as above
-	XtMalloc0ReturnsNullDefines -D's specifically for libXt
-	ZBDFTOSNFFILT		-D to run uncompress and bdftosnf
-
-
-Library.tmpl provides defaults for the following variables:
-
-	AvoidNullMakeCommand	for makes that spout about $(_NULLCMD_)
-	LibraryCCOptions	special C compiler options for libraries
-	LibraryCDebugFlags	library debug/optimize flags to override defs
-	LibraryCcCmd		command to run C compiler in libraries
-	LibraryCplusplusOptions special C++ options for libraries
-	LibraryCplusplusDebugFlags  library debug/optimize flags for C++
-	LibraryCplusplusCmd	command to run C++ compiler in libraries
-	LibraryDefines		-D's for libraries
-	SeparateSharedCompile	shared and unshared libs use same binaries?
-
-
-Server.tmpl provides defaults for the following variables:
-
-	ServerCCOptions		server C compiler options to override defaults
-	ServerCcCmd		command to run C compiler in server
-	ServerCDebugFlags	server debug/opt compiler flags
-	ServerDefines		server standard -D's
-	InstallServerSetUID	does this system need X server suid to root?
-
-
-Threads.tmpl provides defaults for the following variables:
-
-	LocalThreads		whether to enable multi-threading support
-	LocalThreadsDefines	-D flags needed in this directory
-
-
-An <os>Lib.rules file provides defaults for the following variables:
-
-	HasSharedLibraries	boolean for using shared libraries
-	SharedDataSeparation	boolean indicating separate data/code
-	SharedCodeDef		-D's for compiling shared library files
-	SharedLibraryDef	-D's for defining which kind of shared lib
-	ShLibIncludeFile	location of the <os>Lib.tmpl file
-	SharedLibraryLoadFlags	loader flags when making the library
-	UseExportLists		boolean for using an export list
-	PositionIndependentCFlags 		PIC compiler flags for C
-	PositionIndependentCplusplusFlags	PIC compiler flags for C++
-
-	  Note: PositionIndependentCplusplusFlags is only required if the 
-	  C and C++ compilers use different flags to build PIC code.  The
-	  default configuration will try to use PositionIndependentCFlags 
-	  for both C and C++ compiles.
-
-An <os>Lib.tmpl file provides defaults for the following variables:
-
-	SharedFSReqs		required libs for libFS.so
-	SharedFSRev		version number for libFS.so
-	SharedICEReqs		required libs for libICE.so
-	SharedICERev		version number for libICE.so
-	SharedOldXReqs		required libs for liboldX.so
-	SharedOldXRev		version number for liboldX.so
-	SharedPexReqs		required libs for libPEX5.so
-	SharedPexRev		version number for libPEX5.so
-	SharedSMReqs		required libs for libSM.so
-	SharedSMRev		version number for libSM.so
-	SharedX11Reqs		required libs for libX11.so
-	SharedX11Rev		version number for libX11.so
-	SharedXauReqs		required libs for libXau.so
-	SharedXauRev		version number for libXau.so
-	SharedXawReqs		required libs for libXaw.so
-	SharedXawRev		version number for libXaw.so
-	SharedXdmcpReqs		required libs for libXdmcp.so
-	SharedXdmcpRev		version number for libXdmcp.so
-	SharedXextReqs		required libs for libXext.so
-	SharedXextRev		version number for libXext.so
-	SharedXiReqs		required libs for libXi.so
-	SharedXiRev		version number for libXi.so
-	SharedXieReqs		required libs for libXie.so
-	SharedXieRev		version number for libXie.so
-	SharedXmuReqs		required libs for libXmu.so
-	SharedXmuRev		version number for libXmu.so
-	SharedXtReqs		required libs for libXt.so
-	SharedXtRev		version number for libXt.so
-	SharedXtstReqs		required libs for libXtst.so
-	SharedXtstRev		version number for libXtst.so
-	SharedXmReqs		required libs for libXm.so
-	SharedXmRev		version number for libXm.so
-	SharedMrmReqs		required libs for libMrm.so
-	SharedMrmRev		version number for libMrm.so
-	SharedUilReqs		required libs for libUil.so
-	SharedUilRev		version number for libUil.so
-	SharedTtReqs		required libs for libtt.so
-	SharedTtRev		version number for libtt.so
-	SharedPamReqs		required libs for libpam.so
-	SharedPamRev		version number for libpam.so
-	SharedDtSvcReqs		required libs for libDtSvc.so
-	SharedDtSvcRev		version number for libDtSvc.so
-	SharedDtSearchReqs	required libs for libDtSearch.so
-	SharedDtSearchRev	version number for libDtSearch.so
-	SharedDtWidgetReqs	required libs for libDtWidget.so
-	SharedDtWidgetRev	version number for libDtWidget.so
-	SharedDtHelpReqs	required libs for libDtHelp.so
-	SharedDtHelpRev		version number for libDtHelp.so
-	SharedDtPrintReqs	required libs for libDtPrint.so
-	SharedDtPrintRev	version number for libDtPrint.so
-	SharedDtTermReqs	required libs for libDtTerm.so
-	SharedDtTermRev		version number for libDtTerm.so
-	SharedDtMrmReqs		required libs for libDtMrm.so
-	SharedDtMrmRev		version number for libDtMrm.so
-
-The following variables are used by some part of the tree:
-
-	AckToolset		programs/Xserver/hw/xfree86
-	BuildChooser		build the xdm chooser program?
-	SharedLibXdmGreet	use xdm shared dynamic greeter library?
-	LatexCmd		command to run LaTeX on a document
-	DvipsCmd		command to turn .dvi file into PostScript
-	MotifBC			using Motif 1.1.1, 1.1.2, or 1.1.3?
-	GetValuesBC		compat GetValues behavior for broken apps?
-	NeedBerklib		application needs libXbsd?
-	SvgaConfig		default SVGA configuration
-	HasGetReturnAddress	util/memleak
-	HasShadowPasswd		system has getspnam() function
-	XnestServer		build X server with Xlib-based ddx
-	XVirtualFramebufferServer	build X server with virtual memory framebuffer
-	XpRasterDDX		include the raster print ddx driver
-	XpColorPclDDX		include the color PCL print ddx driver
-	XpMonoPclDDX		include the monochrome PCL print ddx driver
-	XpPostScriptDDX		include the PostScript print ddx driver
-	WebServer		host:port of your Web server (see programs/xrx)
-	HtmlDir			path used by Web server for HTML and RX docs
-	CgiBinDir		path used by Web server for CGI programs
-	ProxyManager		ICE network ID to contact a running proxymngr
-
-
-Make Variables
-
-The following make variables are used by imake rules and may be set in
-an individual Imakefile.
-
-DEFINES			program-specific -D flags and other arguments
-			to pass to the C compiler, lint, and makedepend.
-DEPEND_DEFINES		program-specific flags in addition to
-			$(DEFINES) to pass to lint and makedepend.
-			This is usually used when there are special
-			compilation rules for individual files, and
-			the defines passed to those files affect
-			makedepend results.  If they can be passed to
-			all files during the makedepend step without
-			affecting the results for other files,
-			DEPEND_DEFINES is used to do that.  Example is
-			the Xlib Imakefile.
-INCLUDES		program-specific -I flags.
-HEADERS			.h files to install with "make includes" and
-			"make install".  If this Imakefile includes
-			Library.tmpl there are no headers, include
-			this line instead of a HEADERS definition:
-			#define LibHeaders NO
-REQUIREDLIBS		when building a shared library, other libraries used
-			by this library that should be referenced at
-			link time.
-LINTLIBS		program-specific libraries for lint.
-LOCAL_LDFLAGS		program-specific flags for the linker.
-LOCAL_LIBRARIES		project libraries (usually specified
-			as -lname) needed by this program.
-			For example, "-lXt -lXext -lX11".
-			Used by SimpleProgramTarget and
-			ComplexProgramTarget* rules.
-			Do not include any system-specific libraries here.
-SYS_LIBRARIES		system libraries (usually specified
-			as -lname) needed by this program.
-			For example "MathLibrary".
-			Do not include any system-specific libraries
-			such as "-lnsl" here; they are automatically
-			added to the link command by the
-			vendor-specific .cf file.
-SUBDIRS			for an Imakefile in a directory containing
-			subdirectories, this names the subdirectories.
-			Such an Imakefile also needs to #define IHaveSubdirs
-			and call MakeSubdirs() and DependSubdirs().
-MANSUFFIX		suffix used by InstallManPage* rules.
-			May be set to $(LIBMANSUFFIX) or $(FILEMANSUFFIX) in
-			directories for libraries or data files.
-
-
-Rule-specific variables that may be set in an individual Imakefile.
-If you aren't using these rules, you may need variables with a similar
-function, but you need not use these names.  However, following these
-conventions may make your Imakefile easier to read and maintain.
-
-DEPLIBS			library dependencies for ComplexProgramTarget
-SRCS			source files used by ComplexProgramTarget and
-			DependTarget.
-OBJS			object files used by ComplexProgramTarget
-PROGRAMS		default target used with ComplexProgramTarget_(n)
-SRCS1			source files used by ComplexProgramTarget_1
-OBJS1			object files used by ComplexProgramTarget_1
-DEPLIBS1		library dependencies for ComplexProgramTarget_1
-SRCS2			source files used by ComplexProgramTarget_2
-OBJS2			object files used by ComplexProgramTarget_2
-DEPLIBS2		library dependencies for ComplexProgramTarget_2
-SRCS3			source files used by ComplexProgramTarget_3
-OBJS3			object files used by ComplexProgramTarget_3
-DEPLIBS3		library dependencies for ComplexProgramTarget_3
-
-Variables that can be set on the make command line:
-
-DESTDIR			directory under which "make install" should
-			install instead of "/"; used only for testing
-			"make install" rules.
-FILE			file for "lint1" target to run lint on.
-CDEBUGFLAGS		-g and/or -O flag to control C compiler optimization.
-CXXDEBUGFLAGS		-g and/or -O flag to control C++ optimization.
-LDSTRIPFLAGS		flag to have linker strip objects (typically -x).
-			Typically set to the empty string to prevent
-			the linker from stripping objects; use this
-			way when setting CDEBUGFLAGS to "-g".
-
-These variables are set in project-specific files such as X11.tmpl.
-They should NOT be set in an Imakefile.  These variables are sometimes
-misused; they are included here to remind Imakefile writers NOT to use
-them:
-
-EXTRA_DEFINES		project-specific -D flags
-EXTRA_INCLUDES		project-specific -I flags
-EXTRA_ICONFIGFILES	Additional project-specific imake config files
-			to add to ICONFIGFILES.
-			This is a list of files that define variables
-			that might affect compilation of some files.
-
-Many other make variables are set up by the imake config files and can
-be used in an Imakefile.  The easiest way to discover them is to look
-at the Makefile generated by an empty Imakefile.
-
-
-Comments
-
-Use C comment syntax in an Imakefile for comments that should not
-appear in the resulting Makefile.
-Use "XCOMM" at the start of each
-line to produce a comment that will appear in the Makefile.
-(The "XCOMM" will
-be translated into the Makefile comment character "#" by imake.)
-Do NOT use "#" as a comment character in Imakefiles; it confuses the C
-preprocessor used by imake on some systems.
-
-
-Imake variables
-
-Don't abuse the variables in X11.tmpl that describe
-particular pieces of X by using them to describe your own subsystems.
-Instead, create new variables that are defaulted using
-Imake.tmpl variables.
-
-
-Examples
-
-Since the easiest way to write an Imakefile is to start with one that
-works, here are some short, easy-to-read Imakefile examples in the X
-distribution:
-
-with subdirs:	config/Imakefile
-library:	lib/Xau/Imakefile
-simple program: programs/xdpyinfo/Imakefile
-complex progs:  programs/xclipboard/Imakefile
-complex prog:	programs/xmodmap/Imakefile
-
-Common Rules
-
-Here are some of the common rules for building programs.  How to use
-them is described in Imake.rules and in the O'Reilly book "Software
-Portability with imake."
-
-Basic program-building rules
-
-All of these except NormalProgramTarget also generate rules to install
-the program and its manual page, and to generate dependencies.
-
-SimpleProgramTarget	Use if there is only one program to be made
-			and it has only one source file.
-
-ComplexProgramTarget	Use if there is only one program to be made
-			and it has multiple source files.  Set SRCS to
-			the names of the source files, set OBJS to
-			the names of the object files, and set DEPLIBS
-			to the libraries that this program depends on.
-
-ComplexProgramTarget_1	Like ComplexProgramTarget, but uses SRCS1,
-			OBJS1, and DEPLIBS1 and can be used with
-			ComplexProgramTarget_2 and ComplexProgramTarget_3
-			to build up to three programs in the same directory.
-			Set PROGRAMS to the programs built by all of
-			these rules.  For more than 3 programs, use
-			NormalProgramTarget for each.
-ComplexProgramTarget_2	Use after ComplexProgramTarget_1 for the
-			second program in a directory.  Uses SRCS2,
-			OBJS2, and DEPLIBS2.
-ComplexProgramTarget_3	Use after ComplexProgramTarget_2 for the
-			third program in a directory.  Uses SRCS3,
-			OBJS3, and DEPLIBS3.
-
-NormalProgramTarget	Build a program.  Can be used multiple times
-			with different arguments in the same Imakefile.
-
-Lower level rules, often used with NormalProgramTarget
-
-InstallProgram		install a program.
-
-InstallManPage		install a manual page.
-
-DependTarget()		include once at end of Imakefile with
-			NormalProgramTarget rules or that uses Library.tmpl.
-			Generates dependencies for files named in SRCS.
-
-Manual page rules, commonly used only in special documentation directories:
-
-InstallManPage
-InstallManPageLong
-InstallManPageAliases
-
-Other rules:
-
-SpecialCObjectRule	Compile a C file with special flags.
-AllTarget		Declare additional targets to build.
-InstallAppDefaults	Install X application defaults file.
-
-Imakefile for directory with subdirectories
-
-XCOMM this is a sample Imakefile for a directory containing subdirectories
-#define IHaveSubdirs
-#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
-SUBDIRS = list of subdirs ...
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-
-
-Common Targets
-
-These targets are typically NOT defined explicitly by the Imakefile
-writer; rather they are generated automatically by imake rules.
-They are listed here for the convenience of people using the resulting
-Makefile, not people writing the original Imakefile.
-
-all			Default rule; builds whatever is in this directory.
-Makefile		Remake the Makefile (use after changing Imakefile).
-			Run "make depend" after.
-Makefiles		Remake all Makefiles in subdirectories.  (Does
-			nothing if no subdirectories.)
-			Run "make depend" after.
-includes		Generate and install in the tree any necessary
-			header files.
-depend			Update dependencies in the Makefile calculated
-			by examining the source files.
-install			Install what "make all" built on the system.
-install.man		Install manual pages.
-clean			Remove built objects and other derived files.
-lint			Run lint.
-tags			Create a tags file.
--- a/Xvnc/config/cf/Server.tmpl
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Server imakefile info  - this contains any special redefinitions, etc.
- * that Imakefiles in the server subtree will need.
- */
-
-XCOMM $XConsortium: Server.tmpl /main/14 1996/04/30 14:37:27 mw $
-XCOMM $XFree86: xc/config/cf/Server.tmpl,v 3.3.2.3 1998/02/07 00:54:21 dawes Exp $
-
-#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" LDSTRIPFLAGS="$(LDSTRIPFLAGS)"
-
-#ifndef ServerCcCmd
-#define ServerCcCmd CcCmd
-#endif
-#ifndef ServerCCOptions
-#define ServerCCOptions DefaultCCOptions
-#endif
-#ifndef ServerDefines
-#define ServerDefines StandardDefines
-#endif
-#ifndef ServerCDebugFlags
-#define ServerCDebugFlags DefaultCDebugFlags
-#endif
-#ifndef DoThreadedServer
-#define DoThreadedServer NO
-#endif
-#ifndef XserverNeedsSetUID
-#define XserverNeedsSetUID NO
-#endif
-#ifndef UseXserverWrapper
-#define UseXserverWrapper XserverNeedsSetUID
-#endif
-#ifndef InstallServerSetUID
-#define InstallServerSetUID (XserverNeedsSetUID && !UseXserverWrapper)
-#endif
-
-/*
- * SetUIDServerTarget - compile, link, and relink a setuid server
- */
-#ifndef SetUIDServerTarget
-#if InstallServerSetUID
-#define	SetUIDServerTarget(server,subdirs,objects,libs,syslibs)		@@\
-ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,$(INSTUIDFLAGS))
-#else
-#define	SetUIDServerTarget ServerTarget
-#endif
-#endif /* SetUIDServerTarget */
-
-/*
- * BuildDynamicLoading - dynamic module support
- */
-#ifndef BuildDynamicLoading
-#define BuildDynamicLoading		NO
-#endif
-
-/*
- * ExtensionsDynamicModules - compile server extensions as dynamic modules
- */
-#ifndef ExtensionsDynamicModules
-#define ExtensionsDynamicModules	BuildDynamicLoading
-#endif
-
-#ifndef PexDynamicModule
-#define PexDynamicModule	ExtensionsDynamicModules
-#endif
-#ifndef XieDynamicModule
-#define XieDynamicModule	ExtensionsDynamicModules
-#endif
-#ifndef GlxModule
-#define GlxModule	ExtensionsDynamicModules
-#endif
-
-         CC = ServerCcCmd
-  CCOPTIONS = ServerCCOptions
-#if DoThreadedServer
-SERVER_THREAD_DEFINES = XThreadsDefines ThreadTypeDefines
-#endif
-STD_DEFINES = ServerDefines $(SERVER_THREAD_DEFINES)
-CDEBUGFLAGS = ServerCDebugFlags
-EXT_DEFINES = ExtensionDefines
-
-#if GlxModule | DoLoadableServer
-GLX_DEFINES = GlxDefines -DGLX_MODULE
-#else
-GLX_DEFINES = GlxDefines
-#endif
-
-#ifndef GlxStaticServerLib
-#define GlxStubLib	YES
-#else
-#define GlxStubLib	NO
-#endif
-
-#ifdef XFree86Version
-#include <xf86.tmpl>
-#endif
--- a/Xvnc/config/cf/ServerLib.tmpl
+++ /dev/null
@@ -1,141 +0,0 @@
-XCOMM $XFree86: xc/config/cf/ServerLib.tmpl,v 3.0 1996/10/03 08:28:07 dawes Exp $
-/*
- * Server Library imakefile info - this contains any special
- * redefinitions, etc. that Imakefiles in the various server library 
- * subtrees will need.
- *
- * Before including this, you must set the following boolean variables:
- * DoSharedLib, DoNormalLib, DoDebugLib, DoProfileLib
- *
- */
-
-#ifndef DoNormalLib
-#define DoNormalLib 	YES
-#endif
-
-#ifndef LibraryDefines
-#define LibraryDefines StandardDefines
-#endif
-#ifndef LibraryCDebugFlags
-#define LibraryCDebugFlags DefaultCDebugFlags
-#endif
-#ifndef SeparateSharedCompile
-#define SeparateSharedCompile YES
-#endif
-#ifndef SharedServerLibraryDef
-#define SharedServerLibraryDef $(__NOOP__)
-#endif
-
-#ifndef LibraryCcCmd
-#if DoSharedLib && defined(SharedLibraryCcCmd)
-#define LibraryCcCmd SharedLibraryCcCmd
-#else
-#define LibraryCcCmd CcCmd
-#endif
-#endif
-#ifndef LibraryCCOptions
-#if DoSharedLib && defined(SharedLibraryCCOptions)
-#define LibraryCCOptions SharedLibraryCCOptions
-#else
-#define LibraryCCOptions DefaultCCOptions
-#endif
-#endif
-
-#if DoDebugLib
-#define _DebuggedLibMkdir() LibMkdir(debugger)
-#define _DebuggedObjCompile(options) DebuggedLibObjCompile(options)
-#define _DebuggedCleanDir() LibCleanDir(debugger)
-#else
-#define _DebuggedLibMkdir() $(_NULLCMD_)
-#define _DebuggedObjCompile(options) $(_NULLCMD_)
-#define _DebuggedCleanDir() $(_NULLCMD_)
-#endif
-
-#if DoProfileLib
-#define _ProfiledLibMkdir() LibMkdir(profiled)
-#define _ProfiledObjCompile(options) ProfiledLibObjCompile(options)
-#define _ProfiledCleanDir() LibCleanDir(profiled)
-#else
-#define _ProfiledLibMkdir() $(_NULLCMD_)
-#define _ProfiledObjCompile(options) $(_NULLCMD_)
-#define _ProfiledCleanDir() $(_NULLCMD_)
-#endif
-
-#if !DoNormalLib
-#define _NormalLibMkdir() $(_NULLCMD_)
-#define _NormalObjCompile(options) $(_NULLCMD_)
-#define _NormalCleanDir() $(_NULLCMD_)
-#else
-#if DoSharedLib && SeparateSharedCompile
-#define _NormalLibMkdir() LibMkdir(unshared)
-#define _NormalObjCompile(options) UnsharedLibObjCompile(options)
-#define _NormalCleanDir() LibCleanDir(unshared)
-#else
-#define _NormalLibMkdir() $(_NULLCMD_)
-#define _NormalObjCompile(options) NormalLibObjCompile(options)
-#define _NormalCleanDir() $(_NULLCMD_)
-#endif
-#endif
-
-#if !DoSharedLib || (DoNormalLib && !SeparateSharedCompile)
-#define _SharedObjCompile(options) $(_NULLCMD_)
-#else
-#if SeparateSharedCompile
-#define _SharedObjCompile(options) NormalSharedLibObjCompile(options)
-#else
-#define _SharedObjCompile(options) NormalLibObjCompile(options)
-#endif
-#endif
-
-#define SRCsuf c
-
-#ifndef LibraryObjectRule
-#define LibraryObjectRule()						@@\
-all::									@@\
-	_DebuggedLibMkdir()						@@\
-	_ProfiledLibMkdir()						@@\
-	_NormalLibMkdir()						@@\
-									@@\
-includes::								@@\
-	_DebuggedLibMkdir()						@@\
-	_ProfiledLibMkdir()						@@\
-	_NormalLibMkdir()						@@\
-									@@\
-.SRCsuf.Osuf:								@@\
-	_DebuggedObjCompile($(_NOOP_))					@@\
-	_ProfiledObjCompile($(_NOOP_))					@@\
-	_NormalObjCompile($(_NOOP_))					@@\
-	_SharedObjCompile(SharedServerLibraryDef)			@@\
-									@@\
-clean::									@@\
-	_DebuggedCleanDir()						@@\
-	_ProfiledCleanDir()						@@\
-	_NormalCleanDir()						@@\
-
-#endif /* LibraryObjectRule */
-
-#ifndef SpecialLibObjectRule
-#define SpecialLibObjectRule(objs,depends,options)			@@\
-objs: depends								@@\
-	_DebuggedObjCompile(options)					@@\
-	_ProfiledObjCompile(options)					@@\
-	_NormalObjCompile(options)					@@\
-	_SharedObjCompile(options)					@@\
-
-#endif /* SpecialLibObjectRule */
-
-#ifndef SpecialCLibObjectRule
-#define SpecialCLibObjectRule(basename,depends,options)			@@\
-SpecialLibObjectRule(basename.Osuf,basename.SRCsuf depends,options)	@@\
-									@@\
-basename.i: basename.SRCsuf depends					@@\
-	CPPOnlyCompile(basename.SRCsuf,options)				@@\
-									@@\
-CenterLoadTarget(debug_src,basename.SRCsuf,NullParameter,$(ALLDEFINES) options)
-#endif /* SpecialCLibObjectRule */
-
-#if DoSharedLib
-LibraryObjectRule()
-#else
-NormalLibraryObjectRule()
-#endif
--- a/Xvnc/config/cf/Threads.tmpl
+++ /dev/null
@@ -1,98 +0,0 @@
-XCOMM $XConsortium: Threads.tmpl /main/11 1996/09/28 16:07:06 rws $
-XCOMM $XFree86: xc/config/cf/Threads.tmpl,v 3.2 1996/12/23 05:50:12 dawes Exp $
-
-/*
- * For a multi-threaded application or library,
- * Define LocalThreadsDefines in your Imakefile (unless you like the
- * project default), then include this file.
- * Everything else should be automatic. 
- */
-
-#ifndef LocalThreadsDefines
-#ifdef ProjectThreadsDefines
-#define LocalThreadsDefines ProjectThreadsDefines
-#else
-#define LocalThreadsDefines /**/
-#endif
-#endif
-
-#ifndef LocalThreads
-#ifdef ThreadedProject
-#define LocalThreads ThreadedProject
-#else
-#define LocalThreads YES
-#endif
-#endif
-
-#ifndef ThreadTypeDefines
-#if HasCThreads
-#define ThreadTypeDefines -DCTHREADS
-#else
-#define ThreadTypeDefines /**/
-#endif
-#endif
-#ifndef SystemMTDefines
-#define SystemMTDefines /**/
-#endif
-#ifndef LibraryMTDefines
-#define LibraryMTDefines /**/
-#endif
-#ifndef HasThreadSafeAPI		/* does it have getpwnam_r, etc. */
-#define HasThreadSafeAPI YES
-#endif
-#ifndef MTSafeAPIDefines
-#if HasThreadSafeAPI
-#define MTSafeAPIDefines -DXUSE_MTSAFE_API
-#else
-#define MTSafeAPIDefines /**/
-#endif
-#endif
-#ifndef ThreadPreStdAPIDefines
-#define ThreadPreStdAPIDefines /* nominally for POSIX P1003.4a (Draft 4) API */
-#endif
-#ifndef CplusplusSystemMTDefines
-# ifdef SystemMTDefines
-#  define CplusplusSystemMTDefines SystemMTDefines
-# else
-#  define CplusplusSystemMTDefines /**/
-# endif
-#endif
-#ifndef ThreadsCompileFlags
-#define ThreadsCompileFlags /**/
-#endif
-#ifndef ThreadsCplusplusCompileFlags
-# ifdef ThreadsCompileFlags
-#  define ThreadsCplusplusCompileFlags ThreadsCompileFlags
-# else
-#  define ThreadsCplusplusCompileFlags /**/
-# endif
-#endif
-
-#ifndef ThreadsLibraries
-#define ThreadsLibraries /**/
-#endif
-#ifndef ThreadsCplusplusLibraries
-# ifdef ThreadsLibraries
-#  define ThreadsCplusplusLibraries ThreadsLibraries
-# else
-#  define ThreadsCplusplusLibraries /**/
-# endif
-#endif
-#ifndef ThreadsLoadFlags
-#define ThreadsLoadFlags ThreadsCompileFlags
-#endif
-#ifndef ThreadsCplusplusLoadFlags
-#define ThreadsCplusplusLoadFlags ThreadsCplusplusCompileFlags
-#endif
-
-#if LocalThreads
-    THREADS_CFLAGS = ThreadsCompileFlags
-   THREADS_DEFINES = LocalThreadsDefines ThreadTypeDefines SystemMTDefines MTSafeAPIDefines ThreadPreStdAPIDefines $(LIB_MT_DEFINES)
-   THREADS_LDFLAGS = ThreadsLoadFlags
-      THREADS_LIBS = ThreadsLibraries
-
-  THREADS_CXXFLAGS = ThreadsCplusplusCompileFlags
-THREADS_CXXDEFINES = LocalThreadsDefines ThreadTypeDefines CplusplusSystemMTDefines MTSafeAPIDefines ThreadPreStdAPIDefines $(LIB_MT_DEFINES)
-THREADS_CXXLDFLAGS = ThreadsCplusplusLoadFlags
-   THREADS_CXXLIBS = ThreadsCplusplusLibraries
-#endif
--- a/Xvnc/config/cf/Win32.cf
+++ /dev/null
@@ -1,128 +0,0 @@
-XCOMM platform:  $XConsortium: Win32.cf /main/51 1996/12/19 14:20:08 lehors $
-
-#ifndef OSName
-#define OSName			Microsoft Windows NT 4.0
-#endif
-XCOMM operating system:  OSName
-#ifndef OSMajorVersion
-#define OSMajorVersion		4
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion		0
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion		0
-#endif
-
-#ifndef CompilerMajorVersion
-/* 0 == NT 3.1 Win32 SDK, 2 == MSVC++ 2, 4 == MSVC 4 */
-#define CompilerMajorVersion	4	
-#endif
-
-#define BootstrapCFlags		-DWIN32
-#ifdef _M_IX86
-#define CpuDefines -D_X86_
-#endif
-/* brain-damaged windows headers will not compile with -Za */
-#define StandardDefines -DWIN32 -DWIN32_LEAN_AND_MEAN -D_DLL -D_MT -D__STDC__ CpuDefines
-#if CompilerMajorVersion < 4
-#define DefaultCCOptions -nologo -batch -G4 -W2
-#else
-#define DefaultCCOptions -nologo -G4 -W2
-#endif
-#if CompilerMajorVersion < 4
-#define DebuggableCDebugFlags -Zi
-#else
-#define DebuggableCDebugFlags -Zi -Od
-#endif
-#define ThreadedX		YES
-#define HasThreadSafeAPI	NO
-#define CpCmd copy
-#define LnCmd copy
-#define MvCmd ren
-#define RmCmd del
-#ifndef RmTreeCmd
-/*#define RmTreeCmd del /q /s */
-#define RmTreeCmd rm -rfx
-#endif
-#define CcCmd cl
-#define HasCplusplus		YES
-#define CplusplusCmd cl
-#if CompilerMajorVersion < 4
-#define PreProcessCmd CcCmd -nologo -batch -EP
-#define CppCmd  CcCmd -nologo -batch -E
-#else
-#define PreProcessCmd CcCmd -nologo -EP
-#define CppCmd  CcCmd -nologo -E
-#endif
-#define PatheticCpp		YES
-#define ConstructMFLAGS		YES
-#if (CompilerMajorVersion == 0)
-#define ArCmdBase lib32
-#else
-#define ArCmdBase lib
-#endif
-#define ArCmd ArCmdBase
-#define CplusplusCmd cl
-#define MkdirHierCmd mkdir
-#define InstallCmd copy
-#define InstPgmFlags /**/
-#define InstBinFlags /**/
-#define InstUidFlags /**/
-#define InstLibFlags /**/
-#define InstIncFlags /**/
-#define InstManFlags /**/
-#define InstDatFlags /**/
-#define InstallFlags /**/
-#if (CompilerMajorVersion == 0)
-#define ExtraLibraries crtdll.lib kernel32.lib wsock32.lib
-#elif (CompilerMajorVersion < 4)
-#define ExtraLibraries msvcrt.lib kernel32.lib wsock32.lib
-#else
-#define ExtraLibraries msvcrt.lib kernel32.lib wsock32.lib -link -nodefaultlib:libc
-#endif
-#define MakeCmd nmake -nologo
-#if (CompilerMajorVersion == 0)
-#define LdCmd link32
-#else
-#define LdCmd link
-#endif
-#define MathLibrary
-#define HasSymLinks		NO
-#define HasVarDirectory		NO
-#define HasPutenv		YES
-#define Osuf obj
-#ifndef CCsuf
-#define CCsuf cxx
-#endif
-#define BuildServer		NO
-#define ConnectionFlags		-DTCPCONN
-
-/* override as necessary in site.def/host.def */
-#ifndef StdIncDir
-#define StdIncDir 		C:/MSDEVSTD/INCLUDE
-#endif
-#define LdPreLib /**/
-#define LdPostLib /**/
-#ifndef UseInstalled
-#define ImakeCmd $(IMAKESRC:/=\)\imake
-#define DependCmd $(DEPENDSRC:/=\)\makedepend
-#endif
-#define DependFlags -D_WIN32
-#define FilesToClean *.bak *.obj *.lib make.log
-#define ShLibDir $(BINDIR)
-
-#define XFileSearchPathBase Concat4($(LIBDIR)/;L/;T/;N;C,;S:$(LIBDIR)/;l/;T/;N;C,;S:$(LIBDIR)/;T/;N;C,;S:$(LIBDIR)/;L/;T/;N;S:$(LIBDIR)/;l/;T/;N;S:$(LIBDIR)/;T/;N;S)
-
-#define XawI18nDefines		-DHAS_WCHAR_H
-#define UseRgbTxt  YES
-#define HasCbrt NO
-#define HasFfs NO
-#define HasXdmAuth NO
-
-/* the following components haven't been ported yet */
-#define BuildLBX NO
-#define BuildXprint NO
-#define XprtServer NO
-
-#include <Win32.rules>
--- a/Xvnc/config/cf/Win32.rules
+++ /dev/null
@@ -1,528 +0,0 @@
-XCOMM platform:  $XConsortium: Win32.rules /main/49 1996/12/02 14:12:47 kaleb $
-
-#define HasSharedLibraries YES
-#define NeedLibInsideFlag YES
-#define SharedLibXaw NO
-#define SharedLibXmu NO
-#define SharedLibXt NO
-#define SharedDataSeparation NO
-#define SharedCodeDef /**/
-#define SharedLibraryDef /**/
-#define ShLibIncludeFile <WinLib.tmpl>
-#define SharedLibraryLoadFlags -dll
-#define PositionIndependentCFlags /**/
-
-.c.obj:
-	$(CC) -c $*.c @<<
-	$(CFLAGS)
-<<
-
-#if HasCplusplus
-.CCsuf.obj:
-	$(CXX) -c $*.CCsuf @<<
-	$(CFLAGS)
-<<
-#endif
-
-#define ProgramTargetName(target) target.exe
-
-#define RunProgram(progvar,options) $(progvar:/=\) options
-
-#define RemoveFile(file) if exist file $(RM) file
-
-#define RemoveFiles(files) @$(MAKE) $(MFLAGS) -f <<			@@\
-.SUFFIXES:								@@\
-									@@\
-all: files								@@\
-	!for %%i in ( Avoid.Error $$** ) do if exist %%i $(RM) %%i	@@\
-									@@\
-Avoid.Error files:							@@\
-<<
-
-#define MakeDir(dir) -$(MKDIRHIER) dir
-
-#define ObjectCompile(options) RemoveFile($@)				@@\
-	$(CC) -c $*.c @<<						@@\
-	$(CFLAGS) options						@@\
-<<
-
-#define LibObjCompile(dir,options) RemoveFiles($@ dir\$@)		@@\
-	$(CC) -c  $*.c @<<						@@\
-	$(CCOPTIONS) $(ALLDEFINES) options				@@\
-<<									@@\
-	$(MV) $@ dir\$@
-
-#define BuildIncludesTop(srclist,dstsubdir,dstupdir)			@@\
-includes:: srclist							@@\
-	MakeDir($(BUILDINCDIR:/=\))					@@\
-	@$(MAKE) $(MFLAGS) -f <<					@@\
-.SUFFIXES:								@@\
-									@@\
-all: srclist								@@\
-	cd $(BUILDINCDIR:/=\)						@@\
-	!RemoveFile($$**)						@@\
-	!$(LN) $(BUILDINCTOP:/=\)\$(CURRENT_DIR:/=\)\$$** .		@@\
-									@@\
-Avoid.Error srclist:							@@\
-<<
-
-#define BuildIncludes(srclist,dstsubdir,dstupdir)			@@\
-XVARdef0 = $(BUILDINCDIR)/dstsubdir					@@\
-XVARdef1 = $(BUILDINCTOP)/dstupdir/$(CURRENT_DIR)			@@\
-									@@\
-includes:: srclist							@@\
-	MakeDir($(XVARuse0:/=\))					@@\
-	@$(MAKE) -A $(MFLAGS) -f <<					@@\
-.SUFFIXES:								@@\
-									@@\
-all: srclist								@@\
-	cd $(XVARuse0:/=\)						@@\
-	!RemoveFile($$**)						@@\
-	!$(LN) $(XVARuse1:/=\)\$$** .					@@\
-									@@\
-Avoid.Error srclist:							@@\
-<<
-
-#define LinkFileList(step,list,dir,sub)					@@\
-XVARdef0 = dir								@@\
-XVARdef1 = sub								@@\
-XVARdef2 = list								@@\
-									@@\
-step:: $(XVARuse2:/=\)							@@\
-	cd $(XVARuse0:/=\)						@@\
-	!RemoveFile($**)						@@\
-	!$(LN) $(XVARuse1:/=\)\\$** .
-
-#define LinkRule(program,options,objects,libraries) \
-$(CCLINK) Concat(-Fe,program) options objects libraries $(EXTRA_LOAD_FLAGS)
-
-#define NormalProgramTarget(program,objects,deplibs,locallibs,syslibs)	@@\
-XVARdef0 = objects							@@\
-									@@\
-ProgramTargetName(program): $(XVARuse0:.o=.obj) deplibs			@@\
-	RemoveTargetProgram($@)						@@\
-	LinkRule($@,$(LDOPTIONS),$(XVARuse0:.o=.obj),locallibs $(LDLIBS) syslibs) @@\
-									@@\
-clean::									@@\
-	RemoveFile(ProgramTargetName(program))
-
-#define ProgramTargetHelper(program,srcs,objs,deplib,locallib,syslib)	@@\
-ProgramTargetName(program): $(objs:.o=.obj) $(deplib)			@@\
-	RemoveTargetProgram($@)						@@\
-	LinkRule($@,$(LDOPTIONS),$(objs:.o=.obj),locallib $(LDLIBS) syslib) @@\
-									@@\
-InstallProgram(program,$(BINDIR))					@@\
-InstallManPage(program,$(MANDIR))
-
-#define ComplexProgramTarget(program)					@@\
-PROGRAM = ProgramTargetName(program)					@@\
-									@@\
-AllTarget(ProgramTargetName(program))					@@\
-									@@\
-ProgramTargetHelper(program,SRCS,OBJS,DEPLIBS,$(LOCAL_LIBRARIES),NullParameter) @@\
-									@@\
-DependTarget()								@@\
-LintTarget()								@@\
-									@@\
-clean::									@@\
-	RemoveFile($(PROGRAM))
-
-#define ComplexProgramTarget_1(program,locallib,syslib)			@@\
-OBJS = $(OBJS1) $(OBJS2) $(OBJS3)					@@\
-SRCS = $(SRCS1) $(SRCS2) $(SRCS3)					@@\
-PROGRAM1 = ProgramTargetName(program)					@@\
-									@@\
-AllTarget($(PROGRAM1) $(PROGRAM2) $(PROGRAM3))				@@\
-									@@\
-ProgramTargetHelper(program,SRCS1,OBJS1,DEPLIBS1,locallib,syslib)	@@\
-									@@\
-DependTarget()								@@\
-LintTarget()								@@\
-									@@\
-clean::									@@\
-	for %%i in ($(PROGRAMS)) do $(RM) ProgramTargetName(%%i)
-
-#define ComplexProgramTarget_2(program,locallib,syslib)			@@\
-PROGRAM2 = ProgramTargetName(program)					@@\
-									@@\
-ProgramTargetHelper(program,SRCS2,OBJS2,DEPLIBS2,locallib,syslib)
-
-#define ComplexProgramTarget_3(program,locallib,syslib)			@@\
-PROGRAM3 = ProgramTargetName(program)					@@\
-									@@\
-ProgramTargetHelper(program,SRCS3,OBJS3,DEPLIBS3,locallib,syslib)
-
-#define MoveToBakFile(file) -@if exist file $(MV) file file.bak
-
-#define RMoveToBakFile(file) -RemoveFile(file.bak)			@@\
-	-@if exist file $(MV) file file.bak
-
-#define InstallMultipleDestFlags(step,list,dest,flags)			@@\
-XVARdef0 = $(DESTDIR)dest						@@\
-									@@\
-step:: list								@@\
-	MakeDir($(XVARuse0:/=\))					@@\
-	!$(INSTALL) $(INSTALLFLAGS) flags $** $(XVARuse0:/=\)
-
-#define	CleanTarget()							@@\
-clean::									@@\
-	RemoveFiles(FilesToClean ExtraFilesToClean)
-
-#define LibraryTargetName(libname)libname.lib
-
-#define LibraryTargetNameSuffix(libname,suffix)Concat(libname,suffix.lib)
-
-#define MakeLibrary(libname,objlist) $(AR) @<<				@@\
--out:libname objlist							@@\
-<<
-
-#define LinkSourceFile(src,dir)						@@\
-XVARdef0 = dir/src							@@\
-									@@\
-src:  $(XVARuse0:/=\)							@@\
-	RemoveFile($@)							@@\
-	$(LN) $? $@							@@\
-									@@\
-includes:: src								@@\
-									@@\
-depends:: src								@@\
-									@@\
-clean::									@@\
-	RemoveFile(src)
-
-#define LinkFile(tofile,fromfile)					@@\
-XVARdef0 = fromfile							@@\
-tofile:: $(XVARuse0:/=\)						@@\
-	RemoveFile($@)							@@\
-	$(LN) $? $@							@@\
-									@@\
-includes:: tofile							@@\
-									@@\
-depend:: tofile								@@\
-									@@\
-clean::									@@\
-	RemoveFile(tofile)
-
-
-#define	NormalLibraryTarget(libname,objlist)				@@\
-AllTarget(LibraryTargetName(libname))					@@\
-									@@\
-XVARdef0 = objlist							@@\
-									@@\
-LibraryTargetName(libname): $(XVARuse0:.o=.obj) $(EXTRALIBRARYDEPS)	@@\
-	RemoveFile($@)							@@\
-	MakeLibrary($@,$(XVARuse0:.o=.obj))				@@\
-	LinkBuildLibrary($@)
-
-#define	NormalLibraryTarget2(libname,objlist1,objlist2)			@@\
-NormalLibraryTarget(libname,objlist1 objlist2)
-
-#define	NormalLibraryTarget3(libname,objlist1,objlist2,objlist3)	@@\
-NormalLibraryTarget(libname,objlist1 objlist2 objlist3)
-
-#define	NormalDepLibraryTarget(libname,deplist,objlist)			@@\
-AllTarget(LibraryTargetName(libname))					@@\
-									@@\
-XVARdef0 = deplist							@@\
-XVARdef1 = objlist							@@\
-XVARdef2 = $(XVARuse1:/=\)						@@\
-									@@\
-LibraryTargetName(libname): $(XVARuse0:/=\) $(EXTRALIBRARYDEPS)		@@\
-	RemoveFile($@)							@@\
-	MakeLibrary($@,$(XVARuse2:.o=.obj))				@@\
-	LinkBuildLibrary($@)
-
-#define	ProfiledLibraryTarget(libname,objlist)				@@\
-AllTarget(LibraryTargetNameSuffix(libname,_p))				@@\
-									@@\
-XVARdef0 = objlist							@@\
-									@@\
-LibraryTargetNameSuffix(libname,_p): $(XVARuse0:.o=.obj) $(EXTRALIBRARYDEPS)	@@\
-	RemoveFile($@)							@@\
-	cd profiled							@@\
-	MakeLibrary(..\$@,$(XVARuse0:.o=.obj))				@@\
-	cd ..
-
-#define	DebuggedLibraryTarget(libname,objlist)				@@\
-AllTarget(LibraryTargetNameSuffix(libname,_d))				@@\
-									@@\
-XVARdef0 = objlist							@@\
-									@@\
-LibraryTargetNameSuffix(libname,_d): $(XVARuse0:.o=.obj) $(EXTRALIBRARYDEPS)	@@\
-	RemoveFile($@)							@@\
-	cd debugger							@@\
-	MakeLibrary(..\$@,$(XVARuse0:.o=.obj))				@@\
-	cd ..
-
-#ifndef UseInstalled
-#define ImakeDependency(target)						@@\
-target:: ProgramTargetName($(IMAKE))					@@\
-									@@\
-ProgramTargetName($(IMAKE)):						@@\
-	<<tmp.bat							@@\
-	cd $(IMAKESRC:/=\)						@@\
-	if exist Makefile $(MAKE) all					@@\
-	if not exist Makefile $(MAKE) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)" @@\
-<<
-#endif
-
-#ifndef UseInstalled
-#define DependDependency() 						@@\
-depend:: ProgramTargetName($(DEPEND))					@@\
-									@@\
-ProgramTargetName($(DEPEND)):						@@\
-	<<tmp.bat							@@\
-	cd $(DEPENDSRC:/=\)						@@\
-	$(MAKE)								@@\
-<<
-#endif
-
-#define	DependTarget()							@@\
-DependDependency()							@@\
-									@@\
-depend::								@@\
-	$(DEPEND:/=\) @<<						@@\
-$(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS)		@@\
-<<
-
-#define	DependTarget3(srcs1,srcs2,srcs3)				@@\
-DependDependency()							@@\
-									@@\
-depend::								@@\
-	$(DEPEND:/=\) @<<						@@\
-$(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs1 srcs2 srcs3	@@\
-<<
-
-#define ForceSubdirs(dirs)						@@\
-Avoid.Error dirs: FRC							@@\
-	@cd $@								@@\
-	@echo making all in $(CURRENT_DIR)/$@...			@@\
-	$(MAKE) $(MFLAGS) PassCDebugFlags all				@@\
-	cd ..								@@\
-									@@\
-FRC:
-
-#define MakeMakeSubdirs(dirs,target)					@@\
-XVARdef0 = dirs								@@\
-XVARdef1 = $$								@@\
-									@@\
-target::								@@\
-	@$(MAKE) -A $(MFLAGS) -f <<					@@\
-.SUFFIXES:								@@\
-									@@\
-all: $(XVARuse0:/=\)							@@\
-									@@\
-Avoid.Error $(XVARuse0:/=\):						@@\
-	cd $(XVARuse1)@							@@\
-	RMoveToBakFile(Makefile)					@@\
-	ImakeSubCmdHelper -DTOPDIR=../$(TOP) -DCURDIR=$(CURRENT_DIR)/$(XVARuse1)@ @@\
-	$(MAKE) $(MFLAGS) Makefiles					@@\
-	cd ..								@@\
-<<
-
-#ifdef UseInstalled
-# define ImakeSubCmdHelper $(IMAKE_CMD)
-#else
-# define ImakeSubCmdHelper ..\$(IMAKE) -I../$(IRULESRC) $(IMAKE_DEFINES)
-#endif
-
-#define NamedTargetSubdirs(name,dirs,verb,flags,subname)		@@\
-XVARdef0 = dirs								@@\
-XVARdef1 = $$								@@\
-									@@\
-name::									@@\
-	@$(MAKE) -A $(MFLAGS) -f <<					@@\
-.SUFFIXES:								@@\
-									@@\
-all: $(XVARuse0:/=\)							@@\
-									@@\
-Avoid.Error $(XVARuse0:/=\):						@@\
-	cd $(XVARuse1)@							@@\
-	@echo verb in $(CURRENT_DIR)/$(XVARuse1)@...			@@\
-	$(MAKE) $(MFLAGS) flags subname					@@\
-	cd ..								@@\
-<<
-
-#define UnsharedLibReferences(varname,libname,libsource)		@@\
-Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/,libsource/,libname.lib) @@\
-Concat(varname,LIB) = LoaderLibPrefix _Use(libname.lib,$(Concat3(DEP,varname,LIB))) @@\
-LintLibReferences(varname,libname,libsource)
-
-#define SharedLibReferences(varname,libname,libsource,revname,rev)	@@\
-revname = rev								@@\
-UnsharedLibReferences(varname,libname,libsource)
-
-#define	SubdirLibraryRule(objlist)					@@\
-XVARdef0 = objlist							@@\
-									@@\
-all:: DONE								@@\
-									@@\
-DONE: $(XVARuse0:.o=.obj)						@@\
-	RemoveFile($@)							@@\
-	echo - > $@							@@\
-									@@\
-clean::									@@\
-	RemoveFile(DONE)
-
-#define CppScriptTarget(dst,src,defs,deplist)				@@\
-dst::									@@\
-	@echo sorry, unable to make $@
-
-#define CppFileTarget(dst,src,defs,deplist)				@@\
-XFAKEVAR = X								@@\
-dst::  src deplist							@@\
-	RemoveFile($@)							@@\
-	$(PREPROCESSCMD) -I. <<CppTmpFile.c @<< >$@			@@\
-	XCOMM define $(XFAKEVAR)COMM XCOMM				@@\
-	XCOMM include <src>						@@\
-<<									@@\
-	defs								@@\
-<<									@@\
-									@@\
-clean::									@@\
-	RemoveFiles(dst)
-
-#define InstallNamedTarget(step,srcname,flags,dest,dstname)		@@\
-XVARdef0 = $(DESTDIR)dest						@@\
-									@@\
-step:: srcname								@@\
-	MakeDir($(XVARuse0:/=\))					@@\
-	$(INSTALL) $(INSTALLFLAGS) flags srcname $(XVARuse0:/=\)\\dstname
-
-#define InstallNamedTargetNoClobber(step,srcname,flags,dest,dstname)	@@\
-XVARdef0 = $(DESTDIR)dest						@@\
-									@@\
-step:: srcname								@@\
-	MakeDir($(XVARuse0:/=\))					@@\
-	@if exist $(XVARuse0:/=\)\\dstname echo Not overwriting existing $(XVARuse0:/=\)\\dstname @@\
-	if not exist $(XVARuse0:/=\)\\dstname $(INSTALL) $(INSTALLFLAGS) flags srcname $(XVARuse0:/=\)\\dstname
-
-
-#define	InstallLibrary(libname,dest)					@@\
-InstallTarget(install,LibraryTargetName(libname),$(INSTLIBFLAGS),dest)
-
-#define	InstallScript(program,dest) /**/
-
-#define	InstallNamedProg(srcname,dstname,dest)				@@\
-install:: srcname							@@\
-	@echo sorry, unable to install srcname
-
-#define	InstallSharedLibrary(libname,rev,dest)				@@\
-InstallTarget(install,LibraryTargetName(libname),$(INSTLIBFLAGS),$(USRLIBDIR)) @@\
-InstallTarget(install,libname.dll,$(INSTLIBFLAGS),dest)
-
-#define	InstallSharedLibraryData(libname,rev,dest)
-
-#define MakeDLL(libname,solist) $(LD) @<<				@@\
-SharedLibraryLoadFlags -out:libname.dll libname.exp solist		@@\
-<<
-
-#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
-AllTarget(libname.dll)							@@\
-									@@\
-CppFileTarget(libname.def,libname-def.cpp,-DLIBRARY_VERSION=rev,$(ICONFIGFILES)) @@\
-									@@\
-XVARdef0 = solist							@@\
-									@@\
-LibraryTargetName(libname): $(XVARuse0:.o=.obj) libname.def $(EXTRALIBRARYDEPS)	@@\
-	RemoveFile($@)							@@\
-	MakeLibrary($@,-def:libname.def $(XVARuse0:.o=.obj))		@@\
-	LinkBuildLibrary($@)						@@\
-	RemoveFile(libname.dll)						@@\
-	MakeDLL(libname,$(XVARuse0:.o=.obj) $(REQUIREDLIBS) $(EXTRA_LIBRARIES)) @@\
-	LinkBuildDLL(libname.dll)					@@\
-									@@\
-libname.dll: LibraryTargetName(libname) $(EXTRALIBRARYDEPS)		@@\
-	RemoveFile(libname.dll)						@@\
-	MakeDLL(libname,$(XVARuse0:.o=.obj) $(REQUIREDLIBS) $(EXTRA_LIBRARIES)) @@\
-	LinkBuildDLL(libname.dll)					@@\
-									@@\
-clean::									@@\
-	RemoveFile(LibraryTargetName(libname))				@@\
-	RemoveFile(libname.dll)
-
-#define SharedLibraryDataTarget(libname,rev,salist)
-
-#define ObjectCplusplusCompile(options) RemoveFile($@)			@@\
-	$(CXX) -c $*.CCsuf @<<						@@\
-	$(CFLAGS) options						@@\
-<<
-
-#define CplusplusLinkRule LinkRule
-
-#define CplusplusProgramTargetHelper ProgramTargetHelper
-
-#ifndef ComplexCplusplusProgramTarget
-#define	ComplexCplusplusProgramTarget(program)				@@\
-        PROGRAM = ProgramTargetName(program)				@@\
-									@@\
-AllTarget(ProgramTargetName(program))					@@\
-									@@\
-CplusplusProgramTargetHelper(program,SRCS,OBJS,DEPLIBS,$(LOCAL_LIBRARIES),NullParameter) @@\
-									@@\
-DependTarget()								@@\
-LintTarget()								@@\
-									@@\
-clean::									@@\
-	RemoveFile(ProgramTargetName(program))
-#endif /* ComplexCplusplusProgramTarget */
-
-#ifndef UseInstalled
-# define LinkBuildDLL(binary) MakeDir($(BUILDBINDIR:/=\))		@@\
-	RemoveFile(Concat($(BUILDBINDIR:/=\)\,binary))			@@\
-	cd $(BUILDBINDIR:/=\) && $(LN) Concat($(BUILDBINTOP:/=\)\$(CURRENT_DIR:/=\)\,binary) .
-
-# ifdef LinkBuildBinary
-#  undef LinkBuildBinary
-# endif
-# define LinkBuildBinary(binary)					@@\
-all:: $(BUILDBINDIR)\ProgramTargetName(binary) ProgramTargetName(binary) @@\
-									@@\
-$(BUILDBINDIR)\ProgramTargetName(binary): ProgramTargetName(binary)	@@\
-	MakeDir($(BUILDBINDIR:/=\))					@@\
-	RemoveFile($(BUILDBINDIR:/=\)\ProgramTargetName(binary)))	@@\
-	cd $(BUILDBINDIR:/=\) && $(LN) $(BUILDBINTOP:/=\)\$(CURRENT_DIR:/=\)\ProgramTargetName(binary) .
-
-# ifdef LinkBuildLibrary
-#  undef LinkBuildLibrary
-# endif
-# define LinkBuildLibrary(lib) MakeDir($(BUILDLIBDIR:/=\))		@@\
-	RemoveFile(Concat($(BUILDLIBDIR:/=\)\,lib))			@@\
-	cd $(BUILDLIBDIR:/=\) && $(LN) Concat($(BUILDLIBTOP:/=\)\$(CURRENT_DIR:/=\)\,lib) .
-
-#endif
-
-#ifndef ProjectUnsharedLibReferences
-#define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir) @@\
-Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/lib,buildlibdir/,libname.lib)	@@\
-Concat(varname,LIB) = $(Concat3(DEP,varname,LIB))			@@\
-LintLibReferences(varname,libname,libsource)
-#endif
-
-
-/*
- * ServerTargetWithFlags - generate rules to compile, link, and relink a server
- */
-#ifndef ServerTargetWithFlags
-#define	ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,flags) @@\
-XVARdef0 = objects							@@\
-									@@\
-AllTarget(ProgramTargetName(server))					@@\
-ProgramTargetName(server): subdirs $(XVARuse0:.o=.obj) libs		@@\
-	MoveToBakFile($@)						@@\
-	LinkRule($@,$(LDOPTIONS),$(XVARuse0:.o=.obj),libs $(LDLIBS) syslibs) @@\
-									@@\
-Concat(load,server):							@@\
-	MoveToBakFile(ProgramTargetName(server))			@@\
-	LinkRule(ProgramTargetName(server),$(LDOPTIONS),$(XVARuse0:.o=.obj),libs $(LDLIBS) syslibs) @@\
-									@@\
-loadX:: Concat(load,server)						@@\
-									@@\
-ProofProgramTarget(server,subdirs objects libs,objects libs $(LDLIBS) syslibs) @@\
-ProofLinkTarget(Concat(load,server),server,objects libs $(LDLIBS) syslibs) @@\
-									@@\
-InstallProgramWithFlags(server,$(BINDIR),flags)				@@\
-									@@\
-clean::									@@\
-	RemoveFile(ProgramTargetName(server))
-#endif /* ServerTargetWithFlags */
--- a/Xvnc/config/cf/WinLib.tmpl
+++ /dev/null
@@ -1,13 +0,0 @@
-XCOMM $XConsortium: WinLib.tmpl /main/3 1996/11/13 14:43:09 lehors $
-
-#define SharedOldXReqs $(LDPRELIBS) $(XLIBONLY)
-#define SharedXtReqs $(LDPRELIBS) $(XLIBONLY)
-#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XLIB)
-#define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB)
-#define SharedXextReqs $(LDPRELIBS) $(XLIBONLY)
-#define SharedXiReqs $(LDPRELIBS) $(XLIB)
-#define SharedPexReqs $(LDPRELIBS) $(XLIBONLY) MathLibrary
-#define SharedXtstReqs $(LDPRELIBS) $(XLIB)
-#define SharedXieReqs $(LDPRELIBS) $(XLIBONLY)
-#define SharedSMReqs $(LDPRELIBS) $(ICELIB)
-#define SharedXpReqs $(LDPRELIBS) $(XAUTHLIB) $(EXTENSIONLIB) $(XLIBONLY)
--- a/Xvnc/config/cf/X11.rules
+++ /dev/null
@@ -1,102 +0,0 @@
-XCOMM $TOG: X11.rules /main/4 1997/04/30 15:23:24 kaleb $
-
-/* Note whether we are the top level project. */
-#ifndef SeenTopLevelProject
-# define SeenTopLevelProject	YES
-# define X11IsTopLevelProject	YES
-#else
-# define X11IsTopLevelProject	NO
-#endif
-
-/* 
- * If no clues are given assume X11 is in the tree, otherwise
- * UseInstalled overrides UseImports.  Do not do both. 
- */
-#ifndef UseInstalledX11
-# define UseInstalledX11	NO
-#endif
-#ifdef UseInstalled
-# undef UseInstalledX11
-# define UseInstalledX11	YES
-#endif
-
-#ifndef ImportX11
-# ifdef UseImports
-#  define ImportX11		YES
-# else
-#  define ImportX11		NO
-# endif
-#endif
-#if UseInstalledX11
-# undef ImportX11
-# define ImportX11		NO
-#endif
-
-#ifdef X11ProjectRoot
-# define XUsrLibDirPath	$(USRLIBDIR):$(XPROJECTROOT)/lib
-#else
-# define XUsrLibDirPath	$(USRLIBDIR)
-#endif
-#ifdef UsrLibDirPath
-# undef UsrLibDirPath
-#endif
-#define UsrLibDirPath	XUsrLibDirPath
-
-#if ImportX11
-# define XLdPreLibs	-L$(LIBSRC)
-#elif defined(UseInstalledX11) && defined(X11ProjectRoot)
-# define XLdPreLibs	-L$(XPROJECTROOT)/lib
-#else
-# define XLdPreLibs	/**/
-#endif
-#ifdef LdPreLibs
-# undef LdPreLibs
-#endif
-#define LdPreLibs	LdPreLib XLdPreLibs
-
-#ifdef X11ProjectRoot
-# define XLdPostLibs	-L$(XPROJECTROOT)/lib
-#else
-# define XLdPostLibs	/**/
-#endif
-#ifdef LdPostLibs
-# undef LdPostLibs
-#endif
-#define LdPostLibs	LdPostLib XLdPostLibs
-
-#if ImportX11
-# define TopXInclude	-I$(TOP)/imports/x11/include
-#elif !UseInstalledX11
-# define TopXInclude	-I$(TOP)/exports/include
-#else
-# define TopXInclude	-I$(XPROJECTROOT)/include
-#endif
-#ifdef TopIncludes
-# undef TopIncludes
-#endif
-#define TopIncludes	TopInclude $(TOP_X_INCLUDES)
-
-#if UseInstalledX11 && defined(X11ProjectRoot)
-# define X11BuildLibPath	$(XPROJECTROOT)/lib
-#elif UseInstalledX11
-# define X11BuildLibPath	$(USRLIBDIR)
-#elif ImportX11
-# define X11BuildLibPath	$(XTOP)/lib
-#else
-# define X11BuildLibPath	$(TOP)/exports/lib
-#endif
-#ifdef SystemBuildLibPath
-# define BuildLibPath		$(XENVLIBDIR):$(SYSTEMENVLIBDIR)
-#else
-# define BuildLibPath		$(XENVLIBDIR)
-#endif
-
-#ifndef X11ProjectDefines
-# define X11ProjectDefines	/**/
-#endif
-#define ProjectDefines	X11ProjectDefines
-
-#ifndef X11CplusplusProjectDefines
-# define X11CplusplusProjectDefines	X11ProjectDefines
-#endif
-#define CplusplusProjectDefines	X11CplusplusProjectDefines
--- a/Xvnc/config/cf/X11.tmpl
+++ /dev/null
@@ -1,1815 +0,0 @@
-XCOMM ----------------------------------------------------------------------
-XCOMM X Window System Build Parameters and Rules
-XCOMM $TOG: X11.tmpl /main/292 1997/05/20 10:05:59 kaleb $
-XCOMM
-XCOMM
-XCOMM
-XCOMM
-XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.8.2.4 1998/01/23 12:35:08 dawes Exp $
-
-/***************************************************************************
- *                                                                         *
- *                            DEFAULT DEFINITIONS                          *
- *                                                                         *
- * The following section contains defaults for things that can             *
- * overridden in the various *.cf and site.def files.  DO NOT EDIT!        *
- *                                                                         *
- **************************************************************************/
-
-#define ProjectX		603	/* do *not* change this line */
-
-/* The following project-specific rules are defined at the end of this file:
- *
- * InstallAppDefaults		(class)
- * InstallAppDefaultsLong	(file,class)
- * MakeFontsDir			(deplist)
- * MakeFonts			()
- * InstallFontObjs		(objs,dest)
- * InstallFonts			(dest)
- * InstallFontAliases		(dest)
- * FontSrc			(basename)
- * FontBaseObj			(basename)
- * InstallFontScale		(dest)
- * UncompressedFontTarget	(basename)
- * CompressedFontTarget		(basename)
- * FontTarget			(basename)
- * FontObj			(basename)
- * MakeXkbDir			(basedir,subdir)
- */
-
-/*
- * X-specific things
- */
-#ifndef HasXServer
-#define HasXServer		YES
-#endif
-#ifndef BuildServer
-#define BuildServer		HasXServer
-#endif
-#ifndef BuildServersOnly
-#define BuildServersOnly	NO
-#endif
-#ifndef BuildFontServer
-#define BuildFontServer		YES
-#endif
-#ifndef BuildFonts
-#define BuildFonts		(BuildServer | BuildFontServer)
-#endif
-#ifndef Build75DpiFonts
-#define Build75DpiFonts		YES
-#endif
-#ifndef Build100DpiFonts
-#define Build100DpiFonts	YES
-#endif
-#ifndef BuildSpeedoFonts
-#define BuildSpeedoFonts	YES
-#endif
-#ifndef BuildType1Fonts
-#define BuildType1Fonts		YES
-#endif
-#ifndef BuildCyrillicFonts
-#define BuildCyrillicFonts	NO
-#endif
-#ifndef UseKoi8RForCyrillic
-#define UseKoi8RForCyrillic	NO
-#endif
-#ifndef HasXAudio
-#define HasXAudio		NO
-#endif
-#ifndef BuildXAudio
-#define BuildXAudio		(HasXAudio & HasCplusplus)
-#endif
-#ifndef HasXAServer
-#define HasXAServer		NO
-#endif
-#ifndef BuildXAServer
-#define BuildXAServer		(HasXAServer & HasCplusplus)
-#endif
-#ifndef BuildMITMiscExt
-#define BuildMITMiscExt		YES
-#endif
-#ifndef BuildTestExt
-#define BuildTestExt		YES
-#endif
-#ifndef BuildSyncExt
-#define BuildSyncExt		YES
-#endif
-#ifndef BuildXCMiscExt
-#define BuildXCMiscExt		YES
-#endif
-#ifndef BuildShapeExt
-#define BuildShapeExt		YES
-#endif
-#ifndef BuildBigReqsExt
-#define BuildBigReqsExt		YES
-#endif
-#ifndef BuildPhigs
-#define BuildPhigs		NO
-#endif
-#ifndef BuildPexExt
-#define BuildPexExt		NO
-#endif
-#ifndef BuildXInputExt
-#define BuildXInputExt		NO
-#endif
-#ifndef BuildDIS
-#define BuildDIS		NO
-#endif
-#ifndef BuildXIE
-#define BuildXIE		YES
-#endif
-#ifndef BuildXIElib
-#define BuildXIElib		BuildXIE
-#endif
-#ifndef BuildXKB
-#define BuildXKB		YES
-#endif
-#ifndef BuildXKBlib
-#define BuildXKBlib		BuildXKB
-#endif
-#ifndef BuildXKBuilib
-#define BuildXKBuilib		BuildXKB
-#endif
-	/*
-	 * WARNING: Setting UseXKBInClients to YES cause incompatibilities
-	 *          between many clients (such as xterm) and pre-XKB shared
-	 *          libraries.
-	 */
-#ifndef UseXKBInClients
-#define	UseXKBInClients		NO	/* use XKB in "normal" clients? */
-#endif
-#ifndef BuildDBE
-#define BuildDBE		YES
-#endif
-#ifndef BuildDBElib
-#define BuildDBElib		BuildDBE
-#endif
-#ifndef BuildMultibuffer
-#define BuildMultibuffer	NO
-#endif
-#ifndef BuildRECORD
-#define BuildRECORD		YES
-#endif
-#ifndef BuildRECORDlib
-#define BuildRECORDlib		BuildRECORD
-#endif
-#ifndef BuildLBX
-#define BuildLBX		YES
-#endif
-#ifndef BuildXCSecurity
-#define BuildXCSecurity		YES
-#endif
-#ifndef BuildAppgroup
-#define BuildAppgroup		YES
-#endif
-#ifndef HasPlugin
-#define HasPlugin		NO
-#endif
-#ifndef BuildPlugin
-#define BuildPlugin		HasPlugin
-#endif
-#ifndef XprtServer
-#define XprtServer		BuildServer
-#endif
-#ifndef BuildXprint
-#if XprtServer
-#define BuildXprint		YES
-#else
-#define BuildXprint		NO
-#endif
-#endif
-#ifndef BuildScreenSaverExt
-#define BuildScreenSaverExt	NO
-#endif
-#ifndef BuildScreenSaverLibrary
-#define BuildScreenSaverLibrary	BuildScreenSaverExt
-#endif
-#ifndef BuildXF86VidModeExt
-#define BuildXF86VidModeExt	NO
-#endif
-#ifndef BuildXF86VidModeLibrary
-#define BuildXF86VidModeLibrary BuildXF86VidModeExt
-#endif
-#ifndef BuildXF86MiscExt
-#define BuildXF86MiscExt	NO
-#endif
-#ifndef BuildXF86MiscLibrary
-#define BuildXF86MiscLibrary	BuildXF86MiscExt
-#endif
-#ifndef BuildXF86DGA
-#define BuildXF86DGA		NO
-#endif
-#ifndef BuildXF86DGALibrary
-#define BuildXF86DGALibrary	BuildXF86DGA
-#endif
-#ifndef BuildDPMSExt
-#define BuildDPMSExt		NO
-#endif
-#ifndef BuildDPMSLibrary
-#define BuildDPMSLibrary	BuildDPMSExt
-#endif
-
-#ifndef InstallLibManPages
-#define InstallLibManPages	YES
-#endif
-#ifndef InstallXtermSetUID
-#define InstallXtermSetUID	YES	/* xterm needs to be set uid */
-#endif
-#ifndef InstallXinitConfig
-#define InstallXinitConfig	NO	/* install sample xinit config */
-#endif
-#ifndef InstallXdmConfig
-#define InstallXdmConfig	NO	/* install sample xdm config */
-#endif
-#ifndef XdmServersType			/* what Xservers files to use */
-#if BuildServer
-#define XdmServersType ws
-#else
-#define XdmServersType fs
-#endif
-#endif
-#ifndef InstallFSConfig
-#define InstallFSConfig		NO	/* install sample fs config */
-#endif
-#ifndef InstallAppDefFiles
-#define InstallAppDefFiles	YES	/* install application defaults */
-#endif
-#ifndef CompressAllFonts
-#define CompressAllFonts	NO
-#endif
-#ifndef ThreadedX
-#if HasPosixThreads || HasCThreads
-#define ThreadedX		YES	/* multi-threaded libraries */
-#else
-#define ThreadedX		NO
-#endif
-#endif
-#ifndef ThreadedProject
-#define ThreadedProject ThreadedX
-#endif
-#ifndef HasWChar32
-#define HasWChar32		SystemV4
-#endif
-#ifndef HasXdmAuth
-#define HasXdmAuth		NO	/* if you can not use XDM-AUTH* */
-#endif
-#ifndef PrimaryScreenResolution
-#define PrimaryScreenResolution 72		/* a common resolution */
-#endif
-#ifndef DefaultFontPath
-#if PrimaryScreenResolution < 88		/* (75 + 100) / 2 */
-#define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/Speedo/,$(FONTDIR)/Type1/,$(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/
-#else
-#define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/Speedo/,$(FONTDIR)/Type1/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/
-#endif
-#endif
-#ifndef DefaultRGBDatabase
-#define DefaultRGBDatabase $(LIBDIR)/rgb
-#endif
-#ifndef UseRgbTxt
-#define UseRgbTxt		NO	/* default is to compile with dbm */
-#endif
-#ifndef UseMemLeak
-#define UseMemLeak		NO
-#endif
-#ifndef SpecialMalloc
-#define SpecialMalloc		NO
-#endif
-#ifndef UseInternalMalloc
-#define UseInternalMalloc	NO
-#endif
-#ifndef FontCompilerFlags
-#define FontCompilerFlags -t
-#endif
-#ifndef ConnectionFlags
-#if HasStreams
-#define ConnectionFlags -DSTREAMSCONN
-#else
-#if HasDECnet
-#define ConnectionFlags -DTCPCONN -DUNIXCONN -DDNETCONN
-#else
-#define ConnectionFlags -DTCPCONN -DUNIXCONN
-#endif
-#endif
-#endif
-#ifndef ProjectThreadsDefines
-#define ProjectThreadsDefines -DXTHREADS
-#endif
-#ifndef FontOSDefines
-#define FontOSDefines /**/
-#endif
-#ifndef FontDefines
-#define FontDefines -DFONT_SNF -DFONT_BDF -DFONT_PCF -DCOMPRESSED_FONTS FontOSDefines
-#endif
-#ifndef XawI18nDefines
-#if SystemV4
-#define XawI18nDefines -DHAS_WCTYPE_H
-#else
-#define XawI18nDefines -DUSE_XWCHAR_STRING
-#endif
-#endif
-#if Malloc0ReturnsNull
-#ifndef XMalloc0ReturnsNullDefines
-#define XMalloc0ReturnsNullDefines Malloc0ReturnsNullDefines
-#endif
-#ifndef XtMalloc0ReturnsNullDefines
-#define XtMalloc0ReturnsNullDefines Malloc0ReturnsNullDefines
-#endif
-#endif
-#ifndef ExtensionOSDefines
-#define ExtensionOSDefines /**/
-#endif
-
-#ifndef ExtensionDefines
-#ifndef MITMiscDefines
-#if BuildMITMiscExt
-#define MITMiscDefines -DMITMISC
-#else
-#define MITMiscDefines /**/
-#endif
-#endif
-#ifndef XTestDefines
-#if BuildTestExt
-#define XTestDefines -DXTEST
-#else
-#define XTestDefines /**/
-#endif
-#endif
-#ifndef XSyncDefines
-#if BuildSyncExt
-#define XSyncDefines -DXSYNC
-#else
-#define XSyncDefines /**/
-#endif
-#endif
-#ifndef XCMiscDefines
-#if BuildXCMiscExt
-#define XCMiscDefines -DXCMISC
-#else
-#define XCMiscDefines /**/
-#endif
-#endif
-#ifndef ShapeDefines
-#if BuildShapeExt
-#define ShapeDefines -DSHAPE
-#else
-#define ShapeDefines /**/
-#endif
-#endif
-#ifndef PexDefines
-#if BuildPexExt
-#define PexDefines -DPEXEXT
-#else
-#define PexDefines /**/
-#endif
-#endif
-#ifndef GlxDefines
-#if BuildGlxExt
-#define GlxDefines -DGLXEXT
-#else
-#define GlxDefines /**/
-#endif
-#endif
-#ifndef ShmDefines
-#if HasShm
-#define ShmDefines -DMITSHM
-#else
-#define ShmDefines /**/
-#endif
-#endif
-#ifndef XInputDefines
-#if BuildXInputExt
-#define XInputDefines -DXINPUT
-#else
-#define XInputDefines /**/
-#endif
-#endif
-#ifndef XieDefines
-#if BuildXIE
-#define XieDefines -DXIE
-#else
-#define XieDefines /**/
-#endif
-#endif
-#ifndef PrintOnlyServer
-#define PrintOnlyServer YES
-#endif
-#ifndef XprintDefines
-#if BuildXprint
-#if PrintOnlyServer
-#define XprintDefines -DPIXPRIV
-#else
-#define XprintDefines -DXPRINT -DPIXPRIV
-#endif
-#else
-#define XprintDefines /**/
-#endif
-#endif
-#ifndef XkbDefines
-#if BuildXKB
-#define XkbDefines -DXKB
-#else
-#define XkbDefines /**/
-#endif
-#endif
-#ifndef XkbClientDefines
-#if UseXKBInClients
-#define XkbClientDefines -DXKB
-#else
-#define XkbClientDefines /**/
-#endif
-#endif
-#ifndef XkbServerDefines
-#define XkbServerDefines /**/
-#endif
-#ifndef LbxDefines
-#if BuildLBX
-#define LbxDefines -DLBX
-#else
-#define LbxDefines /**/
-#endif
-#endif
-#ifndef BigReqDefines
-#if BuildBigReqsExt
-#define BigReqDefines -DBIGREQS
-#else
-#define BigReqDefines /**/
-#endif
-#endif
-
-#ifndef DBEDefines
-#if BuildDBE
-#define DBEDefines -DDBE
-#else
-#define DBEDefines /**/
-#endif
-#endif
-
-#ifndef PervasiveDBEDefines
-#define PervasiveDBEDefines /* -DNEED_DBE_BUF_BITS -DNEED_DBE_BUF_VALIDATE */
-#endif
-
-#ifndef MultibufferDefines
-#if BuildMultibuffer
-#define MultibufferDefines -DMULTIBUFFER
-#else
-#define MultibufferDefines /**/
-#endif
-#endif
-
-#ifndef ScreenSaverExtensionDefines
-#if BuildScreenSaverExt
-#define ScreenSaverExtensionDefines -DSCREENSAVER
-#else
-#define ScreenSaverExtensionDefines /**/
-#endif
-#endif
-#ifndef VidTuneExtensionDefines
-#if BuildXF86VidModeExt
-#define VidTuneExtensionDefines -DXF86VIDMODE
-#else
-#define VidTuneExtensionDefines /**/
-#endif
-#endif
-#ifndef XF86MiscExtensionDefines
-#if BuildXF86MiscExt
-#define XF86MiscExtensionDefines -DXF86MISC
-#else
-#define XF86MiscExtensionDefines /**/
-#endif
-#endif
-
-#ifndef DPMSExtensionDefines
-#if BuildDPMSExt
-#define DPMSExtensionDefines -DDPMSExtension
-#else
-#define DPMSExtensionDefines /**/
-#endif
-#endif
-
-#ifndef RECORDDefines
-#if BuildRECORD
-#define RECORDDefines -DXRECORD
-#else
-#define RECORDDefines /**/
-#endif
-#endif
-
-#ifndef AppgroupDefines
-#if BuildAppgroup
-#define AppgroupDefines -DXAPPGROUP
-#else
-#define AppgroupDefines /**/
-#endif
-#endif
-
-#ifndef XCSecurityDefines
-#if BuildXCSecurity
-#define XCSecurityDefines -DXCSECURITY
-#else
-#define XCSecurityDefines /**/
-#endif
-#endif
-
-#ifndef SitePervasiveExtensionDefines
-#define SitePervasiveExtensionDefines /**/
-#endif
-#ifndef PervasiveExtensionDefines
-#define PervasiveExtensionDefines ShapeDefines XInputDefines XkbDefines \
-				  LbxDefines AppgroupDefines \
-				  XCSecurityDefines PervasiveDBEDefines \
-				  DPMSExtensionDefines \
-				  XprintDefines SitePervasiveExtensionDefines
-#endif
-#ifndef SiteExtensionDefines
-#define SiteExtensionDefines /**/
-#endif
-#ifndef BaseExtensionDefines
-#define BaseExtensionDefines MultibufferDefines MITMiscDefines XTestDefines \
-			     XSyncDefines XCMiscDefines RECORDDefines \
-			     PexDefines GlxDefines ShmDefines XieDefines BigReqDefines \
-			     VidTuneExtensionDefines XF86MiscExtensionDefines \
-			     DBEDefines ScreenSaverExtensionDefines \
-			     SiteExtensionDefines
-#endif
-#define ExtensionDefines BaseExtensionDefines ExtensionOSDefines
-#endif /* ExtensionDefines */
-
-#ifndef HasStrcasecmp
-#define HasStrcasecmp YES
-#endif
-
-#ifndef StrcasecmpDefines
-# if HasStrcasecmp
-#  define StrcasecmpDefines /**/
-# else
-#  define StrcasecmpDefines -DNEED_STRCASECMP
-# endif
-#endif
-
-#ifndef ServerXdmcpDefines
-#define ServerXdmcpDefines -DXDMCP
-#endif
-#ifndef ServerOSDefines
-#define ServerOSDefines /**/
-#endif
-#if HasKrb5
-#ifndef Krb5Defines
-#define Krb5Defines -DK5AUTH
-#endif
-#else
-#define Krb5Defines /**/
-#endif
-#ifndef ServerExtraDefines
-#define ServerExtraDefines /* -DPIXPRIV */
-#endif
-#ifndef ServerAssertDefines
-#define ServerAssertDefines -DNDEBUG
-#endif
-#ifndef ServerDefines
-#define ServerDefines StandardDefines PervasiveExtensionDefines ServerExtraDefines ServerAssertDefines
-#endif
-#ifndef PexDipexDefines
-#define PexDipexDefines /**/
-#endif
-#ifndef PexDdpexDefines
-#define PexDdpexDefines /**/
-#endif
-#ifndef PexPhigsDefines
-#ifndef PexShmIPC
-#define PexShmIPC HasShm
-#endif
-#if PexShmIPC
-#define PexPhigsDefines /**/
-#else
-#define PexPhigsDefines -DPEX_API_SOCKET_IPC
-#endif
-#endif
-#ifndef PexClientDefines
-#define PexClientDefines -DPEX_SI_PHIGS
-#endif
-#ifndef PhigsInclude
-#ifdef UseInstalled
-#define PhigsInclude -I$(INCDIR)/X11
-#else
-#define PhigsInclude -I$(BUILDINCDIR)
-#endif
-#endif
-#ifndef PexCDebugFlags
-#define PexCDebugFlags DebuggableCDebugFlags
-#endif
-#ifndef PexCCOptions
-#ifdef LibraryCCOptions
-#define PexCCOptions LibraryCCOptions
-#else
-#define PexCCOptions DefaultCCOptions
-#endif
-#endif
-#ifndef DefaultFSConfigFile
-#define DefaultFSConfigFile $(LIBDIR)/fs/config
-#endif
-#ifndef BinDir
-#ifdef ProjectRoot
-#define BinDir Concat(ProjectRoot,/bin)
-#else
-#define BinDir /usr/bin/X11
-#endif
-#endif
-#ifndef BuildIncRoot
-#define BuildIncRoot $(TOP)/exports
-#endif
-#ifndef BuildIncDir
-#define BuildIncDir $(BUILDINCROOT)/include
-#endif
-#ifndef BuildIncTop
-#define BuildIncTop ../..	/* relative to BuildIncDir */
-#endif
-#ifndef XTop
-# if ImportX11
-#  define XTop $(TOP)/imports/x11
-# else
-#  define XTop $(TOP)
-# endif
-#endif
-#ifndef XBuildIncRoot
-# if ImportX11
-#  define XBuildIncRoot	$(XTOP)
-# else
-#  define XBuildIncRoot	$(XTOP)/exports
-# endif
-#endif
-#ifndef XBuildIncDir
-# define XBuildIncDir	$(XBUILDINCROOT)/include/X11
-#endif
-#ifndef XBuildIncTop
-# define XBuildIncTop	../../..
-#endif
-#ifndef XBuildBinDir
-# define XBuildBinDir	$(XBUILDINCROOT)/bin
-#endif
-#ifndef BuildBinDir
-#define BuildBinDir $(TOP)/exports/bin
-#endif
-#ifndef BuildBinTop
-#define BuildBinTop ../..	/* relative to BuildBinDir */
-#endif
-#ifndef BuildLibDir
-#define BuildLibDir $(TOP)/exports/lib
-#endif
-#ifndef BuildLibTop
-#define BuildLibTop ../..	/* relative to BuildLibDir */
-#endif
-#ifndef LibDir
-#define LibDir $(USRLIBDIR)/X11
-#endif
-#ifndef ConfigDir
-#define ConfigDir $(LIBDIR)/config
-#endif
-#ifndef FontDir
-#define FontDir $(LIBDIR)/fonts
-#endif
-#ifndef AdmDir
-#define AdmDir /usr/adm
-#endif
-#ifndef XinitDir
-#define XinitDir $(LIBDIR)/xinit
-#endif
-#ifndef XdmDir
-#define XdmDir $(LIBDIR)/xdm
-#endif
-#ifndef XdmVarDir
-#define XdmVarDir $(VARLIBDIR)/xdm
-#endif
-#ifndef XdmAuthDir
-#define XdmAuthDir $(LIBDIR)/xdm
-#endif
-#ifndef XdmConfigurationSubdirectory		/* under xdm sources */
-#define XdmConfigurationSubdirectory config
-#endif
-#ifndef TwmDir
-#define TwmDir $(LIBDIR)/twm
-#endif
-#ifndef XsmDir
-#define XsmDir $(LIBDIR)/xsm
-#endif
-#ifndef NlsDir
-#define NlsDir $(LIBDIR)/nls
-#endif
-#ifndef XLocaleDir
-#define XLocaleDir $(LIBDIR)/locale
-#endif
-#ifndef PexApiDir
-#define PexApiDir $(LIBDIR)/PEX
-#endif
-#ifndef LbxproxyDir
-#define LbxproxyDir $(LIBDIR)/lbxproxy
-#endif
-#ifndef LbxproxyConfigSubdir		/* under lbxproxy sources */
-#define LbxproxyConfigSubdir config
-#endif
-#ifndef ProxyManagerDir
-#define ProxyManagerDir $(LIBDIR)/proxymngr
-#endif
-#ifndef XPrintDir
-#define XPrintDir $(LIBDIR)
-#endif
-#ifndef ServerConfigDir
-#define ServerConfigDir $(LIBDIR)/xserver
-#endif
-#ifndef VarDirectory
-#define VarDirectory /var/X11
-#endif
-#ifndef InstallSecurityConfig
-#define InstallSecurityConfig YES	/* Install sample security policy */
-#endif
-#ifndef XFileSearchPathBase
-/* avoid SCCS keyword */
-#define XFileSearchPathBase Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S)
-#endif
-#ifndef XFileSearchPathDefault
-#ifdef XAppLoadDir
-/* avoid SCCS keyword */
-#define XFileSearchPathDefault XAppLoadDir/Concat(%N%C,%S):XAppLoadDir/%N%S:XFileSearchPathBase
-#else
-#define XFileSearchPathDefault XFileSearchPathBase
-#endif
-#endif
-#ifndef XAppLoadDir
-#define XAppLoadDir $(LIBDIR)/app-defaults
-#endif
-#ifndef XtErrorPrefix
-#define XtErrorPrefix /* as empty string */
-#endif
-#ifndef XtExtraDefines
-#define XtExtraDefines /* as empty string */
-#endif
-#ifndef XtWarningPrefix
-#define XtWarningPrefix /* as empty string */
-#endif
-#ifndef OsNameDefines
-#define OsNameDefines /* as nothing */
-#endif
-#ifndef DefaultUserPath			/* for xdm */
-#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb
-#endif
-#ifndef DefaultSystemPath		/* for xdm */
-#define DefaultSystemPath /etc:/bin:/usr/bin:$(BINDIR):/usr/ucb
-#endif
-#ifndef DefaultSystemShell		/* for xdm to set in SHELL */
-#define DefaultSystemShell BourneShell
-#endif
-#ifndef ContribDir
-#define ContribDir $(XTOP)/../contrib	/* contrib is outside core tree */
-#endif
-#ifndef UnsupportedDir
-#define UnsupportedDir $(XTOP)/unsupported
-#endif
-#ifndef AllocateLocalDefines
-#define AllocateLocalDefines /**/
-#endif
-
-#ifndef ForceNormalLib
-#define ForceNormalLib (HasGcc && !HasGcc2)
-#endif
-
-#ifndef XkbComp
-#define XkbComp xkbcomp
-#endif
-
-XCOMM -----------------------------------------------------------------------
-XCOMM X Window System make variables; these need to be coordinated with rules
-
-/*
- * This list must be reflected in the DIRS_TO_BUILD list in the top-level
- * Makefile.
- */
-             XTOP = XTop
-           BINDIR = BinDir		/* programs */
-     BUILDINCROOT = BuildIncRoot	/* base of build loc */
-      BUILDINCDIR = BuildIncDir		/* built headers */
-      BUILDINCTOP = BuildIncTop		/* top relative to BUILDINCDIR */
-      BUILDLIBDIR = BuildLibDir		/* built libraries */
-      BUILDLIBTOP = BuildLibTop		/* top relative to BUILDLIBDIR */
-      BUILDBINDIR = BuildBinDir		/* built binaries */
-      BUILDBINTOP = BuildBinTop		/* top relative to BUILDBINDIR */
-    XBUILDINCROOT = XBuildIncRoot	/* base of X build loc */
-     XBUILDINCDIR = XBuildIncDir
-     XBUILDINCTOP = XBuildIncTop
-     XBUILDBINDIR = XBuildBinDir
-           INCDIR = $(INCROOT)		/* header files */
-           ADMDIR = AdmDir		/* server log files */
-           LIBDIR = LibDir		/* rgb, XErrorDB, etc. */
-   TOP_X_INCLUDES = TopXInclude
-
-#ifdef VarDirectory
-           VARDIR = VarDirectory
-#endif
-
-          FONTDIR = FontDir		/* font directories */
-         XINITDIR = XinitDir		/* xinit config files */
-           XDMDIR = XdmDir		/* xdm config files */
-        XDMVARDIR = XdmVarDir		/* xdm config files */
-           TWMDIR = TwmDir		/* twm config files */
-           XSMDIR = XsmDir		/* xsm config files */
-           NLSDIR = NlsDir		/* nls files */
-       XLOCALEDIR = XLocaleDir		/* locale files */
-        PEXAPIDIR = PexApiDir		/* PEX support files */
-      LBXPROXYDIR = LbxproxyDir	        /* lbxproxy files */
-  PROXYMANAGERDIR = ProxyManagerDir	/* proxy manager config files */
-        XPRINTDIR = XPrintDir		/* print config file root */
-      XAPPLOADDIR = XAppLoadDir		/* application default resource dir */
-       FONTCFLAGS = FontCompilerFlags
-
-     INSTAPPFLAGS = $(INSTDATFLAGS)	/* XXX - this should go away - XXX */
-
-#if UseInstalledX11
-              RGB = rgb			/* assume BINDIR in path */
-            FONTC = bdftopcf		/* assume BINDIR in path */
-        MKFONTDIR = mkfontdir		/* assume BINDIR in path */
-#else
-              RGB = $(CLIENTENVSETUP) $(XBUILDBINDIR)/rgb
-            FONTC = $(CLIENTENVSETUP) $(XBUILDBINDIR)/bdftopcf
-        MKFONTDIR = $(CLIENTENVSETUP) $(XBUILDBINDIR)/mkfontdir
-#endif
-
-       DOCUTILSRC = $(XTOP)/doc/util
-        CLIENTSRC = $(TOP)/clients
-          DEMOSRC = $(TOP)/demos
-       XDOCMACROS = $(DOCUTILSRC)/macros.t
-       XIDXMACROS = $(DOCUTILSRC)/indexmacros.t
-       PROGRAMSRC = $(TOP)/programs
-           LIBSRC = $(XTOP)/lib
-          FONTSRC = $(XTOP)/fonts
-       INCLUDESRC = BuildIncDir
-      XINCLUDESRC = $(INCLUDESRC)/X11
-        SERVERSRC = $(XTOP)/programs/Xserver
-       CONTRIBSRC = ContribDir
-   UNSUPPORTEDSRC = UnsupportedDir
-           DOCSRC = $(XTOP)/doc
-           RGBSRC = $(XTOP)/programs/rgb
-      BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
-     MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
-    FONTSERVERSRC = $(PROGRAMSRC)/xfs
-       FONTINCSRC = $(XTOP)/include/fonts
-        EXTINCSRC = $(XTOP)/include/extensions
-     TRANSCOMMSRC = $(LIBSRC)/xtrans
-   TRANS_INCLUDES = -I$(TRANSCOMMSRC)
-#ifdef X11ProjectRoot
-     XPROJECTROOT = X11ProjectRoot
-#endif
-#if HasSharedLibraries
-#ifndef DontUseLibPathVar
-#ifndef BuildLibPathVar
-#define BuildLibPathVar LD_LIBRARY_PATH
-#endif
-#endif
-#endif
-#ifdef BuildLibPathVar
-# ifdef SystemBuildLibPath
-  SYSTEMENVLIBDIR = SystemBuildLibPath
-# endif
-       XENVLIBDIR = X11BuildLibPath
-   CLIENTENVSETUP = BuildLibPathVar=BuildLibPath
-#else
-   CLIENTENVSETUP = 
-#endif
-
-#ifndef ShLibIncludeFile
-/* need this to make ANSI-style preprocessors happy */
-#define ShLibIncludeFile <noop.rules>
-#endif
-
-#include ShLibIncludeFile
-
-#ifndef XBuildLibDir
-# define XBuildLibDir	BuildLibDir
-#endif
-
-#ifndef SharedLibX11
-#define SharedLibX11 HasSharedLibraries
-#endif
-#ifndef NormalLibX11
-#define NormalLibX11 (!SharedLibX11 | ForceNormalLib)
-#endif
-#ifndef DebugLibX11
-#define DebugLibX11		NO	/* debugged X library */
-#endif
-#ifndef ProfileLibX11
-#define ProfileLibX11		NO	/* profiled X library */
-#endif
-          XLIBSRC = $(LIBSRC)/X11
-#if SharedLibX11
-#ifndef SharedX11Rev
-#define SharedX11Rev 6.1
-#endif
-SharedLibReferences(XONLY,X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev)
-#else
-ProjectUnsharedLibReferences(XONLY,X11,$(XLIBSRC),XBuildLibDir)
-#endif
-         XLIBONLY = $(XONLYLIB)
-
-#if BuildThreadStubLibrary
-#ifndef SharedLibXThrStub
-#define SharedLibXThrStub YES
-#endif
-#ifndef NormalLibXThrStub
-#define NormalLibXThrStub NO
-#endif
-#ifndef DebugLibXThrStub
-#define DebugLibXThrStub NO
-#endif
-#ifndef ProfileLibXThrStub
-#define ProfileLibXThrStub NO
-#endif
-   XTHRSTUBLIBSRC = $(LIBSRC)/XThrStub
-#if SharedLibXThrStub
-#ifndef SharedXThrStubRev
-#define SharedXThrStubRev 6.0
-#endif
-SharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBLIBSRC),SOXTHRSTUBREV,SharedXThrStubRev)
-#else
-ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir)
-#endif
-#endif
-
-#if BuildScreenSaverLibrary
-#ifndef SharedLibXss
-#define SharedLibXss	NO
-#endif
-#ifndef NormalLibXss
-#define NormalLibXss	YES
-#endif
-#ifndef DebugLibXss
-#define DebugLibXss	NO
-#endif
-#ifndef ProfileLibXss
-#define ProfileLibXss	NO
-#endif
-#endif
-
-#if BuildXF86MiscLibrary
-#ifndef SharedLibXxf86misc
-#define SharedLibXxf86misc	NO
-#endif
-#ifndef NormalLibXxf86misc
-#define NormalLibXxf86misc	YES
-#endif
-#ifndef DebugLibXxf86misc
-#define DebugLibXxf86misc	NO
-#endif
-#ifndef ProfileLibXxf86misc
-#define ProfileLibXxf86misc	NO
-#endif
-#endif
-
-#if BuildXF86VidModeLibrary
-#ifndef SharedLibXxf86vm
-#define SharedLibXxf86vm	NO
-#endif
-#ifndef NormalLibXxf86vm
-#define NormalLibXxf86vm	YES
-#endif
-#ifndef DebugLibXxf86vm
-#define DebugLibXxf86vm		NO
-#endif
-#ifndef ProfileLibXxf86vm
-#define ProfileLibXxf86vm	NO
-#endif
-#endif
-
-#if BuildXF86DGALibrary
-#ifndef SharedLibXxf86dga
-#define SharedLibXxf86dga	NO
-#endif
-#ifndef NormalLibXxf86dga
-#define NormalLibXxf86dga	YES
-#endif
-#ifndef DebugLibXxf86dga
-#define DebugLibXxf86dga	NO
-#endif
-#ifndef ProfileLibXxf86dga
-#define ProfileLibXxf86dga	NO
-#endif
-#endif
-
-#if BuildDPMSLibrary
-#ifndef SharedLibXdpms
-#define SharedLibXdpms		NO
-#endif
-#ifndef NormalLibXdpms
-#define NormalLibXdpms		YES
-#endif
-#ifndef DebugLibXdpms
-#define DebugLibXdpms		NO
-#endif
-#ifndef ProfileLibXdpms
-#define ProfileLibXdpms		NO
-#endif
-#endif
-
-#ifndef SharedLibXext
-#define SharedLibXext HasSharedLibraries
-#endif
-#ifndef NormalLibXext
-#define NormalLibXext (!SharedLibXext | ForceNormalLib)
-#endif
-#ifndef DebugLibXext
-#define DebugLibXext		NO	/* debugged Xext library */
-#endif
-#ifndef ProfileLibXext
-#define ProfileLibXext		NO	/* profiled Xext library */
-#endif
-      XEXTLIBSRC = $(LIBSRC)/Xext
-#if SharedLibXext
-#ifndef SharedXextRev
-#define SharedXextRev 6.3
-#endif
-SharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),SOXEXTREV,SharedXextRev)
-#else
-ProjectUnsharedLibReferences(EXTENSION,Xext,$(XEXTLIBSRC),XBuildLibDir)
-#endif
-LINTEXTENSIONLIB = $(LINTEXTENSION)
-          DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB)
-             XLIB = $(EXTENSIONLIB) $(XONLYLIB)
-         LINTXLIB = $(LINTXONLYLIB)
-
-#if BuildScreenSaverLibrary
-    XSSLIBSRC = $(LIBSRC)/Xss
-#if SharedLibXss
-#ifndef SharedXssRev
-#define SharedXssRev 1.0
-#endif
-SharedLibReferences(XSS,Xss,$(XSSLIBSRC),SOXSSREV,SharedXssRev)
-#else
-ProjectUnsharedLibReferences(XSS,Xss,$(XSSLIBSRC),XBuildLibDir)
-#endif
-#endif
-
-#if BuildXF86MiscLibrary
-    XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc
-#if SharedLibXxf86misc
-#ifndef SharedXxf86miscRev
-#define SharedXxf86miscRev 1.0
-#endif
-SharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),SOXXF86MISCREV,SharedXxf86miscRev)
-#else
-ProjectUnsharedLibReferences(XXF86MISC,Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir)
-#endif
-#endif
-
-#if BuildXF86VidModeLibrary
-    XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm
-#if SharedLibXxf86vm
-#ifndef SharedXxf86vmRev
-#define SharedXxf86vmRev 1.0
-#endif
-SharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),SOXXF86VMREV,SharedXxf86vmRev)
-#else
-ProjectUnsharedLibReferences(XXF86VM,Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir)
-#endif
-#endif
-
-#if BuildXF86DGALibrary
-    XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga
-#if SharedLibXxf86dga
-#ifndef SharedXxf86dgaRev
-#define SharedXxf86dgaRev 1.0
-#endif
-SharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedXxf86dgaRev)
-#else
-ProjectUnsharedLibReferences(XXF86DGA,Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir)
-#endif
-#endif
-
-#if BuildDPMSLibrary
-    XDPMSLIBSRC = $(LIBSRC)/Xdpms
-#if SharedLibXdpms
-#ifndef SharedXdpmsRev
-#define SharedXdpmsRev 1.0
-#endif
-SharedLibReferences(XDPMS,Xdpms,$(XDPMSLIBSRC),SOXDPMSREV,SharedXdpmsRev)
-#else
-ProjectUnsharedLibReferences(XDPMS,Xdpms,$(XDPMSLIBSRC),XBuildLibDir)
-#endif
-#endif
-
-#ifndef SharedLibXau
-#define SharedLibXau NO		/* don't need shared form */
-#endif
-#ifndef NormalLibXau
-#define NormalLibXau (!SharedLibXau | ForceNormalLib)
-#endif
-#ifndef DebugLibXau
-#define DebugLibXau		NO	/* debugged auth library */
-#endif
-#ifndef ProfileLibXau
-#define ProfileLibXau		NO	/* profiled auth library */
-#endif
-         XAUTHSRC = $(LIBSRC)/Xau
-#if SharedLibXau
-#ifndef SharedXauRev
-#define SharedXauRev 6.0
-#endif
-SharedLibReferences(XAUTH,Xau,$(XAUTHSRC),SOXAUTHREV,SharedXauRev)
-#else
-ProjectUnsharedLibReferences(XAUTH,Xau,$(XAUTHSRC),XBuildLibDir)
-#endif
-
-#ifndef SharedLibXdmcp
-#define SharedLibXdmcp NO	/* don't need shared form */
-#endif
-#ifndef NormalLibXdmcp
-#define NormalLibXdmcp (!SharedLibXdmcp | ForceNormalLib)
-#endif
-#ifndef DebugLibXdmcp
-#define DebugLibXdmcp		NO	/* debugged XDMCP library */
-#endif
-#ifndef ProfileLibXdmcp
-#define ProfileLibXdmcp		NO	/* profiled XDMCP library */
-#endif
-      XDMCPLIBSRC = $(LIBSRC)/Xdmcp
-#if SharedLibXdmcp
-#ifndef SharedXdmcpRev
-#define SharedXdmcpRev 6.0
-#endif
-SharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),SOXDMCPREV,SharedXdmcpRev)
-#else
-ProjectUnsharedLibReferences(XDMCP,Xdmcp,$(XDMCPLIBSRC),XBuildLibDir)
-#endif
-
-#ifndef SharedLibXmu
-#define SharedLibXmu HasSharedLibraries
-#endif
-#ifndef NormalLibXmu
-#define NormalLibXmu (!SharedLibXmu | ForceNormalLib)
-#endif
-#ifndef DebugLibXmu
-#define DebugLibXmu		NO	/* debugged Xmu library */
-#endif
-#ifndef ProfileLibXmu
-#define ProfileLibXmu		NO	/* profiled Xmu library */
-#endif
-           XMUSRC = $(LIBSRC)/Xmu
-#if SharedLibXmu
-#ifndef SharedXmuRev
-#define SharedXmuRev 6.0
-#endif
-SharedDSLibReferences(XMU,Xmu,$(XMUSRC),SOXMUREV,SharedXmuRev)
-#else
-ProjectUnsharedLibReferences(XMU,Xmu,$(XMUSRC),XBuildLibDir)
-#endif
-
-#ifndef SharedOldX
-#define SharedOldX HasSharedLibraries
-#endif
-#ifndef NormalOldX
-#define NormalOldX (!SharedOldX | ForceNormalLib)
-#endif
-#ifndef DebugOldX
-#define DebugOldX		NO	/* debugged old X library */
-#endif
-#ifndef ProfileOldX
-#define ProfileOldX		NO	/* profiled old X library */
-#endif
-       OLDXLIBSRC = $(LIBSRC)/oldX
-#if SharedOldX
-#ifndef SharedOldXRev
-#define SharedOldXRev 6.0
-#endif
-SharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev)
-#else
-ProjectUnsharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),XBuildLibDir)
-#endif
-
-#ifndef SharedLibXp
-#define SharedLibXp HasSharedLibraries
-#endif
-#ifndef NormalLibXp
-#define NormalLibXp (!SharedLibXp | ForceNormalLib)
-#endif
-#ifndef DebugLibXp
-#define DebugLibXp              NO      /* debugged Xp library */
-#endif
-#ifndef ProfileLibXp
-#define ProfileLibXp            NO      /* profiled Xp library */
-#endif
-         XPLIBSRC = $(LIBSRC)/Xp
-#if SharedLibXp
-#ifndef SharedXpRev
-#define SharedXpRev 6.2
-#endif
-SharedLibReferences(XP,Xp,$(XPLIBSRC),SOXPREV,SharedXpRev)
-#else
-ProjectUnsharedLibReferences(XP,Xp,$(XPLIBSRC),XBuildLibDir)
-#endif
-
-#ifndef SharedLibXt
-#define SharedLibXt HasSharedLibraries
-#endif
-#ifndef NormalLibXt
-#define NormalLibXt (!SharedLibXt | ForceNormalLib)
-#endif
-#ifndef DebugLibXt
-#define DebugLibXt		NO	/* debugged toolkit library */
-#endif
-#ifndef ProfileLibXt
-#define ProfileLibXt		NO	/* profiled toolkit library */
-#endif
-       TOOLKITSRC = $(LIBSRC)/Xt
-#if SharedLibXt
-#ifndef SharedXtRev
-#define SharedXtRev 6.0
-#endif
-SharedDSLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev)
-#else
-ProjectUnsharedLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),XBuildLibDir)
-#endif
-      DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB)
-         XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB)
-     LINTXTOOLLIB = $(LINTXTOOLONLYLIB)
-
-#ifndef SharedLibXa
-#define SharedLibXa	(HasSharedLibraries & HasCplusplus)
-#endif
-#ifndef NormalLibXa
-/* #define NormalLibXa	((!SharedLibXa | ForceNormalLib) & HasCplusplus) */
-#define NormalLibXa	YES /* needed for current tests, will correct later */
-#endif
-#ifndef DebugLibXa
-#define DebugLibXa	NO	/* debugged audio library */
-#endif
-#ifndef ProfileLibXa
-#define ProfileLibXa	NO	/* profiled audio library */
-#endif
-       XALIBSRC = $(LIBSRC)/Xa
-#if SharedLibXa
-#ifndef SharedXaRev
-#define SharedXaRev 1.0
-#endif
-SharedLibReferences(XA,Xa,$(XALIBSRC),SOXAREV,SharedXaRev)
-#else
-UnsharedLibReferences(XA,Xa,$(XALIBSRC))
-#endif
-
-#ifndef SharedLibXaw
-#define SharedLibXaw HasSharedLibraries
-#endif
-#ifndef NormalLibXaw
-#define NormalLibXaw (!SharedLibXaw | ForceNormalLib)
-#endif
-#ifndef DebugLibXaw
-#define DebugLibXaw		NO	/* debugged widget library */
-#endif
-#ifndef ProfileLibXaw
-#define ProfileLibXaw		NO	/* profiled widget library */
-#endif
-       AWIDGETSRC = $(LIBSRC)/Xaw
-#if SharedLibXaw
-#ifndef SharedXawRev
-#define SharedXawRev 6.1
-#endif
-SharedDSLibReferences(XAW,Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev)
-#else
-ProjectUnsharedLibReferences(XAW,Xaw,$(AWIDGETSRC),XBuildLibDir)
-#endif
-
-#ifndef SharedLibXi
-#define SharedLibXi HasSharedLibraries
-#endif
-#ifndef NormalLibXi
-#define NormalLibXi (!SharedLibXi | ForceNormalLib)
-#endif
-#ifndef DebugLibXi
-#define DebugLibXi		NO	/* debugged Xi library */
-#endif
-#ifndef ProfileLibXi
-#define ProfileLibXi		NO	/* profiled Xi library */
-#endif
-         XILIBSRC = $(LIBSRC)/Xi
-#if SharedLibXi
-#ifndef SharedXiRev
-#define SharedXiRev 6.0
-#endif
-SharedLibReferences(XI,Xi,$(XILIBSRC),SOXINPUTREV,SharedXiRev)
-#else
-ProjectUnsharedLibReferences(XI,Xi,$(XILIBSRC),XBuildLibDir)
-#endif
-
-#ifndef SharedLibXtst
-#define SharedLibXtst HasSharedLibraries
-#endif
-#ifndef NormalLibXtst
-#define NormalLibXtst (!SharedLibXtst | ForceNormalLib)
-#endif
-#ifndef DebugLibXtst
-#define DebugLibXtst		NO	/* debugged Xtst library */
-#endif
-#ifndef ProfileLibXtst
-#define ProfileLibXtst		NO	/* profiled Xtst library */
-#endif
-      XTESTLIBSRC = $(LIBSRC)/Xtst
-#if SharedLibXtst
-#ifndef SharedXtstRev
-#define SharedXtstRev 6.1
-#endif
-SharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),SOXTESTREV,SharedXtstRev)
-#else
-ProjectUnsharedLibReferences(XTEST,Xtst,$(XTESTLIBSRC),XBuildLibDir)
-#endif
-
-#ifndef SharedLibPex
-#define SharedLibPex HasSharedLibraries
-#endif
-#ifndef NormalLibPex
-#define NormalLibPex (!SharedLibPex | ForceNormalLib)
-#endif
-#ifndef DebugLibPex
-#define DebugLibPex		NO	/* debugged PEX5 library */
-#endif
-#ifndef ProfileLibPex
-#define ProfileLibPex		NO	/* profiled PEX5 library */
-#endif
-        PEXLIBSRC = $(LIBSRC)/PEX5
-#if SharedLibPex
-#ifndef SharedPexRev
-#define SharedPexRev 6.0
-#endif
-SharedLibReferences(PEX,PEX5,$(PEXLIBSRC),SOPEXREV,SharedPexRev)
-#else
-ProjectUnsharedLibReferences(PEX,PEX5,$(PEXLIBSRC),XBuildLibDir)
-#endif
-
-#ifndef SharedLibXie
-#define SharedLibXie HasSharedLibraries
-#endif
-#ifndef NormalLibXie
-#define NormalLibXie (!SharedLibXie | ForceNormalLib)
-#endif
-#ifndef DebugLibXie
-#define DebugLibXie		NO	/* debugged XIE library */
-#endif
-#ifndef ProfileLibXie
-#define ProfileLibXie		NO	/* profiled XIE library */
-#endif
-        XIELIBSRC = $(LIBSRC)/XIE
-#if SharedLibXie
-#ifndef SharedXieRev
-#define SharedXieRev 6.0
-#endif
-SharedLibReferences(XIE,XIE,$(XIELIBSRC),SOXIEREV,SharedXieRev)
-#else
-ProjectUnsharedLibReferences(XIE,XIE,$(XIELIBSRC),XBuildLibDir)
-#endif
-
-#ifndef SharedLibPhigs
-#define SharedLibPhigs NO	/* XXX - haven't made it sharable yet */
-#endif
-#ifndef NormalLibPhigs
-#define NormalLibPhigs (!SharedLibPhigs | ForceNormalLib)
-#endif
-      PHIGSLIBSRC = $(LIBSRC)/PHIGS
-#if SharedLibPhigs
-#ifndef SharedPhigsRev
-#define SharedPhigsRev 6.0
-#endif
-SharedLibReferences(PHIGS,phigs,$(PHIGSLIBSRC),SOPHIGSREV,SharedPhigsRev)
-#else
-ProjectUnsharedLibReferences(PHIGS,phigs,$(PHIGSLIBSRC),XBuildLibDir)
-#endif
-
-ProjectUnsharedLibReferences(XBSD,Xbsd,$(LIBSRC)/Xbsd,XBuildLibDir)
-
-#ifndef SharedLibICE
-#define SharedLibICE HasSharedLibraries
-#endif
-#ifndef NormalLibICE
-#define NormalLibICE (!SharedLibICE | ForceNormalLib)
-#endif
-#ifndef DebugLibICE
-#define DebugLibICE		NO	/* debugged ICE library */
-#endif
-#ifndef ProfileLibICE
-#define ProfileLibICE		NO	/* profiled ICE library */
-#endif
-           ICESRC = $(LIBSRC)/ICE
-#if SharedLibICE
-#ifndef SharedICERev
-#define SharedICERev 6.3
-#endif
-SharedLibReferences(ICE,ICE,$(ICESRC),SOICEREV,SharedICERev)
-#else
-ProjectUnsharedLibReferences(ICE,ICE,$(ICESRC),XBuildLibDir)
-#endif
-
-#ifndef SharedLibSM
-#define SharedLibSM HasSharedLibraries
-#endif
-#ifndef NormalLibSM
-#define NormalLibSM (!SharedLibSM | ForceNormalLib)
-#endif
-#ifndef DebugLibSM
-#define DebugLibSM		NO	/* debugged SM library */
-#endif
-#ifndef ProfileLibSM
-#define ProfileLibSM		NO	/* profiled SM library */
-#endif
-            SMSRC = $(LIBSRC)/SM
-#if SharedLibSM
-#ifndef SharedSMRev
-#define SharedSMRev 6.0
-#endif
-SharedLibReferences(SM,SM,$(SMSRC),SOSMREV,SharedSMRev)
-#else
-ProjectUnsharedLibReferences(SM,SM,$(SMSRC),XBuildLibDir)
-#endif
-
-#ifndef SharedLibXkey
-#define SharedLibXkey HasSharedLibraries
-#endif
-#ifndef NormalLibXkey
-#define NormalLibXkey (!SharedLibXkey | ForceNormalLib)
-#endif
-#ifndef DebugLibXkey
-#define DebugLibXkey		NO	/* debugged Xkey library */
-#endif
-#ifndef ProfileLibXkey
-#define ProfileLibXkey		NO	/* profiled Xkey library */
-#endif
-           XKEYSRC = $(LIBSRC)/Xkey
-#if SharedLibXkey
-#ifndef SharedXkeyRev
-#define SharedXkeyRev 6.0
-#endif
-SharedLibReferences(XKEY,Xkey,$(XKEYSRC),SOXKEYREV,SharedXkeyRev)
-#else
-ProjectUnsharedLibReferences(XKEY,Xkey,$(XKEYSRC),XBuildLibDir)
-#endif
-
-#ifndef SharedLibFS
-#define SharedLibFS		NO	/* for now */
-#endif
-#ifndef NormalLibFS
-#define NormalLibFS (!SharedLibFS | ForceNormalLib)
-#endif
-#ifndef DebugLibFS
-#define DebugLibFS		NO	/* debugged FS library */
-#endif
-#ifndef ProfileLibFS
-#define ProfileLibFS		NO	/* profiled FS library */
-#endif
-         FSLIBSRC = $(LIBSRC)/FS
-#if SharedLibFS
-#ifndef SharedFSRev
-#define SharedFSRev 6.0
-#endif
-SharedLibReferences(FS,FS,$(FSLIBSRC),SOFSREV,SharedFSRev)
-#else
-ProjectUnsharedLibReferences(FS,FS,$(FSLIBSRC),XBuildLibDir)
-#endif
-
-         FONTLIBSRC = $(LIBSRC)/font
-ProjectUnsharedLibReferences(FONT,font,$(FONTLIBSRC),XBuildLibDir)
-
-          XPMLIBSRC = $(LIBSRC)/Xpm
-#if SharedLibXpm
-#ifndef SharedXpmRev
-#define SharedXpmRev 4.8
-#endif
-SharedLibReferences(XPM,Xpm,$(XPMLIBSRC),SOXPMREV,SharedXpmRev)
-#else
-ProjectUnsharedLibReferences(XPM,Xpm,$(XPMLIBSRC),XBuildLibDir)
-#endif
-
-#ifndef LdLibraryPath
-#define LdLibraryPath LD_LIBRARY_PATH
-#endif
-
-#ifdef BuildXKBlib
-    XKBFILELIBSRC = $(LIBSRC)/xkbfile
-ProjectUnsharedLibReferences(XKBFILE,xkbfile,$(XKBFILELIBSRC),XBuildLibDir)
-#ifndef XkbClientDepLibs
-#if UseXKBInClients
-#define XkbClientDepLibs $(DEPXKBFILELIB)
-#else
-#define XkbClientDepLibs /**/
-#endif
-#endif
-#ifndef XkbClientLibs
-#if UseXKBInClients
-#define XkbClientLibs $(XKBFILELIB)
-#else
-#define XkbClientLibs /**/
-#endif
-#endif
-#if defined(UseInstalled) || defined(OS2Architecture)
-     XKBCOMPCMD = XkbComp                       /* assume BINDIR in path */
-#else
-     XKBCOMPSRC = $(PROGRAMSRC)/xkbcomp
-     XKBCOMPCMD = $(CLIENTENVSETUP) $(XKBCOMPSRC)/xkbcomp
-#endif
-#else /* !BuildXKBlib */
-#ifndef XkbClientDepLibs
-#define XkbClientDepLibs
-#endif
-#ifndef XkbClientLibs
-#define XkbClientLibs
-#endif
-#endif /* BuildXKBlib */
-
-#ifdef BuildXKBuilib
-    XKBUILIBSRC = $(LIBSRC)/xkbui
-ProjectUnsharedLibReferences(XKBUI,xkbui,$(XKBUILIBSRC),XBuildLibDir)
-#ifndef XkbuiLibs
-#define	XkbuiLibs $(XKBUILIB)
-#endif
-#ifndef XkbuiDepLibs
-#define	XkbuiDepLibs $(DEPXKBFILELIB)
-#endif
-#else /* !BuildXKBuilib */
-#ifndef XkbuiLibs
-#define	XkbuiLibs
-#endif
-#ifndef XkbuiDepLibs
-#define	XkbuiDepLibs
-#endif
-#endif /* BuildXKBuilib */
-
-#ifndef XawClientDepLibs
-#define XawClientDepLibs $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
-#endif
-#ifndef XawClientLibs
-#define XawClientLibs $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-#endif
-
-#ifndef NeedDefaultDepLibs
-#define NeedDefaultDepLibs YES
-#endif
-
-#if NeedDefaultDepLibs
-/*
- * Individual libraries should override this
- */
-#if HasSharedLibraries || defined(UseInstalled)
-          DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
-#else
-          DEPLIBS = $(LOCAL_LIBRARIES)
-#endif
-         DEPLIBS1 = $(DEPLIBS)
-         DEPLIBS2 = $(DEPLIBS)
-         DEPLIBS3 = $(DEPLIBS)
-         DEPLIBS4 = $(DEPLIBS)
-         DEPLIBS5 = $(DEPLIBS)
-         DEPLIBS6 = $(DEPLIBS)
-         DEPLIBS7 = $(DEPLIBS)
-         DEPLIBS8 = $(DEPLIBS)
-         DEPLIBS9 = $(DEPLIBS)
-         DEPLIBS10 = $(DEPLIBS)
-#endif /* NeedDefaultDepLibs */
-
-
-/*
- * InstallAppDefaults - simple rules to install application default file
- */
-#ifndef InstallAppDefaults
-#define InstallAppDefaults(class) InstallAppDefaultsLong(class,class)
-#endif /* InstallAppDefaults */
-
-/*
- * InstallAppDefaultsLong - general rule to install application default file
- * if the InstallAppDefFiles configuration parameter is set.
- */
-#ifndef InstallAppDefaultsLong
-#if InstallAppDefFiles
-#define InstallAppDefaultsLong(file,class)				@@\
-LinkVarDirectory(app-defaults,.,app-defaults,.)				@@\
-InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
-#else
-#define InstallAppDefaultsLong(file,class)				@@\
-LinkVarDirectory(app-defaults,.,app-defaults,.)				@@\
-InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class)
-#endif /* InstallAppDefFiles */
-#endif /* InstallAppDefaultsLong */
-
-/*
- * MakeFontsDir - generate rules to build fonts.dir database.
- */
-#ifndef MakeFontsDir
-#define MakeFontsDir(deplist)						@@\
-all:: fonts.dir								@@\
-									@@\
-fonts.dir:  deplist							@@\
-	RunProgram(MKFONTDIR,.)						@@\
-									@@\
-clean::									@@\
-	RemoveFile(fonts.dir)
-#endif /* MakeFontsDir */
-
-
-/*
- * MakeFonts - generate rules to build font database.
- */
-#ifndef MakeFonts
-#define MakeFonts()							@@\
-all::  $(OBJS)								@@\
-									@@\
-MakeFontsDir($(OBJS))							@@\
-									@@\
-clean::									@@\
-	RemoveFiles(*.pcf *.pcf.Z *.pcf.gz)
-#endif /* MakeFonts */
-
-
-/*
- * InstallFontObjs - generate rules to install font files
- */
-#ifndef InstallFontObjs
-#define InstallFontObjs(objs,dest)					@@\
-InstallMultipleFlags(objs,dest,$(INSTDATFLAGS))				@@\
-									@@\
-InstallTarget(install,fonts.dir,$(INSTDATFLAGS),dest)
-#endif /* InstallFontObjs */
-
-
-/*
- * InstallFonts - generate rules to install font files
- */
-#ifndef InstallFonts
-#define InstallFonts(dest)						@@\
-InstallFontObjs($(OBJS),dest)
-#endif /* InstallFonts */
-
-
-/*
- * InstallFontAliases - generate rules to install font aliases databases. 
- */
-#ifndef InstallFontAliases
-#define InstallFontAliases(dest)					@@\
-InstallTarget(install,fonts.alias,$(INSTDATFLAGS),dest)
-#endif /* InstallFontAliases */
-
-#ifndef FontSrc
-#define FontSrc(basename) basename.bdf
-#endif
-
-#ifndef FontBaseObj
-#define FontBaseObj(basename)basename.pcf
-#endif
-
-/*
- * InstallFontScale - generate rules to install font scale database.
- */
-#ifndef InstallFontScale
-#define InstallFontScale(dest)						@@\
-InstallTarget(install,fonts.scale,$(INSTDATFLAGS),dest)
-#endif /* InstallFontScale */
-
-/*
- * UncompressedFontTarget
- */
-#ifndef UncompressedFontTarget
-#define UncompressedFontTarget(basename)				@@\
-FontBaseObj(basename):  FontSrc(basename)				@@\
-	RunProgram(FONTC,$(FONTCFLAGS) $? -o $@)
-#endif /* UncompressedFontTarget */
-
-/*
- * CompressedFontTarget
- */
-#ifndef GzipFontCompression
-#define GzipFontCompression NO
-#endif
-
-#ifndef CompressedFontTarget
-#if GzipFontCompression
-#define CompressedFontTarget(basename)					@@\
-FontBaseObj(basename).gz:  FontSrc(basename)				@@\
-	RunProgram(FONTC,$(FONTCFLAGS) $?) | $(GZIPCMD) > $@
-#else
-#define CompressedFontTarget(basename)					@@\
-FontBaseObj(basename).Z:  FontSrc(basename)				@@\
-	RunProgram(FONTC,$(FONTCFLAGS) $?) | $(COMPRESS) > $@
-#endif
-#endif /* CompressedFontTarget */
-
-#if !defined(FontTarget) && !defined(FontObj)
-#ifdef CompressAllFonts
-#define FontTarget(basename) CompressedFontTarget(basename)
-#if GzipFontCompression
-#define FontObj(basename) FontBaseObj(basename).gz
-#else
-#define FontObj(basename) FontBaseObj(basename).Z
-#endif
-#else
-#define FontTarget(basename) UncompressedFontTarget(basename)
-#define FontObj(basename) FontBaseObj(basename)
-#endif /* CompressAllFonts */
-#endif
-
-/*
- * MakeXkbDir
- */
-#ifndef MakeXkbDir
-#define MakeXkbDir(basedir,subdir)					@@\
-all::   Concat(subdir,.dir)						@@\
-									@@\
-Concat(subdir,.dir):							@@\
-	$(XKBCOMPCMD) -lfhlpR -o Concat(subdir,.dir) '*'		@@\
-									@@\
-InstallTarget(install,Concat(subdir,.dir),$(INSTDATFLAGS),basedir)
-#endif
-
-/*
- * PostProcessTroffPS - by default moves the working output into place,
- * but can be a hook for more complicated post-processing.
- */
-#ifndef PostProcessTroffPS
-#define PostProcessTroffPS(temp,real) $(MV) temp real
-#endif
-
-#ifndef MakeSimpleDoc
-#define MakeSimpleDoc(file,srcs)					@@\
-all:: file.PS								@@\
-.PRECIOUS: file.PS							@@\
-									@@\
-file.PS: srcs								@@\
-	-$(TROFF) $(MSMACROS) $(XDOCMACROS) srcs 2> index.raw > file.nPS \@@\
-	&& PostProcessTroffPS(file.nPS,$@)				@@\
-	@if grep '^[^1-9.]' index.raw; then exit 1; else test $$? = 1; fi @@\
-									@@\
-file.txt: srcs								@@\
-	$(NROFF) $(MSMACROS) $(XDOCMACROS) srcs 2> index.raw > $@	@@\
-									@@\
-clean::									@@\
-	$(RM) index.raw file.nPS file.PS file.txt
-#endif
-
-#ifndef MakeTblDoc
-#define MakeTblDoc(file,srcs)						@@\
-all:: file.PS								@@\
-.PRECIOUS: file.PS							@@\
-									@@\
-file.PS: srcs								@@\
-	-$(TBL) $(XDOCMACROS) srcs | $(TROFF) $(MSMACROS) 2> index.raw > file.nPS \@@\
-	&& PostProcessTroffPS(file.nPS,$@)				@@\
-	@if grep '^[^1-9.]' index.raw; then exit 1; else test $$? = 1; fi @@\
-									@@\
-file.txt: srcs								@@\
-	$(TBL) $(XDOCMACROS) srcs | $(NROFF) $(MSMACROS) 2> index.raw | $(COL) > $@	@@\
-									@@\
-clean::									@@\
-	$(RM) index.raw file.nPS file.PS file.txt
-#endif
-
-#ifndef MakeEqnDoc
-#define MakeEqnDoc(file,srcs)						@@\
-all:: file.PS								@@\
-.PRECIOUS: file.PS							@@\
-									@@\
-file.PS: srcs								@@\
-	-$(TBL) $(XDOCMACROS) srcs | $(EQN) | $(TROFF) $(MSMACROS) 2> index.raw > file.nPS \@@\
-	&& PostProcessTroffPS(file.nPS,$@)				@@\
-	@if grep '^[^1-9.]' index.raw; then exit 1; else test $$? = 1; fi @@\
-									@@\
-file.txt: srcs								@@\
-	$(TBL) $(XDOCMACROS) srcs | $(NEQN) | $(NROFF) $(MSMACROS) 2> index.raw | $(COL) > $@ @@\
-									@@\
-clean::									@@\
-	$(RM) index.raw file.nPS file.PS file.txt
-#endif
-
-#ifndef MakeDocIndex
-#define MakeDocIndex(file,srcs)						@@\
-all:: file.idx.PS							@@\
-									@@\
-file.idx.PS: srcs index.raw						@@\
-	tail -1 index.raw > index.pageno				@@\
-	grep '^[1-9]' index.raw | sort -f '-t:' +1 -3 +0n -1n | awk -f $(DOCUTILSRC)/fixindex.awk | awk -f $(DOCUTILSRC)/block.awk > index.troff @@\
-	cat srcs $(XIDXMACROS) index.troff | $(TROFF) -me > file.idx.nPS \@@\
-	&& $(MV) file.idx.nPS $@					@@\
-	$(RM) index.troff index.pageno					@@\
-									@@\
-clean::									@@\
-	$(RM) index.troff index.pageno file.idx.nPS file.idx.PS
-#endif
-
-#ifndef MakeLatexDoc
-#if HasLatex
-#define MakeLatexDoc(file,src)	 					@@\
-all:: file.PS								@@\
-									@@\
-file.dvi: src	  							@@\
-	$(LATEX) src							@@\
-									@@\
-file.PS: file.dvi							@@\
-	$(DVIPS) -o file.nPS file && $(MV) file.nPS $@			@@\
-									@@\
-clean:: 								@@\
-	RemoveFiles(file.nPS file.PS file.dvi file.log)			@@\
-	RemoveFiles(file.aux file.toc file.lof file.lot)
-#else /* HasLatex */
-#define MakeLatexDoc(file,src)	 					@@\
-all::									@@\
-file.PS: src								@@\
-	@echo "cannot make file.PS: no latex on this system"; exit 1
-#endif /* HasLatex (else) */
-#endif /* MakeLatexDoc */
--- a/Xvnc/config/cf/apollo.cf
+++ /dev/null
@@ -1,38 +0,0 @@
-XCOMM platform:  $XConsortium: apollo.cf /main/34 1996/09/28 16:09:07 rws $
-
-/*
- * Minimally tested, and only in the bsd4.3 environment.  X_NOT_POSIX is not
- * in Xosdefs.h, because we suspect someone might want to try building with
- * POSIX support in the sysv environment (the OS doc seems to imply that
- * POSIX is supported in sysv).
- */
-
-#ifndef OSName
-#define OSName            Domain/OS SR10.3
-#endif
-XCOMM operating system:  OSName
-#ifndef OSMajorVersion
-#define OSMajorVersion    10
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion    3
-#endif
-
-#ifndef CCompilerMajorVersion
-#define CCompilerMajorVersion 6
-#endif
-#ifndef CCompilerMinorVersion
-#define CCompilerMinorVersion 8
-#endif
-
-#define StandardDefines -DX_NOT_POSIX
-#define BuildServer	NO
-#define HasNdbm		YES
-#define ConnectionFlags	-DTCPCONN
-
-#define	InstallManPageLong(file,destdir,dest)				@@\
-install.man:: file.man							@@\
-	MakeDir($(DESTDIR)destdir)					@@\
-	$(NROFF) $(MANMACROS) file.man > file.mantxt				@@\
-	$(INSTALL) -c $(INSTMANFLAGS) file.mantxt $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\
-	$(RM) file.mantxt
--- a/Xvnc/config/cf/bsd.cf
+++ /dev/null
@@ -1,29 +0,0 @@
-XCOMM platform:  $XConsortium: bsd.cf /main/24 1996/09/28 16:09:13 rws $
-
-#ifndef OSName
-#define OSName            4.3bsd
-#endif
-XCOMM operating system:  OSName
-#ifndef OSMajorVersion
-#define OSMajorVersion    4
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion    3
-#endif
-
-#define BootstrapCFlags -DNOSTDHDRS
-#define StandardDefines -DNOSTDHDRS -DCSRG_BASED
-#define HasVoidSignalReturn NO
-#define HasBsearch NO
-#define DirFailPrefix -
-#define AvoidNullMakeCommand	YES
-
-#define BuildServer NO
-
-#ifdef VaxArchitecture
-#define UnalignedReferencesAllowed YES	       /* if arbitrary deref is okay */
-#endif
-
-#if OSMajorVersion >= 4 && OSMinorVersion >= 3
-#define SetTtyGroup YES
-#endif
--- a/Xvnc/config/cf/bsdLib.rules
+++ /dev/null
@@ -1,238 +0,0 @@
-XCOMM $XConsortium: bsdLib.rules /main/3 1996/09/28 16:09:18 rws $
-
-
-
-
-
-XCOMM $XFree86: xc/config/cf/bsdLib.rules,v 3.4.2.1 1997/05/11 05:04:04 dawes Exp $
-/*
- * NetBSD/FreeBSD shared library rules
- */
-
-#ifndef UseElfFormat
-#define UseElfFormat NO
-#endif
-
-#if !UseElfFormat
-/* a.out shared libs */
-#ifndef HasSharedLibraries
-#define HasSharedLibraries YES
-#endif
-#ifndef SharedDataSeparation
-#define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef -DBSDSHLIB
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <bsdLib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags -Bshareable
-#endif
-#ifndef PositionIndependentCFlags
-#define PositionIndependentCFlags -fpic
-#endif
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-#define InstallSharedLibrary(libname,rev,dest)				@@\
-install:: Concat(lib,libname.so.rev)					@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest 
-@@\
-
-#endif /* InstallSharedLibrary */
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedLibraryTarget
-#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
-AllTarget(Concat(lib,libname.so.rev))					@@\
-									@@\
-Concat(lib,libname.so.rev):  solist $(EXTRALIBRARYDEPS)			@@\
-	$(RM) $@~							@@\
-	(cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
-	$(RM) $@							@@\
-	$(MV) $@~ $@							@@\
-	LinkBuildLibrary($@)						@@\
-									@@\
-clean::									@@\
-	$(RM) Concat(lib,libname.so.rev)
-
-#endif /* SharedLibraryTarget */
-
-#ifndef SharedDepModuleTarget
-#define SharedDepModuleTarget(name,deps,solist)				@@\
-AllTarget(name)								@@\
-									@@\
-name: deps								@@\
-	$(RM) $@~							@@\
-	$(LD) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)		@@\
-	$(RM) $@							@@\
-	$(MV) $@~ $@							@@\
-									@@\
-clean::									@@\
-	$(RM) name
-
-#endif /* SharedDepModuleTarget */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryDataTarget */
-
-#ifndef InstallSharedLibraryData
-#define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-/*
- * SharedLibReferences - variables for shared libraries
- */
-#ifndef SharedLibReferences
-#define SharedLibReferences(varname,libname,libsource,revname,rev)	@@\
-revname = rev								@@\
-Concat3(DEP,varname,LIB) = SharedLibDependencies(libname,libsource,revname) @@\
-Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname)		@@\
-LintLibReferences(varname,libname,libsource)
-#endif
-
-/*
- * SharedDSLibReferences - variables for shared libraries
- */
-#ifndef SharedDSLibReferences
-#define SharedDSLibReferences(varname,libname,libsource,revname,rev)	@@\
-revname = rev								@@\
-Concat3(DEP,varname,LIB) = SharedDSLibDependencies(libname,libsource,revname) @@\
-Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) Concat3(Shared,libname,Reqs)		@@\
-LintLibReferences(varname,libname,libsource)
-#endif
-
-#else /* UseElfFormat */
-
-/*
- * NetBSD/FreeBSD (ELF) shared library rules
- * Cloned from Linux ELF rules, with the following major change:
- *
- * 	Shared libraries depend on -lc.  Since we don't have to worry
- *	about libc vs. libg, etc., this is a good idea.  (This is actually
- *	implied by using $(CC) to build the shared libraries.)
- */
-
-#ifndef HasSharedLibraries
-#define HasSharedLibraries YES
-#endif
-#ifndef ForceNormalLib
-#define ForceNormalLib YES
-#endif
-
-#ifndef BaseShLibReqs
-#define BaseShLibReqs		/* -lc implied by $(CC) */
-#endif
-
-#ifndef SharedDataSeparation
-#define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef /**/
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <bsdLib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags -shared -Wl,-rpath,$(USRLIBDIR)
-#endif
-#ifndef PositionIndependentCFlags
-#define PositionIndependentCFlags -fPIC
-#endif
-#ifndef PositionIndependentCplusplusFlags
-#define PositionIndependentCplusplusFlags -fPIC
-#endif
-#ifndef ExtraLoadFlags
-#ifdef UseInstalled
-#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
-#else
-#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) -Wl,-rpath-link,$(BUILDLIBDIR)
-#endif
-#endif
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- * NOTE: file must be executable, hence "INSTBINFLAGS"
- */
-#ifndef InstallSharedLibrary
-#define InstallSharedLibrary(libname,rev,dest)				@@\
-install:: Concat(lib,libname.so.rev) 					@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
-	(T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`;\
-		$(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T)	@@\
-	(T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\.so.*$$/.so/'`;\
-		$(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T)	@@\
-	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
-	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-#define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedLibraryTarget
-#ifdef UseInstalled  
-#define LinkBuildSonameLibrary(lib) true
-#else
-#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
-	cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
-#endif
-
-#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
-AllTarget(Concat(lib,libname.so.rev))					@@\
-									@@\
-Concat(lib,libname.so.rev):  solist					@@\
-	$(RM) $@~							@@\
-	SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; \			@@\
-		(cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
-		$(RM) $$SONAME; $(LN) $@ $$SONAME; \			@@\
-		LinkBuildSonameLibrary($$SONAME)			@@\
-	$(RM) $@							@@\
-	$(MV) $@~ $@							@@\
-	$(RM) Concat(lib,libname.so)					@@\
-	$(LN) $@ Concat(lib,libname.so)					@@\
-	LinkBuildLibrary($@)						@@\
-	LinkBuildLibrary(Concat(lib,libname.so))			@@\
-									@@\
-clean::									@@\
-	$(RM) Concat(lib,libname.so.rev)
-
-#endif /* SharedLibraryTarget */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryTarget */
-
-#endif /* UseElfFormat */
--- a/Xvnc/config/cf/bsdLib.tmpl
+++ /dev/null
@@ -1,59 +0,0 @@
-XCOMM $XConsortium: bsdLib.tmpl /main/3 1996/09/28 16:09:25 rws $
-XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.3.2.1 1997/07/27 02:41:03 dawes Exp $
-
-/*
- * NetBSD/FreeBSD/OpenBSD shared library template
- */
-
-#if !UseElfFormat
-
-#ifndef SharedXtReqs
-#define SharedXtReqs /**/
-#endif
-#ifndef SharedXawReqs
-#define SharedXawReqs /**/
-#endif
-#ifndef SharedXmuReqs
-# if !defined(Mc68020Architecture) || !defined(OpenBSDArchitecture)
-#  define SharedXmuReqs $(LDPRELIBS) $(XTOOLONLYLIB) $(XONLYLIB)
-# else
-   /* At least the hp300 and the sun3 OpenBSD ports need that */
-#  define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(EXTENSIONLIB) $(XONLYLIB)
-# endif
-#endif
-
-#else /* UseElfFormat */
-
-/*
- * NetBSD/FreeBSD (ELF) shared library template
- * Cloned from Linux ELF rules, but with a minor number.
- */
-
-#ifndef FixupLibReferences
-#define FixupLibReferences()						@@\
-XMULIBONLY = -lXmu							@@\
-XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
-#endif
-
-#ifndef XawClientLibs
-#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
-#endif
-
-#define CplusplusLibC
-#define FrescoSysLibs	CplusplusLibC MathLibrary
-
-#define SharedX11Reqs
-#define SharedOldXReqs	$(LDPRELIB) $(XLIBONLY)
-#define SharedXtReqs	$(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB)
-#define SharedXawReqs	$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-#define SharedXmuReqs	$(LDPRELIB) $(XTOOLLIB) $(XLIB)
-#define SharedXextReqs	$(LDPRELIB) $(XLIBONLY)
-#define SharedXiReqs	$(LDPRELIB) $(XLIB)
-#define SharedPexReqs	$(LDPRELIB) $(XLIBONLY) MathLibrary
-#define SharedXtstReqs	$(LDPRELIB) $(XLIB)
-#define SharedXieReqs	$(LDPRELIB) $(XLIBONLY)
-#define SharedSMReqs	$(LDPRELIB) $(ICELIB)
-#define SharedFrescoReqs	$(LDPRELIB) $(XLIBONLY) FrescoSysLibs
-#define SharedXtfReqs	$(LDPRELIB) $(FRESCOLIB) $(XTOOLLIB) $(XLIB) FrescoSysLibs
-
-#endif /* UseElfFormat */
--- a/Xvnc/config/cf/bsdi.cf
+++ /dev/null
@@ -1,151 +0,0 @@
-XCOMM platform:  $XConsortium: bsdi.cf /main/22 1996/09/28 16:09:30 rws $
-XCOMM platform:  $XFree86: xc/config/cf/bsdi.cf,v 3.23.2.5 1998/02/09 14:33:21 robin Exp $
-
-#ifndef OSName
-#define OSName            BSD/OS 2.0
-#endif
-#ifndef OSVendor
-#define OSVendor          BSDI
-#endif
-XCOMM operating system:  OSName
-#ifndef OSMajorVersion
-#define OSMajorVersion    2
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion    0
-#endif
-
-#define HasPutenv	YES
-#define HasBSD44Sockets	YES
-
-XCOMM BSD/OS 2.0 comes with gcc 2.6.3 installed as gcc2 and gcc.
-XCOMM gcc 1.42 is installed as cc.
-XCOMM BSD/386 1.1 comes with gcc 2.5.8 installed as gcc2.
-XCOMM BSD/386 1.0 comes with gcc 1.40 as the only compiler.
-XCOMM The default is to use gcc2 on release 2.0 and 1.1 and gcc1 on 1.0
-XCOMM The defaults can be altered by defining "HasGcc2" as YES or NO in
-XCOMM xf86site.def
-
-#ifndef HasGcc
-# define HasGcc			YES
-#endif
-#if OSMajorVersion > 1 || OSMinorVersion >= 1
-# ifndef HasGcc2
-#  define HasGcc2		YES
-# endif
-#endif
-#if HasGcc2
-# ifndef HasGcc2ForCplusplus
-#  define HasGcc2ForCplusplus	YES
-# endif
-# define CcCmd			gcc2
-# define OptimizedCDebugFlags	DefaultGcc2i386Opt
-#else
-# define CcCmd			cc
-# define OptimizedCDebugFlags	-O
-#endif
-#define CppCmd		/usr/bin/cpp
-#define TroffCmd	groff -Tps
-#define MkdirHierCmd	mkdir -p
-#define SetTtyGroup	YES
-#define HasNdbm		YES
-#define HasWChar32      YES
-#define DirFailPrefix -
-#define AvoidNullMakeCommand YES
-# ifndef GccUsesGas
-#  define GccUsesGas    YES
-# endif
-#if HasGcc
-#if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit)
-#define DefaultCCOptions	/**/
-#else
-#define DefaultCCOptions	-ansi
-#endif
-#endif
-
-#if GccUsesGas
-# define GccGasOption -DGCCUSESGAS
-#else
-# define GccGasOption /**/
-#endif
-
-#define HasShm	YES
-#define ServerExtraDefines GccGasOption XFree86ServerDefines
-#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-#define XFree86ConsoleDefines /**/
-#define AsmDefines -DUSE_GAS
-
-#define StandardDefines	-DCSRG_BASED
-
-#define InstallCmd /usr/bin/install
-#define	EqnCmd eqn -Tps
-#define	NeqnCmd eqn -Tascii
-          COL = col
-         NEQN = NeqnCmd
-        NROFF = nroff
-
-#define DefaultUserPath		:/bin:/usr/bin:/usr/local/bin:$(BINDIR)
-#define DefaultSystemPath	/sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
-
-XCOMM Man pages need to be formatted when installed, so override the default
-XCOMM imake rules.
-
-#define ManSuffix       1
-#define ManSourcePath   $(MANPATH)/cat
-
-#define InstallManPageLong(file,destdir,dest)                           @@\
-all:: file.0								@@\
-									@@\
-file.0:: file.man							@@\
-	@if [ -f file.man ]; \						@@\
-	then \								@@\
-	cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \	@@\
-	cp /tmp/$$$$.man file.0; \					@@\
-	$(RM) /tmp/$$$$.man; \						@@\
-	fi 								@@\
-									@@\
-file.man::								@@\
-									@@\
-install.man::                                                           @@\
-	MakeDir($(DESTDIR)destdir)					@@\
-	-@if [ -f file.0 ]; \						@@\
-	then \								@@\
-	$(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\
-	fi
-
-#define InstallGenManPageLong(file,destdir,dest,suffix)			@@\
-	InstallManPageLong(file,destdir,dest)
-
-#define InstallMultipleManSuffix(list,dest,suff)                        @@\
-install.man:: 								@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	case '${MFLAGS}' in *[i]*) set +e;; esac; \			@@\
-	for i in list; do \                                             @@\
-	  (set -x; \							@@\
-	  cat $$i.suff | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.suff; \	@@\
-	  $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$$$.suff $(DESTDIR)dest/$$i.0; \	@@\
-	  $(RM) /tmp/$$$$.suff); \						@@\
-	done
-
-#define InstallMultipleMan(list,dest)                                   @@\
-	InstallMultipleManSuffix(list,dest,man)
-
-#define InstallManPageAliases(file,destdir,aliases)                     @@\
-install.man:: 								@@\
-	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
-	for i in aliases; do \                                          @@\
-		(set -x; \						@@\
-		$(RM) $(DESTDIR)destdir/$$i.0;\  			@@\
-		(cd $(DESTDIR)destdir; $(LN) file.0 $$i.0);\  		@@\
-		); \							@@\
-	done
-
-#define InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
-	InstallManPageAliases(file,destdir,aliases)
-
-/*
- * These seem redundant, but leave them in for now.
- */
-#define i386Bsd 1
-#define i386Bsdi 1
-#include <xfree86.cf>
--- a/Xvnc/config/cf/cde.rules
+++ /dev/null
@@ -1,226 +0,0 @@
-/* 
- *  @OSF_COPYRIGHT@
- *  COPYRIGHT NOTICE
- *  Copyright (c) 1990, 1991, 1992, 1993 Open Software Foundation, Inc.
- *  ALL RIGHTS RESERVED (MOTIF). See the file named COPYRIGHT.MOTIF for
- *  the full copyright text.
- *
- * (c) Copyright 1996 Digital Equipment Corporation.
- * (c) Copyright 1996 Hewlett-Packard Company.
- * (c) Copyright 1996 International Business Machines Corp.
- * (c) Copyright 1996 Sun Microsystems, Inc.
- * (c) Copyright 1996 Novell, Inc. 
- * (c) Copyright 1996 FUJITSU LIMITED.
- * (c) Copyright 1996 Hitachi.
- */ 
-XCOMM $XConsortium: cde.rules /main/2 1996/12/04 10:13:04 swick $
-
-/* Note whether we are the top level project. */
-#ifndef SeenTopLevelProject
-# define SeenTopLevelProject	YES
-# define CDEIsTopLevelProject	YES
-#else
-# define CDEIsTopLevelProject	NO
-#endif
-
-/* Include the Motif project rules file. */
-#include <Motif.rules>
-
-
-/* Use the in-tree CDE by default. */
-#ifndef UseInstalledCDE
-# define UseInstalledCDE	NO
-#endif
-#ifdef UseInstalled
-# undef UseInstalledCDE
-# define UseInstalledCDE	YES
-#endif
-
-#ifndef ImportCDE
-# ifdef UseImports
-#  define ImportCDE		YES
-# else
-#  define ImportCDE		NO
-# endif
-#endif
-#if UseInstalledCDE
-# undef ImportCDE
-# define ImportCDE		NO
-#endif
-
-/* If CDE has a different ProjectRoot we need to search the regular ones too. */
-#ifdef CDEProjectRoot
-# define CUsrLibDirPath	Concat(MUsrLibDirPath,:$(CDEPROJECTROOT)/lib)
-#else
-# define CUsrLibDirPath	MUsrLibDirPath
-#endif
-#ifdef UsrLibDirPath
-# undef UsrLibDirPath
-#endif
-#define UsrLibDirPath	CUsrLibDirPath
-
-#if ImportCDE
-# define CLdPreLibs	-L$(CDELIBSRC)
-#elif defined(UseInstalledCDE) && defined(CDEProjectRoot)
-# define CLdPreLibs	-L$(CDEPROJECTROOT)/lib
-#else
-# define CLdPreLibs	/**/
-#endif
-#ifdef LdPreLibs
-# undef LdPreLibs
-#endif
-#define LdPreLibs	LdPreLib CLdPreLibs MLdPreLibs XLdPreLibs
-
-#ifdef CDEProjectRoot
-# define CLdPostLibs	-L$(CDEPROJECTROOT)/lib
-#else
-# define CLdPostLibs	/**/
-#endif
-#ifdef LdPostLibs
-# undef LdPostLibs
-#endif
-#define LdPostLibs	LdPostLib CLdPostLibs MLdPostLibs XLdPostLibs
-
-#ifdef TopIncludes
-# undef TopIncludes
-#endif
-#define TopIncludes	TopInclude $(TOP_CDE_INCLUDES) $(TOP_MOTIF_INCLUDES) $(TOP_X_INCLUDES)
-
-#if UseInstalledCDE && defined(CdeProjectRoot)
-# define CDEBuildLibPath	$(CDEPROJECTROOT)/lib
-#elif UseInstalledCDE
-# define CDEBuildLibPath	$(USRLIBDIR)
-#elif ImportCDE
-# define CDEBuildLibPath	$(CDELIBSRC)
-#else
-# define CDEBuildLibPath	$(TOP)/exports/lib
-#endif
-#ifdef BuildLibPath
-# undef BuildLibPath
-#endif
-#ifdef SystemBuildLibPath
-# define BuildLibPath		\
-$(DTENVLIBDIR):$(MOTIFENVLIBDIR):$(XENVLIBDIR):$(SYSTEMENVLIBDIR)
-#else
-# define BuildLibPath		$(DTENVLIBDIR):$(MOTIFENVLIBDIR):$(XENVLIBDIR)
-#endif
-
-
-#ifndef CdeInstallationTop
-# define CdeInstallationTop	/usr/dt
-#endif
-#ifndef CdeConfigurationTop
-# define CdeConfigurationTop	/etc/dt
-#endif
-#ifndef CdeLogFilesTop
-# define CdeLogFilesTop		/var/dt
-#endif
-#ifndef CdeUserTop
-# define CdeUserTop		.dt
-#endif
-
-#ifndef CdeProjectDefines
-# define CdeProjectDefines	\
-	-DANSICPP -DMULTIBYTE -DNLS16 \
-	-DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion
-#endif
-#ifdef ProjectDefines
-# undef ProjectDefines
-#endif
-#define ProjectDefines	X11ProjectDefines MotifProjectDefines CdeProjectDefines
-
-#ifndef CdeCplusplusProjectDefines
-# define CdeCplusplusProjectDefines	CdeProjectDefines
-#endif
-#ifdef CplusplusProjectDefines
-# undef CplusplusProjectDefines
-#endif
-#define CplusplusProjectDefines	\
-	X11CplusplusProjectDefines MotifCplusplusProjectDefines CdeCplusplusProjectDefines
-
-/*
- * Doc build rules
- */
-
-/*
- * MakeSdlVolume - generate rules to create an SDL volume, in the specified
- * directory, from an SGML source doc.
- * Note: the volume name must match the directory name.
- */
-#ifndef MakeSdlVolume
-#define MakeSdlVolume(vol,dir,env,opts,dep)				@@\
-all:: dir/vol.sdl							@@\
-									@@\
-dir/vol.sdl: dep							@@\
-	MakeDir(dir)							@@\
-	env $(DTDOCBOOK) $(DTDOCBOOKOPTIONS) opts -o dir/vol.sdl vol/book.sgm	@@\
-									@@\
-clean::									@@\
-	$(RM) dir/vol.sdl vol/book.log
-#endif
-
-/*
- * MakeTocFile - generate rules to create an SGML TOC file.
- * Note: the volume name must match the directory name.
- */
-#ifndef MakeTocFile
-#define MakeTocFile(vol,env,opts,ttle,ident,dep)					@@\
-all:: vol/TOC.sgm							@@\
-									@@\
-vol/TOC.sgm: dep							@@\
-	MakeDir($(DTINFOGENTMPDIR))					@@\
-	env $(DTINFOGEN) tocgen -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) opts -f vol/TOC.sgm -id ident -title ttle vol/book.sgm	@@\
-									@@\
-clean::									@@\
-	$(RM) vol/TOC.sgm
-#endif
-
-#ifndef MakeTocFile3
-#define MakeTocFile3(vol,env,opts,ttle,ident,dep1,dep2,dep3)			@@\
-all:: vol/TOC.sgm							@@\
-									@@\
-vol/TOC.sgm: dep1							@@\
-vol/TOC.sgm: dep2							@@\
-vol/TOC.sgm: dep3							@@\
-	MakeDir($(DTINFOGENTMPDIR))					@@\
-	env $(DTINFOGEN) tocgen -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) opts -f vol/TOC.sgm -id ident -title ttle vol/book.sgm	@@\
-									@@\
-clean::									@@\
-	$(RM) vol/TOC.sgm
-#endif
-
-/*
- * TocFileDep - generate TOC file dependency rule
- */
-#ifndef TocFileDep
-#define TocFileDep(vol,dep)						@@\
-vol/TOC.sgm: dep
-#endif
-
-/*
- * MakeInfolib - generate rules to create an infolib.
- */
-#ifndef MakeInfolib
-#define MakeInfolib(infolib,bkcase,env,opts,dep)			@@\
-all:: infolib/bkcase/dtsearch/dtsearch.ocf				@@\
-									@@\
-infolib/bkcase/dtsearch/dtsearch.ocf: dep				@@\
-	MakeDir($(DTINFOGENTMPDIR))					@@\
-	MakeDir(infolib)						@@\
-	env $(DTINFOGEN) build -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) opts -l infolib bookcase.bc
-#endif
-
-/*
- * InfolibDep - generate infolib dependency rule - Highly depending on MMDB!
- */
-#ifndef InfolibDep
-#define InfolibDep(infolib,bkcase,dep)					@@\
-infolib/bkcase/dtsearch/dtsearch.ocf: dep
-#endif
-
-#ifndef InfolibDep3
-#define InfolibDep3(infolib,bkcase,dep1,dep2,dep3)			@@\
-infolib/bkcase/dtsearch/dtsearch.ocf: dep1				@@\
-infolib/bkcase/dtsearch/dtsearch.ocf: dep2				@@\
-infolib/bkcase/dtsearch/dtsearch.ocf: dep3
-#endif
--- a/Xvnc/config/cf/cde.tmpl
+++ /dev/null
@@ -1,439 +0,0 @@
-XCOMM $XConsortium: cde.tmpl /main/2 1996/12/04 10:13:09 swick $
-
-/* Include the Motif project template file. */
-#include <Motif.tmpl>
-
-#ifndef _CUse
-# if UseInstalledCDE
-#  define _CUse(a,b) a
-# else
-#  define _CUse(a,b) b
-# endif
-#endif
-
-#ifndef _CUseCat
-# if (defined(__STDC__) && !defined(UnixCpp)) || defined(AnsiCpp)
-#  if UseInstalledCDE
-#   define _CUseCat(a,b,c) a##c
-#  else
-#   define _CUseCat(a,b,c) b##c
-#  endif
-# else
-#  if UseInstalledCDE
-#   define _CUseCat(a,b,c) a/**/c
-#  else
-#   define _CUseCat(a,b,c) b/**/c
-#  endif
-# endif
-#endif
-
-#ifndef CDETop
-# if ImportCDE
-#  define CDETop $(TOP)/imports/cde
-# else
-#  define CDETop $(TOP)
-# endif
-#endif
-
-#define CDESharedRev		2.1
-
-#ifndef SharedLibPam
-# define SharedLibPam		HasSharedLibraries
-#endif
-#ifndef NormalLibPam
-# define NormalLibPam		(!SharedLibPam | ForceNormalLib)
-#endif
-#ifndef DebugLibPam
-# define DebugLibPam		NO
-#endif
-#ifndef ProfileLibPam
-# define ProfileLibPam		NO
-#endif
-#ifndef SharedPamRev
-# define SharedPamRev		CDESharedRev
-#endif
-
-#ifndef SharedLibTt
-# define SharedLibTt		HasSharedLibraries
-#endif
-#ifndef NormalLibTt
-# define NormalLibTt		(!SharedLibTt | ForceNormalLib)
-#endif
-#ifndef DebugLibTt
-# define DebugLibTt		NO
-#endif
-#ifndef ProfileLibTt
-# define ProfileLibTt		NO
-#endif
-#ifndef SharedTtRev
-# define SharedTtRev		CDESharedRev
-#endif
-
-#ifndef SharedLibDtSvc
-# define SharedLibDtSvc		HasSharedLibraries
-#endif
-#ifndef NormalLibDtSvc
-# define NormalLibDtSvc		(!SharedLibDtSvc | ForceNormalLib)
-#endif
-#ifndef DebugLibDtSvc
-# define DebugLibDtSvc		NO
-#endif
-#ifndef ProfileLibDtSvc
-# define ProfileLibDtSvc	NO
-#endif
-#ifndef SharedDtSvcRev
-# define SharedDtSvcRev		CDESharedRev
-#endif
-
-#ifndef SharedLibDtSearch
-# define SharedLibDtSearch	HasSharedLibraries
-#endif
-#ifndef NormalLibDtSearch
-# define NormalLibDtSearch	(!SharedLibDtSearch | ForceNormalLib)
-#endif
-#ifndef DebugLibDtSearch
-# define DebugLibDtSearch	NO
-#endif
-#ifndef ProfileLibDtSearch
-# define ProfileLibDtSearch	NO
-#endif
-#ifndef SharedDtSearchRev
-# define SharedDtSearchRev	CDESharedRev
-#endif
-
-#ifndef SharedLibDtWidget
-# define SharedLibDtWidget	HasSharedLibraries
-#endif
-#ifndef NormalLibDtWidget
-# define NormalLibDtWidget	(!SharedLibDtWidget | ForceNormalLib)
-#endif
-#ifndef DebugLibDtWidget
-# define DebugLibDtWidget	NO
-#endif
-#ifndef ProfileLibDtWidget
-# define ProfileLibDtWidget	NO
-#endif
-#ifndef SharedDtWidgetRev
-# define SharedDtWidgetRev	CDESharedRev
-#endif
-
-#ifndef SharedLibDtHelp
-# define SharedLibDtHelp	HasSharedLibraries
-#endif
-#ifndef NormalLibDtHelp
-# define NormalLibDtHelp	(!SharedLibDtHelp | ForceNormalLib)
-#endif
-#ifndef DebugLibDtHelp
-# define DebugLibDtHelp		NO
-#endif
-#ifndef ProfileLibDtHelp
-# define ProfileLibDtHelp	NO
-#endif
-#ifndef SharedDtHelpRev
-# define SharedDtHelpRev	CDESharedRev
-#endif
-
-#ifndef SharedLibDtPrint
-# define SharedLibDtPrint	HasSharedLibraries
-#endif
-#ifndef NormalLibDtPrint
-# define NormalLibDtPrint	(!SharedLibDtPrint | ForceNormalLib)
-#endif
-#ifndef DebugLibDtPrint
-# define DebugLibDtPrint	NO
-#endif
-#ifndef ProfileLibDtPrint
-# define ProfileLibDtPrint	NO
-#endif
-#ifndef SharedDtPrintRev
-# define SharedDtPrintRev	CDESharedRev
-#endif
-
-#ifndef SharedLibDtTerm
-# define SharedLibDtTerm	HasSharedLibraries
-#endif
-#ifndef NormalLibDtTerm
-# define NormalLibDtTerm	(!SharedLibDtTerm | ForceNormalLib)
-#endif
-#ifndef DebugLibDtTerm
-# define DebugLibDtTerm		NO
-#endif
-#ifndef ProfileLibDtTerm
-# define ProfileLibDtTerm	NO
-#endif
-#ifndef SharedDtTermRev
-# define SharedDtTermRev	CDESharedRev
-#endif
-
-#ifndef SharedLibDtMrm
-# define SharedLibDtMrm		HasSharedLibraries
-#endif
-#ifndef NormalLibDtMrm
-# define NormalLibDtMrm		(!SharedLibDtMrm | ForceNormalLib)
-#endif
-#ifndef DebugLibDtMrm
-# define DebugLibDtMrm		NO
-#endif
-#ifndef ProfileLibDtMrm
-# define ProfileLibDtMrm	NO
-#endif
-#ifndef SharedDtMrmRev
-# define SharedDtMrmRev		CDESharedRev
-#endif
-
-#ifndef SharedLibDtMmdb
-# define SharedLibDtMmdb	HasSharedLibraries
-#endif
-#ifndef NormalLibDtMmdb
-# define NormalLibDtMmdb	(!SharedLibDtMmdb | ForceNormalLib)
-#endif
-#ifndef DebugLibDtMmdb
-# define DebugLibDtMmdb		NO
-#endif
-#ifndef ProfileLibDtMmdb
-# define ProfileLibDtMmdb	NO
-#endif
-#ifndef SharedDtMmdbRev
-# define SharedDtMmdbRev	CDESharedRev
-#endif
-
-#ifndef SharedLibCsa
-# define SharedLibCsa		HasSharedLibraries
-#endif
-#ifndef NormalLibCsa
-# define NormalLibCsa		(!SharedLibCsa | ForceNormalLib)
-#endif
-#ifndef DebugLibCsa
-# define DebugLibCsa		NO
-#endif
-#ifndef ProfileLibCsa
-# define ProfileLibCsa		NO
-#endif
-#ifndef SharedCsaRev
-# define SharedCsaRev		CDESharedRev
-#endif
-
-#ifndef DtLocalesToBuild
-#define DtLocalesToBuild de_DE.ISO8859-1 es_ES.ISO8859-1 fr_FR.ISO8859-1 it_IT.ISO8859-1 ja_JP.dt-eucJP
-#endif
-
-#ifndef DtCodeGen
-# if UseInstalledCDE
-#  define DtCodeGen dtcodegen
-# else
-#  define DtCodeGen $(CLIENTENVSETUP) $(CDESRC)/dtappbuilder/src/abmf/dtcodegen
-# endif
-#endif
-
-#ifndef BuildCDEDoc
-# define BuildCDEDoc YES
-#endif
-
-#ifndef UseNSGMLS
-# ifdef SunArchitecture
-#  define UseNSGMLS NO
-# else
-#  define UseNSGMLS YES
-# endif
-#endif
-#ifndef SGMLParser
-# if UseNSGMLS
-#  define SGMLDir $(NSGMLSSRC)
-#  define SGMLParser $(NSGMLSSRC)/nsgmls
-# else
-#  define SGMLDir $(SGMLSSRC)
-#  define SGMLParser $(SGMLSSRC)/sgmls
-# endif
-#endif
-
-#ifndef DtInfoGen
-# if UseInstalledCDE
-#  define DtInfoGen dtinfogen
-# else
-#  define DtInfoGen $(CLIENTENVSETUP) $(DTLCXENVSETUP) DTINFO_HOME=$(DTINFOGENSRC) DTINFO_BIN=$(DTINFOGENSRC)/install:$(DTINFOGENSRC)/mmdb/StyleSheet:$(DTINFOGENSRC)/mmdb/src:SGMLDir:$(CDESRC)/dtsr $(DTINFOGENSRC)/infolib/etc/dtinfogen
-# endif
-#endif
-#ifndef DtInfoGenTmpDir
-#  define DtInfoGenTmpDir $(TOP)/doc/tmp
-#endif
-
-#ifndef DtDocBook
-# if UseInstalledCDE
-#  define DtDocBook dtdocbook
-# else
-#  define DtDocBook $(CLIENTENVSETUP) $(DTLCXENVSETUP) $(CDESRC)/dtdocbook/doc2sdl/dtdocbook
-# endif
-#endif
-#ifndef DtDocBookOptions
-# if UseInstalledCDE
-#  define DtDocBookOptions
-# else
-#  define DtDocBookOptions -t $(CDESRC)/dtdocbook/doc2sdl -H $(HELPTAGPASS2DEF) -I $(CDESRC)/dtdocbook/instant/instant -L $(CDESRC)/dtdocbook/xlate_locale/xlate_locale -S SGMLParser
-# endif
-#endif
-
-           CDETOP = CDETop
-#if ImportCDE || UseInstalledCDE
-    CDEINCLUDESRC = $(CDETOP)/include
-#else
-    CDEINCLUDESRC = $(CDETOP)/exports/include
-#endif
- TOP_CDE_INCLUDES = -I$(CDEINCLUDESRC)
-        CDELIBSRC = $(CDETOP)/lib
-           PAMSRC = $(CDELIBSRC)/pam/libpam
-            TTSRC = $(CDELIBSRC)/tt
-         DTSVCSRC = $(CDELIBSRC)/DtSvc
-      DTSEARCHSRC = $(CDELIBSRC)/DtSearch
-      DTWIDGETSRC = $(CDELIBSRC)/DtWidget
-        DTHELPSRC = $(CDELIBSRC)/DtHelp
-       DTPRINTSRC = $(CDELIBSRC)/DtPrint
-        DTTERMSRC = $(CDELIBSRC)/DtTerm
-         DTMRMSRC = $(CDELIBSRC)/DtMrm
-        DTMMDBSRC = $(CDELIBSRC)/DtMmdb
-           CSASRC = $(CDELIBSRC)/csa
-           CDESRC = $(CDETOP)/programs
-#ifdef BuildLibPathVar
-      DTENVLIBDIR = CDEBuildLibPath
-#endif
-#ifdef CDEProjectRoot
-   CDEPROJECTROOT = CDEProjectRoot
-#endif
- CDE_INSTALLATION_TOP = CdeInstallationTop
-CDE_CONFIGURATION_TOP = CdeConfigurationTop
-     CDE_LOGFILES_TOP = CdeLogFilesTop
-         CDE_USER_TOP = CdeUserTop
-
-        DTCODEGEN = DtCodeGen
-    HELPPARSERSRC = $(CDESRC)/dthelp/parser
-          HELPTAG = _CUseCat($(BINDIR),$(HELPPARSERSRC)/helptag,/dthelptag)
-  HELPTAGPASS1DEF = _CUseCat($(BINDIR),$(HELPPARSERSRC)/pass1/helptag,/dthelp_htag1)
-  HELPTAGPASS2DEF = _CUseCat($(BINDIR),$(HELPPARSERSRC)/pass2/htag2,/dthelp_htag2)
-        DTDOCBOOK = DtDocBook
- DTDOCBOOKOPTIONS = DtDocBookOptions
-#if UseNSGMLS
-        NSGMLSSRC = $(CDESRC)/nsgmls
-#else
-         SGMLSSRC = $(CDESRC)/dtdocbook/sgmls
-#endif
-     DTINFOGENSRC = $(CDESRC)/dtinfo/dtinfogen
-        DTINFOGEN = DtInfoGen
-  DTINFOGENTMPDIR = DtInfoGenTmpDir
-#ifdef DtInfoGenOptions
- DTINFOGENOPTIONS = DtInfoGenOptions
-#endif
-#ifdef ArchitectureDefines
- ARCHITECTURE_DEFINES = ArchitectureDefines
-#endif
-#if !UseInstalledCDE
-DTLCXENVSETUP = DTLCXSEARCHPATH=$(DTHELPSRC)
-#endif
-
-#ifndef TtClientLibs
-# define TtClientLibs $(TTLIB) $(XLIB)
-#endif
-#ifndef TtClientDepLibs
-# define TtClientDepLibs $(DEPTTLIB) $(DEPXLIB)
-#endif
-
-/* These libraries use UseInstalledCDE instead of UseInstalled. */
-#undef _Use
-#undef _UseCat
-#define _Use    _CUse
-#define _UseCat _CUseCat
-
-#ifndef CDEBuildLibDir
-# define CDEBuildLibDir	BuildLibDir
-#endif
-
-#if SharedLibPam
-SharedLibReferences(PAM,pam,$(PAMSRC),SOPAMREV,SharedPamRev)
-#else
-ProjectUnsharedLibReferences(PAM,pam,$(PAMSRC),CDEBuildLibDir)
-#endif
-
-#if SharedLibTt
-SharedLibReferences(TT,tt,$(TTSRC)/lib,SOTTREV,SharedTtRev)
-#else
-ProjectUnsharedLibReferences(TT,tt,$(TTSRC)/lib,CDEBuildLibDir)
-#endif
-
-#if SharedLibDtSvc
-SharedLibReferences(DTSVC,DtSvc,$(DTSVCSRC),SODTSVCREV,SharedDtSvcRev)
-#else
-ProjectUnsharedLibReferences(DTSVC,DtSvc,$(DTSVCSRC),CDEBuildLibDir)
-#endif
-
-#if SharedLibDtSearch
-SharedLibReferences(DTSEARCH,DtSearch,$(DTSEARCHSRC),SODTSEARCHREV,SharedDtSearchRev)
-#else
-ProjectUnsharedLibReferences(DTSEARCH,DtSearch,$(DTSEARCHSRC),CDEBuildLibDir)
-#endif
-
-#if SharedLibDtWidget
-SharedLibReferences(DTWIDGET,DtWidget,$(DTWIDGETSRC),SODTWIDGETREV,SharedDtWidgetRev)
-#else
-ProjectUnsharedLibReferences(DTWIDGET,DtWidget,$(DTWIDGETSRC),CDEBuildLibDir)
-#endif
-
-#if SharedLibDtHelp
-SharedLibReferences(DTHELP,DtHelp,$(DTHELPSRC),SODTHELPREV,SharedDtHelpRev)
-#else
-ProjectUnsharedLibReferences(DTHELP,DtHelp,$(DTHELPSRC),CDEBuildLibDir)
-#endif
-
-#if SharedLibDtPrint
-SharedLibReferences(DTPRINT,DtPrint,$(DTPRINTSRC),SODTPRINTREV,SharedDtPrintRev)
-#else
-ProjectUnsharedLibReferences(DTPRINT,DtPrint,$(DTPRINTSRC),CDEBuildLibDir)
-#endif
-
-#if SharedLibDtTerm
-SharedLibReferences(DTTERM,DtTerm,$(DTTERMSRC),SODTTERMREV,SharedDtTermRev)
-#else
-ProjectUnsharedLibReferences(DTTERM,DtTerm,$(DTTERMSRC),CDEBuildLibDir)
-#endif
-
-#if SharedLibDtMrm
-SharedLibReferences(DTMRM,DtMrm,$(DTMRMSRC),SODTMRMREV,SharedDtMrmRev)
-#else
-ProjectUnsharedLibReferences(DTMRM,DtMrm,$(DTMRMSRC),CDEBuildLibDir)
-#endif
-
-#if SharedLibDtMmdb
-SharedLibReferences(DTMMDB,DtMmdb,$(DTMMDBSRC),SODTMMDBREV,SharedDtMmdbRev)
-#else
-ProjectUnsharedLibReferences(DTMMDB,DtMmdb,$(DTMMDBSRC),CDEBuildLibDir)
-#endif
-
-#if SharedLibDtCm
-SharedLibReferences(DTCM,DtCm,$(DTCMSRC),SODTCMREV,SharedDtCmRev)
-#else
-ProjectUnsharedLibReferences(DTCM,DtCm,$(DTCMSRC),CDEBuildLibDir)
-#endif
-
-#if SharedLibCsa
-SharedLibReferences(CSA,csa,$(CSASRC),SOCSAREV,SharedCsaRev)
-#else
-ProjectUnsharedLibReferences(CSA,csa,$(CSASRC),CDEBuildLibDir)
-#endif
-
-
-/* Revert to the normal library rules. */
-#undef _Use
-#undef _UseCat
-#define _Use    _XUse
-#define _UseCat _XUseCat
-
-
-#ifndef DtClientLibs
-# define DtClientLibs $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB)
-#endif
-#ifndef DepDtClientLibs
-# define DepDtClientLibs $(DEPDTPRINTLIB) $(DEPDTHELPLIB) $(DEPDTWIDGETLIB) $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB)
-#endif
-#ifndef DtClientSysLibs
-# define DtClientSysLibs $(DYNLIBSYSLIB) $(ICONVSYSLIB) $(REGEXSYSLIB) -lm
-#endif
-#ifndef DtClientExtraLibs
-# define DtClientExtraLibs /**/
-#endif
--- a/Xvnc/config/cf/convex.cf
+++ /dev/null
@@ -1,102 +0,0 @@
-XCOMM platform:  $XConsortium: convex.cf /main/4 1996/09/28 16:09:50 rws $
-
-#ifndef OSName
-#define OSName            	ConvexOS V9.0
-#endif
-XCOMM operating system:  OSName
-#ifndef OSMajorVersion
-#define OSMajorVersion		9
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion		0 
-#endif
-#ifndef VersionNumber
-#define VersionNumber 		0.0.0.0
-#endif
-
-#define BootstrapCFlags   	-tm c1
-#define SetTtyGroup		YES
-#define BuildServer             NO
-#define ConnectionFlags		-DTCPCONN -DUNIXCONN -DCOVUENETCONN
-#define InstallXdmConfig	YES
-#define XdmDir			$(LIBDIR)/xdm-sample
-#define XdmServersType	fs	/* one tab here */
-#define HasXmWidgets		NO
-#define InstKmemFlags		-g kmem -m 2711 -v $(VERSION)
-#define InstScriptFlags		-m 0755 -g bin
-#define InstManFlags		-m 0444 -g bin
-#define DefaultCCOptions    	-fn -tm c1 
-#define LibraryCCOptions        -fx -tm c1 
-#define StripFlags		-r -x
-#define HasSecureOS		YES
-#define BuildExamples		YES
-#define BuildMotif		NO
-#define BuildConvexClients	YES
-#define MotifBC			YES
-#define UilCommand		uil
-#define ExampleDir		$(LIBDIR)/examples
-#define UnSupDir		$(LIBDIR)/unsupported
-#define BuildTestExt		YES
-#define DefaultScreenSaverTime	0
-
-#if BuildTestExt
-#define TestDefines -DXTESTEXT1
-#else
-#define TestDefines /**/
-#endif
-
-#define ExtensionOSDefines TestDefines
-
-        VERSION = VersionNumber
-            UIL = UilCommand
-       UNSUPDIR = UnSupDir	/* unsupported examples and code */
-
-/*
- * _Use - makes a choice based on UseInstalled.
- */
-#ifndef _Use
-#ifdef UseInstalled
-#define _Use(a,b) a
-#else
-#define _Use(a,b) b
-#endif
-#endif
-
-/*
- * _UseCat - combination of _Use and Concat.
- *           exists to avoid problems with some preprocessors
- */
-#ifndef _UseCat
-#if (defined(__STDC__) || (defined(__convex__) && defined(__stdc__)))
-&& !defined(UnixCpp)
-#ifdef UseInstalled
-#define _UseCat(a,b,c) a##c
-#else
-#define _UseCat(a,b,c) b##c
-#endif
-#else
-#ifdef UseInstalled
-#define _UseCat(a,b,c) a/**/c
-#else
-#define _UseCat(a,b,c) b/**/c
-#endif
-#endif
-#endif
-
-#if HasXmWidgets
-   MRESOURCESRC = $(LIBSRC)/Mrm
-DEPMRESOURCELIB = _UseCat($(USRLIBDIR),$(MRESOURCESRC),/libMrm.a)
-   MRESOURCELIB = LoaderLibPrefix _Use(-lMrm,$(DEPMRESOURCELIB))
-LINTMRESOURCELIB= _UseCat($(LINTLIBDIR),$(MRESOURCESRC),/llib-lMrm.ln)
-
-       XMLIBSRC = $(LIBSRC)/Xm
-       DEPXMLIB = _UseCat($(USRLIBDIR),$(XMLIBSRC),/libXm.a)
-          XMLIB = LoaderLibPrefix _Use(-lXm,$(DEPXMLIB))
-      LINTXMLIB = _UseCat($(LINTLIBDIR),$(XMLIBSRC),/llib-lXm.ln)
-
-      UILLIBSRC = $(LIBSRC)/uil
-      DEPUILLIB = _UseCat($(USRLIBDIR),$(UILLIBSRC),/libUil.a)
-         UILLIB = LoaderLibPrefix _Use(-lUil,$(DEPUILLIB))
-     LINTUILLIB = _UseCat($(LINTLIBDIR),$(UILLIBSRC),/llib-lUil.ln)
-
-#endif
--- a/Xvnc/config/cf/cray.cf
+++ /dev/null
@@ -1,50 +0,0 @@
-XCOMM platform:  $XConsortium: cray.cf /main/52 1996/09/28 16:09:55 rws $
-
-#ifndef OSName
-#define OSName			UNICOS 8.0
-#endif
-XCOMM operating system:  OSName
-#ifndef OSMajorVersion
-#define OSMajorVersion		8
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion		0
-#endif
-
-#define SystemV			YES
-#define Malloc0ReturnsNull	YES
-#define RemoveTargetProgramByMoving YES
-#define ArCmd			bld cr
-#define StandardDefines		-DSYSV -DUSG
-#define ExecableScripts		NO
-#define HasPoll			NO
-#define HasXServer		NO
-#define ConnectionFlags		-DTCPCONN
-#define HasShm			NO
-#define PexNativeFPFormat	PEXCRAY_Floating
-#define NativeFPFormat		CRAY_Float
-#ifdef UseInstalled
-#define InstallCmd              install
-#else
-#define InstallCmd              $(SHELL) $(CONFIGSRC)/util/install.sh
-#endif
-
-#ifdef _CRAY2
-#define DefaultCCOptions	-hpagelm -hlimitlm
-#endif
-
-#if OSMajorVersion >= 6
-#define PreProcessCmd 		/lib/pcpp
-#define CppCmd	 		/lib/pcpp
-#else
-#  if OSMajorVersion == 5
-#  define PreProcessCmd 	/lib/cpp
-#  define CppCmd	 	/lib/cpp
-#  define ExtraLoadFlags        -lnet
-#  endif
-#endif
-
-/* XKB library code does not work here yet */
-#define BuildXKBlib NO
-
-#define MotifDefines		-DNO_REGEX -DNO_REGCOMP
--- a/Xvnc/config/cf/darwin.cf
+++ /dev/null
@@ -1,483 +0,0 @@
-XCOMM platform:  $XFree86: xc/config/cf/OpenBSD.cf,v 3.1.2.11 1998/02/15 16:08:33 hohndel Exp $
-XCOMM $OpenBSD: OpenBSD.cf,v 1.11 1997/12/09 03:03:48 gene Exp $
-
-#ifndef OSName
-#define OSName			DefaultOSName OSBinaryType
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion		DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion		DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion		DefaultOSTeenyVersion
-#endif
-
-#ifndef OSVendor
-#define	OSVendor	/**/
-#endif
-XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-
-/*
- * C library features
- */
-#define HasPoll			YES
-#define HasNdbm         	YES
-#define HasPutenv       	YES
-#define HasSnprintf		YES
-#define HasBSD44Sockets 	YES
-#define Malloc0ReturnsNull	NO
-#define SetTtyGroup     	YES
-#define DBMLibrary		/**/
-#define HasLibCrypt		NO
-#define HasShm          	YES
-#define HasWChar32		YES
-#define HasMkstemp		YES
-
-/*
- * Compiler Features
- */
-#undef HasGcc
-#define HasGcc			YES
-#define HasGcc2			YES
-#ifndef HasGcc2ForCplusplus
-#define HasGcc2ForCplusplus	YES
-#endif
-#define GccUsesGas		YES
-#define UseGas			YES
-#define GnuCpp			YES
-
-
-#define NeedConstPrototypes	YES
-#define NeedFunctionPrototypes	YES
-#define NeedNestedPrototypes	YES
-#define NeedVarargsPrototypes	YES
-#define NeedWidePrototypes	NO
-
-#define MkdirHierCmd		mkdir -p
-
-#define CppCmd          	/usr/bin/cpp
-#define StandardCppDefines	-traditional
-#define PreProcessCmd   	CppCmd
-#define PreIncDir 		DefaultGccIncludeDir
-
-#undef CcCmd
-#define CcCmd 			gcc
-#if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit)
-#define DefaultCCOptions 	/**/
-#else
-#define DefaultCCOptions 	-ansi -Dasm=__asm
-#endif
-
-#define GccGasOption 		-DGCCUSESGAS
-#define AsmDefines 		-DUSE_GAS
-
-#define FontDir			/usr/X11R6/lib/X11/fonts
-
-#ifdef i386Architecture
-# define OptimizedCDebugFlags 	DefaultGcc2i386Opt
-# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
-# define ServerExtraSysLibs	-li386
-#else
-# define OptimizedCDebugFlags 	-O2
-# if defined(SparcArchitecture) || defined(AlphaArchitecture) || defined(AmigaArchitecture) || defined(Sun3Architecture)
-#  define ServerOSDefines 	-DDDXOSINIT
-# else
-#  define ServerOSDefines 	/**/
-# endif
-#endif
-#if defined(i386Architecture) || defined(ArcArchitecture)
-# define ServerExtraDefines GccGasOption XFree86ServerDefines
-# ifndef XFree86ConsoleDefines
-#  if defined(ArcArchitecture)
-#   define XFree86ConsoleDefines -DPCCONS_SUPPORT
-#  else
-#   define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT
-#  endif
-# endif
-#else
-# if defined(AlphaArchitecture)
-#  define ServerExtraDefines GccGasOption -D_XSERVER64
-# else
-#  if !defined(Sun3Architecture)
-#   define ServerExtraDefines GccGasOption
-#  endif
-# endif
-#endif
-
-#define StandardDefines	-DCSRG_BASED
-#define XawI18nDefines	-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-
-
-#ifndef ExtraLibraries
-#define ExtraLibraries		/**/
-#endif
-#define UseGnuMalloc		NO
-
-#define HasZlib			YES
-
-#define	AdmDir			/var/log
-
-/*
- * Make & install Features
- */
-
-#define HasBsdMake		YES
-
-#define StripInstalledPrograms	YES
-#define CompressAllFonts	YES
-#define GzipFontCompression	YES
-#define DefaultUserPath		/bin:/usr/bin:/usr/local/bin:$(BINDIR)
-#define DefaultSystemPath	/sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
-
-#ifdef  InstallCmd
-# undef  InstallCmd
-# define InstallCmd 		/usr/bin/install
-#endif
-
-#ifndef ExtraFilesToClean
-# define ExtraFilesToClean 	*.core
-#endif
-
-/*
- * Documentation formatting
- */
-#define NeqnCmd			neqn -Tlatin1
-#define NroffCmd		nroff -Tlatin1
-#define	EqnCmd 			eqn -Tps
-#define TroffCmd        	groff -Tps
-
-/*
- * To use the NetBSD Aperture driver
- */
-#if defined(i386Architecture)
-#ifndef HasNetBSDApertureDriver
-#define HasNetBSDApertureDriver	YES
-#endif
-#endif
-
-
-
-XCOMM Man pages need to be formatted when installed, so override the default
-XCOMM imake rules.
-
-#define ManSuffix	1
-#define FileManSuffix	5
-#define ManSourcePath	$(MANPATH)/cat
-
-#define InstallManPageLong(file,destdir,dest)                           @@\
-all:: file.0								@@\
-									@@\
-file.0:: file.man							@@\
-	@if [ -f file.man ]; \						@@\
-	then \								@@\
-	cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \	@@\
-	cp /tmp/$$$$.man file.0; \					@@\
-	$(RM) /tmp/$$$$.man; \						@@\
-	fi 								@@\
-									@@\
-install.man::                                                           @@\
-	MakeDir($(DESTDIR)destdir)					@@\
-	-@if [ -f file.0 ]; \						@@\
-	then \								@@\
-	$(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\
-	fi
-
-#define InstallGenManPageLong(file,destdir,dest,suffix)			@@\
-	InstallManPageLong(file,destdir,dest)
-
-#define InstallMultipleManSuffix(list,dest,suff)                        @@\
-install.man:: 								@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	case '${MFLAGS}' in *[i]*) set +e;; esac; \			@@\
-	for i in list; do \                                             @@\
-	  (set -x; \							@@\
-	  cat $$i.suff | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.suff; \	@@\
-	  $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$$$.suff $(DESTDIR)dest/$$i.0; \	@@\
-	  $(RM) /tmp/$$$$.suff); \						@@\
-	done
-
-#define InstallMultipleMan(list,dest)                                   @@\
-	InstallMultipleManSuffix(list,dest,man)
-
-#define InstallManPageAliases(file,destdir,aliases)                     @@\
-install.man:: 								@@\
-	@case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
-	for i in aliases; do \                                          @@\
-		(set -x; \						@@\
-		$(RM) $(DESTDIR)destdir/$$i.0;\  			@@\
-		(cd $(DESTDIR)/destdir; $(LN) file.0 $$i.0);\ 		@@\
-		); \							@@\
-	done
-
-#define InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
-	InstallManPageAliases(file,destdir,aliases)
-
-
-
-/*
- * Architecture specific sections - put all architecture dependent
- * options and setting here into the correct section
- */
-
-/*
- * Definitions for the alpha architecture
- */
-#ifdef AlphaArchitecture
-
-# define XF86Contrib
-# include <xf86.rules>
-# define BuildServer		NO
-# define XnestServer		NO
-# define XVirtualFramebufferServer	NO
-
- /*
-  * For the current ECOFF system
-  */
-# define HasSharedLibraries	NO
-# define UseElfFormat		NO
-# define BuildDynamicLoading	NO
- /*
-  * For the upcoming ELF system
-  */
-# if 0 /* NOT YET */
-#  define HasSharedLibraries	YES
-#  define UseElfFormat		YES
-#  define BuildDynamicLoading	YES
-# endif
-
-#endif /* AlphaArchitecture */
-
-
-/*
- * Definitions for the i386 architecture
- */
-#ifdef i386Architecture
-
-/*
- * For safety reasons, don't install the X server setuid on OpenBSD
- * use xdm instead
- */
-# define InstallXserverSetUID	NO
-
-# define BuildDynamicLoading	YES
-# include <xfree86.cf>
-
-#endif /* i386Architecture */
-
-
-/*
- * Definitions for the m68k architecture (currently amiga, hp300,
- * mac68k, mvme68k, sun3)
- */
-#ifdef Mc68020Architecture
-
-/*
- * Function CSE makes gas -k not recognize external function calls as lazily
- * resolvable symbols, thus sometimes making ld.so report undefined symbol
- * errors on symbols found in shared library members that would never be 
- * called.  Ask niklas@openbsd.org for details.
- */
-# define PositionIndependentCFlags -fpic -fno-function-cse
-
-#endif /* Mc68020Architecture */
-
-
-/*
- * Definitions for the amiga architecture
- */
-#ifdef AmigaArchitecture
-
-# define XF86Contrib
-# include <xf86.rules>
-# define BuildServer		NO
-
-#endif /* AmigaArchitecture */
-
-
-/*
- * Definitions for the hp300 architecture
- */
-#ifdef Hp300Architecture
-
-# include <xf86.rules>
-# define BuildServer		NO
-
-#endif /* Hp300Architecture */
-
-
-/*
- * Definitions for the mac68k architecture
- */
-#ifdef mac68kArchitecture
-
-# include <xf86.rules>
-# define BuildServer		NO
-
-#endif /* Mac68kArchitecture */
-
-
-/*
- * Definitions for the mvme68k architecture
- */
-#ifdef Mvme68kArchitecture
-
-# include <xf86.rules>
-# define BuildServer		NO
-
-#endif /* Mvme68kArchitecture */
-
-
-/*
- * Definitions for the sun3 architecture
- */
-#ifdef Sun3Architecture
-
-# include <xf86.rules>
-
-# define OptimizedCDebugFlags  -O2
-# define ServerOSDefines       -DDDXOSINIT
-# define BootstrapCFlags       -Dsun3
-# define UnalignedReferencesAllowed YES /* changes _XtCopyArgs() */
-/* Note: -ansi turns off -Dmc68000 */
-# define ServerExtraDefines    GccGasOption -Dmc68000 -Dmc68020
-
-# ifndef Xsun24Server
-#  define Xsun24Server		NO
-# endif
-# ifndef XsunServer
-#  define XsunServer		NO
-# endif
-# ifndef XsunMonoServer
-#  define XsunMonoServer	YES
-# endif
-
-# ifndef BuildXKB
-#  define BuildXKB        	NO
-# endif
-
-# ifndef BuildXKBlib
-#  define BuildXKBlib     	NO
-# endif
-
-# ifndef BuildPexExt
-#  define BuildPexExt 		(XsunServer || Xsun24Server)
-# endif
-
-#endif /* Sun3Architecture */
-
-
-/*
- * Definitions for the mips architecture (currently arc, pmax)
- */
-#ifdef MipsArchitecture
-
- /*
-  * Mips ELF shared libs need some special handling.
-  */
-# define PositionIndependentCFlags
-# define SharedLibraryLoadFlags -x -shared --whole-archive -soname `echo $@ | sed 's/\.[0-9]*$$//'`
-# define SharedXtReqs -L$(BUILDLIBDIR) $(XLIBONLY) $(SMLIB) $(ICELIB)
-# define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XONLYLIB) $(EXTENSIONLIB)
-
-#endif /* MipsArchitecture */
-
-
-/*
- * Definitions for the arc architecture
- */
-#ifdef ArcArchitecture
-
-# include <xfree86.cf>
-
-#endif /* ArcArchitecture */
-
-
-/*
- * Definitions for the pmax architecture
- */
-#ifdef PmaxArchitecture
-
-# include <xf86.rules>
-# define BuildServer		NO
-
-#endif /* PmaxArchitecture */
-
-
-/*
- * Definitions for the sparc architecture
- */
-#ifdef SparcArchitecture
-
-# include <xf86.rules>
-
-# ifndef Xsun24Server
-# define Xsun24Server	YES
-# endif
-# ifndef XsunServer
-# define XsunServer	YES
-# endif
-# ifndef XsunMonoServer
-# define XsunMonoServer	YES
-# endif
-
-#define XkbServerDefines  -DXKB_ALWAYS_USES_SOFT_REPEAT
-
-# ifndef BuildPexExt
-#  define BuildPexExt 	(XsunServer || Xsun24Server)
-# endif
-#endif /* SparcArchitecture */
-
-
-/* End or architecture specific section */
-
-/*
- * Generic settings for all architectures
- */
-
-#ifndef XVirtualFramebufferServer
-# undef BuildServer
-# define BuildServer			YES
-# define XVirtualFramebufferServer	YES
-#endif
-
-#ifndef XnestServer
-# undef BuildServer
-# define BuildServer			YES
-# define XnestServer			YES
-#endif
-
-#ifndef BuildScreenSaverLibrary
-# define BuildScreenSaverLibrary	YES
-#endif
-
-#ifndef ForceNormalLib
-# define ForceNormalLib			YES
-#endif
-
-#ifndef BuildDynamicLoading
-# define BuildDynamicLoading		NO
-#endif
-
-/*
- * XFree86 uses its own (more portable) database routines to speed up 
- * the RGB database lookups
- * However, if you want to use ndbm anyway, you can set that to NO in 
- * site.def
- */
-#ifndef UseRgbTxt
-# define UseRgbTxt			YES
-#endif
-
-#ifndef OSBinaryType
-# if UseElfFormat
-#  define OSBinaryType			[ELF]
-# else 
-#  define OSBinaryType			/**/
-# endif
-#endif
-
-/* This must come last */
-#include <bsdLib.rules>
-
--- a/Xvnc/config/cf/fujitsu.cf
+++ /dev/null
@@ -1,95 +0,0 @@
-XCOMM platform:  $TOG: fujitsu.cf /main/9 1997/04/17 14:11:44 barstow $
-
-#ifndef OSName
-# define OSName		DefaultOSName
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion	DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion	DefaultOSMinorVersion
-#endif
-XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion)
-
-#define PatheticCpp	   YES
-
-#ifdef SparcArchitecture
-
-#define BootstrapCFlags    -D__uxp__
-#define StandardDefines    -D__uxp__ -DSVR4 -DANSICPP
-#define StandardCppDefines -D__uxp__ -DSVR4 -DANSICPP
-
-#define CppCmd             /usr/ccs/lib/cpp
-
-#ifndef  ArCmdBase
-# define ArCmdBase	/usr/ccs/bin/ar
-#endif
-#ifndef  AsCmd
-# define AsCmd		/usr/ccs/bin/as
-#endif
-#ifndef  CcCmd
-# define CcCmd		/usr/ccs/bin/cc
-#endif
-#ifndef  CplusplusCmd
-# define CplusplusCmd	/opt/uxpcplus/bin/CC
-#endif
-#ifndef  CplusplusFilt
-# define CplusplusFilt	/opt/uxpcplus/bin/c++filt
-#endif
-#ifndef  CplusplusDependIncludes
-# define CplusplusDependIncludes	-I/opt/uxpcplus/include/CC
-#endif
-#ifndef  LdCmd
-# define LdCmd		/usr/ccs/bin/ld
-#endif
-#ifndef  LexCmd
-# define LexCmd		/usr/ccs/bin/lex
-#endif
-#ifndef  YaccCmd
-# define YaccCmd	/usr/ccs/bin/yacc
-#endif
-
-#define BuildLibPathVar	   LD_LIBRARY_PATH
-#define SystemV4	   YES
-#define HasSockets         YES
-#define DBMLibrary         /* ndbm modules are in -lc */
-#define HasNdbm            YES
-#ifndef HasLdRunPath
-#define HasLdRunPath       YES
-#endif
-#define BuildServer        NO
-
-#include <sv4Lib.rules>
-
-#endif
-
-#ifdef mc68000Architecture
-
-#define BootstrapCFlags    -D__sxg__
-#define StandardDefines    -D__sxg__ -DSYSV -DUSG -DNOSTDHDRS -I/usr/xwin/include
-#define StandardCppDefines -D__sxg__ -DSYSV -DUSG -DNOSTDHDRS -I/usr/xwin/include
-
-#define LnCmd              ln
-
-#define DoRanlibCmd        NO 
-#define DefaultCCOptions   +Z384
-#define ExtraLibraries     -lXbsd -lsocket -lu
-#define TermcapLibrary     -lcurses
-#define BuildServer        NO
-#define HasSymLinks        NO
-#define HasVFork           NO
-#define XawI18nDefines     -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-
-#endif
-
-#define GencatFlags		-m
-
-#define DtSvcDefines		-DXK_MISCELLANY -DMULTIBYTE -DNO_REGCOMP -DHAVE_PTMS
-#define DtSearchDefines		-DI18N_MSG DtSvcDefines -DNEED_STRCASECMP
-#define DtWidgetDefines		DtSearchDefines
-
-#define ArchitectureDefines	-DUXP_ARCHITECTURE
-
-#define CdeProjectDefines \
-	-DMULTIBYTE -DNLS16 \
-	-DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion
--- a/Xvnc/config/cf/generic.cf
+++ /dev/null
@@ -1,21 +0,0 @@
-XCOMM platform:  $XConsortium: generic.cf /main/8 1996/09/28 16:10:06 rws $
-
-#ifndef OSName
-#define OSName            Unknown Operating System
-#endif
-XCOMM operating system:  OSName
-#ifndef OSMajorVersion
-#define OSMajorVersion    0
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion    0
-#endif
-
-#ifdef SYSV
-#define SystemV		YES
-#endif
-#ifdef SVR4
-#define SystemV4	YES
-#endif
-
-#define BuildServer	NO
--- a/Xvnc/config/cf/hp.cf
+++ /dev/null
@@ -1,210 +0,0 @@
-XCOMM platform:  $TOG: hp.cf /main/85 1997/04/17 14:11:34 barstow $
-
-#ifndef OSName
-# define OSName		DefaultOSName
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion	DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion	DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-# define OSTeenyVersion	DefaultOSTeenyVersion
-#endif
-XCOMM operating system:  OSName (OSMajorVersion.OSMinorVersion.OSTeenyVersion)
-
-
-/* The default yacc options are too small for Uil.y. */
-#define YaccFlags -Nm15000
-
-/*
- * C++ compiler setup.  This file knows what options to use with 
- * certain compilers, including HP C++ and CenterLine C++.
- * 
- * For HP C++, define HasHPCplusplus to YES in site.def.  
- * For CenterLine C++, define HasCenterLineCplusplus to YES in site.def.
- * For other compilers, define HasCplusplus to YES in site.def, and 
- *    check to see if you need to provide values for CplusplusOptions
- *    and/or DefaultCplusplusOptions.
- *
- * In any case, you may also need to set CplusplusDependIncludes.
- */
-
-#if HasHPCplusplus
-# ifndef  HasCplusplus
-#  define HasCplusplus YES
-# endif
-# ifndef  DefaultCplusplusOptions
-#  define DefaultCplusplusOptions	-Aa
-# endif
-# ifndef  CplusplusOptions
-#  define CplusplusOptions		-Aa
-# endif
-# ifndef  CplusplusCmd
-#  define CplusplusCmd 			/opt/CC/bin/CC
-# endif
-# ifndef  CplusplusDependIncludes 
-#  define CplusplusDependIncludes	-I/opt/CC/include/CC
-# endif
-#endif
-
-#ifndef  CcCmd
-# define CcCmd			/opt/ansic/bin/cc
-#endif
-#ifndef  YaccCmd
-# define YaccCmd		/opt/langtools/bin/yacc
-#endif
-#ifndef  LexCmd
-# define LexCmd			/opt/langtools/bin/lex
-#endif
-#ifndef  LintCmd
-# define LintCmd		/opt/ansic/bin/lint
-#endif
-
-#if HasCenterLineCplusplus
-# ifndef HasCplusplus
-#  define HasCplusplus			YES
-# endif
-# ifndef OptimizedCplusplusDebugFlags
-#  define OptimizedCplusplusDebugFlags	-O
-# endif
-# ifndef CplusplusDependIncludes 
-#  define CplusplusDependIncludes -I/usr/local/CenterLine/clc++/pa-hpux8/incl
-# endif
-#endif
-
-
-#define SystemV				YES
-#define Malloc0ReturnsNull		YES
-
-#ifdef __hp9000s800
-# ifndef OptimizedCDebugFlags
-#  define OptimizedCDebugFlags		+O1
-# endif
-# ifndef DefaultCCOptions
-#  define DefaultCCOptions		-Ae +ESlit
-# endif
-# ifndef SharedLibraryCCOptions
-#  define SharedLibraryCCOptions	-Ae
-# endif
-# if OSMajorVersion > 9
-#  define StandardDefines		-Dhpux -DSYSV -DHPUX_10
-# else
-# define StandardDefines		-Dhpux -DSYSV
-# endif
-# define ServerExtraDefines		-DXOS -DBSTORE -DSOFTWARE_CURSOR -DNO_ALLOCA -DSCREEN_PIXMAPS -DMERGE_SAVE_UNDERS -DHAS_IFREQ -DFORCE_SEPARATE_PRIVATE
-
-# if OSMajorVersion > 9
-#  include <hpLib.rules>
-# endif
-
-#else /* __hp9000s800 */
-# define StandardDefines	-Dhpux -DSYSV
-# if OSMajorVersion < 8
-#  define DefaultCCOptions	-Wc,-Nd4000,-Ns4100,-Ne700,-Np200,-Nw300
-#  define PexCCOptions		-Wp,-H150000 -Wc,-Nd4000,-Ns8100,-Ne700,-Np200
-# else
-#  define OptimizedCDebugFlags	+O1
-#  define PexCCOptions		-Wp,-H250000
-# endif
-# define PexShmIPC		NO
-# define LintOpts		-ax -Nd4000 -Ns8000 -Ne700 -Np200 -Na25000
-#endif
-#define MvCmd			mv -f
-#define LdCombineFlags		-r
-#define ExecableScripts		YES
-#define HasVFork		YES
-#define HasPoll			YES
-#define RemoveTargetProgramByMoving	YES
-#define ExpandManNames		YES
-#define HasPutenv		YES
-#define HasNdbm			YES
-#define DBMLibrary		/usr/lib/libdbm.a
-#define PrimaryScreenResolution	91
-#define ExtensionOSDefines	-DHPINPUT -DXTESTEXT1
-#ifndef XhpServer
-#define XhpServer		YES
-#endif
-#define ServerExtraSysLibs	-ldld
-#ifndef BuildXInputExt
-# define BuildXInputExt		YES
-#endif
-#define HPFastScrolling		YES
-#ifndef BuildServer
-# define BuildServer		__hp9000s700
-#define NeedBerklib		(BuildServer|BuildFontServer)
-#endif
-#define XawI18nDefines		-DHAS_WCHAR_H -DHAS_ISW_FUNCS
-
-#if OSMajorVersion < 6 || (OSMajorVersion == 6 && OSMinorVersion < 2)
-# define ConnectionFlags	-DTCPCONN	/* no unix sockets */
-#endif
-
-#if OSMajorVersion > 8
-#define HasWChar32             YES
-#define HasPlugin              YES
-#endif
-
-#ifdef __hp9000s300
-# ifndef CompatabilityDefines
-#  define CompatabilityDefines -D__hp9000s300 -Dhp9000s300
-# endif
-#elif defined(__hp9000s700)
-# ifndef CompatabilityDefines
-#  define CompatabilityDefines -D__hp9000s800 -Dhp9000s800 -D__hp9000s700
-# endif
-#else
-# ifndef CompatabilityDefines
-#  define CompatabilityDefines -D__hp9000s800 -Dhp9000s800
-# endif
-#endif
-
-#ifndef OsDefines
-# if OSMajorVersion > 9
-#  define OsDefines	-DhpV4 -DHPUX
-# else
-#  define OsDefines	-DHPUX
-# endif
-#endif
-
-#if OSMajorVersion > 9
-# if ThreadedX
-#  define MTSafeAPIDefines	-DXUSE_MTSAFE_API -DXUSE_NETDB_R_API
-# endif
-# define CppCmd			/opt/langtools/lbin/cpp
-#endif
-
-/* CC does not recognize -Ae, and has a different meaning for +e. */
-/* +e also confuses cpp. */
-#define AnsiDefines		-Ae -D_HPUX_SOURCE
-#define CplusplusAnsiDefines	-Aa -D_HPUX_SOURCE
-
-#define BuildLibPathVar	SHLIB_PATH
-
-#define CdeBaseProjectDefines \
-	-DNLS16 -DMALLOC_0_RETURNS_NULL -DMERGE -D__hpux \
-	-DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion \
-	CompatabilityDefines OsDefines
-
-#define CdeProjectDefines	CdeBaseProjectDefines AnsiDefines
-#define CdeCplusplusProjectDefines	\
-				CdeBaseProjectDefines CplusplusAnsiDefines
-
-#define DtSvcDefines		-DXK_MISCELLANY -DMULTIBYTE -DMESSAGE_CAT
-#define DtSearchDefines		-DI18N_MSG DtSvcDefines
-#define DtWidgetDefines		DtSearchDefines
-#define DtPrintDefines		DtSearchDefines
-#if OSMajorVersion > 9
-#define DtMailDefines		\
-  -DBIG_ENDIAN -DDO_ANONYMOUS_MAP -DNEED_MMAP_WRAPPER -DSENDMAIL_LOCKS \
-  -DMAILGROUP_REQUIRED -DMAIL_SPOOL_PATH=\"/var/mail/%s\"
-#else
-#define DtMailDefines		\
-  -DBIG_ENDIAN -DDO_ANONYMOUS_MAP -DNEED_MMAP_WRAPPER -DSENDMAIL_LOCKS \
-  -DMAILGROUP_REQUIRED -DMAIL_SPOOL_PATH=\"/usr/mail/%s\"
-#endif
-
-#define ArchitectureDefines	-DHP_ARCHITECTURE
-
-#define ExportListGenSource	elistgen.hp
--- a/Xvnc/config/cf/hpLib.rules
+++ /dev/null
@@ -1,119 +0,0 @@
-XCOMM $XConsortium: hpLib.rules /main/16 1996/12/04 11:44:35 swick $
-
-/*
- * HP shared library rules
- */
-
-#ifndef HasSharedLibraries
-# define HasSharedLibraries YES
-#endif
-#ifndef SharedDataSeparation
-# define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-# define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-# define SharedLibraryDef /**/
-#endif
-#ifndef ShLibIncludeFile
-# define ShLibIncludeFile <hpLib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-# define SharedLibraryLoadFlags -b
-#endif
-#ifndef PositionIndependentCFlags
-# define PositionIndependentCFlags +z
-#endif
-#ifndef LargePositionIndependentCFlags
-# define LargePositionIndependentCFlags +Z
-#endif
-#ifndef InstLibFlags
-# define InstLibFlags -m 0555
-#endif
-#ifndef UseInstalled
-/* assert: LdPostLib pulls in -L$(USRLIBDIR), so it doesn't need to be here */
-# define ExtraLoadFlags -Wl,+s -Wl,+b$(USRLIBDIRPATH)
-#endif
-#ifndef UseExportLists
-# define UseExportLists	YES
-#endif
-
-/* Pre-linking shared libraries is supported in HP/UX 10. */
-#if OSMajorVersion > 9
-# define HPRequiredLibs	$(LDPRELIBS) $(REQUIREDLIBS) +s +b $(USRLIBDIRPATH)
-#else
-# define HPRequiredLibs	$(REQUIREDLIBS)
-#endif
-
-#ifndef LinkWithExports
-# if UseExportLists
-#  define LinkWithExports(libname,rev,solist,down,up) \
-	(cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) +h $@ solist HPRequiredLibs)	@@\
-	if [ -f Concat(lib,libname.elist) ]; then \			@@\
-	    RemoveFiles($@.exports $@.list); \				@@\
-	    $(CPP) $(ALLINCLUDES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) Concat(lib,libname.elist) | CppSedMagic >$@.list; \	@@\
-	    $(EXPORTLISTGEN) $@~ $@.list > $@.exports; \		@@\
-	    (cd down; $(LD) -c up/$@.exports -o up/$@~ $(SHLIBLDFLAGS) +h $@ solist HPRequiredLibs); \ @@\
-	    RemoveFiles($@.exports $@.list); \				@@\
-	fi
-# else
-#  define LinkWithExports(libname,rev,solist,down,up) \
-	(cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) +h $@ solist HPRequiredLibs)
-# endif
-#endif
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-# define InstallSharedLibrary(libname,rev,dest)				@@\
-install:: Concat(lib,libname.sl.rev) 					@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	RMoveToBakFile(Concat($(DESTDIR)dest/lib,libname.sl.rev))	@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.sl.rev) $(DESTDIR)dest @@\
-	$(RM) Concat($(DESTDIR)dest/lib,libname.sl)			@@\
-	cd $(DESTDIR)dest; $(LN) Concat(lib,libname.sl.rev) Concat(lib,libname.sl) @@\
-	-RemoveFile(Concat(lib,libname.sl.rev.bak))
-
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-# define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedLibraryTarget
-# define SharedLibraryTarget(libname,rev,solist,down,up)		@@\
-AllTarget(Concat(lib,libname.sl.rev))					@@\
-									@@\
-Concat(lib,libname.sl.rev):  solist $(EXTRALIBRARYDEPS)			@@\
-	$(RM) $@~							@@\
-	LinkWithExports(libname,rev,solist,down,up)			@@\
-	-RemoveFiles($@ $@.bak)						@@\
-	MoveToBakFile($@)						@@\
-	$(MV) $@~ $@							@@\
-	$(RM) Concat(lib,libname.sl)					@@\
-	$(LN) $@ Concat(lib,libname.sl)					@@\
-	LinkBuildLibrary($@)						@@\
-	LinkBuildLibrary(Concat(lib,libname.sl))			@@\
-									@@\
-clean::									@@\
-	$(RM) Concat(lib,libname.sl.rev) Concat(lib,libname.sl)
-
-#endif /* SharedLibraryTarget */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-# define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryTarget */
--- a/Xvnc/config/cf/hpLib.tmpl
+++ /dev/null
@@ -1,37 +0,0 @@
-XCOMM $XConsortium: hpLib.tmpl /main/10 1996/12/04 11:57:22 swick $
-
-/*
- * HP shared library template
- */
-
-#define SharedThreadReqs	/**/
-#define SharedOldXReqs		$(XLIBONLY)
-#define SharedX11Reqs		SharedThreadReqs
-#define SharedXtReqs		$(XLIBONLY) $(SMLIB) $(ICELIB) SharedThreadReqs
-#define SharedXawReqs		$(XMULIB) $(XTOOLLIB) $(XLIB)
-#define SharedXmuReqs		$(XTOOLLIB) $(XLIB)
-#define SharedXextReqs		$(XLIBONLY)
-#define SharedXiReqs		$(XLIB)
-#define SharedPexReqs		$(XLIBONLY) MathLibrary
-#define SharedXtstReqs		$(XLIB)
-#define SharedXieReqs		$(XLIBONLY)
-#define SharedSMReqs		$(ICELIB)
-#define SharedXpReqs		$(XLIB)
-
-#define SharedXReqs		$(XTOOLLIB) $(XPLIB) $(XLIB) SharedThreadReqs
-#define SharedXmReqs		SharedXReqs
-#define SharedMrmReqs		$(XMLIB) SharedXReqs
-#define SharedUilReqs		$(MRESOURCELIB) $(XMLIB) SharedXReqs
-
-/* #define SharedPamReqs */
-#define SharedTtReqs		$(XTOOLLIB) $(XLIB) SharedThreadReqs $(CXXLIB)
-#define SharedDtSvcReqs		$(TTLIB) $(XMLIB) SharedXReqs -lm $(CXXLIB)
-#define SharedDtMmdbReqs	$(DTSVCLIB) $(TTLIB) $(XMLIB) SharedXReqs -lm $(CXXLIB)
-#define SharedDtSearchReqs	-lm
-#define SharedDtWidgetReqs	$(DTSVCLIB) $(XMLIB) SharedXReqs -lm $(CXXLIB)
-#define SharedDtHelpReqs	$(DTSVCLIB) $(XMLIB) SharedXReqs -lm
-#define SharedDtPrintReqs	$(DTSVCLIB) $(DTHELPLIB) $(XMLIB) SharedXReqs -lm $(CXXLIB)
-#define SharedDtTermReqs	$(DTHELPLIB) $(DTSVCLIB) $(XMLIB) SharedXReqs -lm
-#define SharedDtMrmReqs		$(DTTERMLIB) $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(MRESOURCELIB) $(XMLIB) SharedXReqs -lm
-#define SharedDtMailReqs	$(DTHELPLIB) $(DTSVCLIB) $(XMLIB) SharedXReqs -lm $(CXXLIB)
-#define SharedCsaReqs		$(DTSVCLIB) $(XMLIB) SharedXReqs -lm
--- a/Xvnc/config/cf/ibm.cf
+++ /dev/null
@@ -1,168 +0,0 @@
-XCOMM platform:  $XConsortium: ibm.cf /main/80 1996/12/26 08:52:31 kaleb $
-
-#ifndef OSName
-# define OSName		DefaultOSName
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion	DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion	DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-# ifdef DefaultOSTeenyVersion
-#  define OSTeenyVersion	DefaultOSTeenyVersion
-# elif (OSMajorVersion == 4) && (OSMinorVersion == 1)
-#  define OSTeenyVersion	3
-# else
-#  define OSTeenyVersion	0
-# endif
-#endif
-XCOMM operating system:  OSName (OSMajorVersion.OSMinorVersion.OSTeenyVersion)
-
-#if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion >= 2)
-#define HasBSD44Sockets		YES
-#define HasPutenv		YES
-/*
- * If you do not have threads support installed, put
- * #define HasPosixThreads	NO
- * in the BeforeVendorCF section of your site.def.
- */
-#if !defined(HasPosixThreads) && ((OSMajorVersion == 3 && (OSMinorVersion > 2 || (OSMinorVersion == 2 && OSTeenyVersion > 4))) || (OSMajorVersion == 4 && (OSMinorVersion > 1 || (OSMinorVersion == 1 && OSTeenyVersion > 1))))
-#define HasPosixThreads		YES
-#endif
-#if HasPosixThreads
-#ifndef ThreadedX
-#define ThreadedX		YES
-#define MTSafeAPIDefines	-DXUSE_MTSAFE_API -DXUSE_NETDB_R_API
-#endif
-#endif
-#endif /* OS > 3.2 */
-
-/*
- * For IBM platforms, we must define both the location of the compiler
- * and the location of its standard C++ library.  The library location
- * is needed to resolve dependent library symbols if we build our own
- * C++ shared libraries.
- */
-
-#if !HasGcc2ForCplusplus
-# ifndef CplusplusCmd
-#  if ThreadedX
-#   define CplusplusCmd		xlC_r
-#  else
-#   define CplusplusCmd		xlC
-#  endif
-# endif
-#endif
-
-#ifndef CplusplusFilt
-# define CplusplusFilt		/usr/lpp/xlC/bin/c++filt
-#endif
-#ifndef CplusplusLibC
-# if ThreadedX
-#  define CplusplusLibC		/usr/lpp/xlC/lib/libC.a
-# else
-#  define CplusplusLibC		/usr/lpp/xlC/lib/libC_r.a
-# endif
-#endif
-#if !HasGcc2ForCplusplus
-# ifndef CplusplusDependIncludes
-#  define CplusplusDependIncludes -I/usr/lpp/xlC/include
-# endif
-#endif
-
-/*
- * IBM's xlC refuses to compile files unless their names end in ".C".
- * As an alternative to this fix, one could edit /etc/xlC.cfg
- * to change the suffix accepted by the compiler, but we prefer not 
- * requiring users to reconfigure their C++ compilers to make them work.
- * We also have to override the default SUFFIXES to defeat the use of
- * the builtin .C -> .o file, which doesn't use the right flags.
- */
-
-.SUFFIXES:
-.SUFFIXES: .o .c .y .l .s .sh .h .f .Y .L .cxx
-
-#define NormalLibObjCplusplusCompile(options) test -r $*.C || $(LN) $*.CCsuf $*.C @@\
-	$(CXX) -c $(CXXFLAGS) options $*.C
-
-#define SpecialCplusplusObjectRule(baseobj,basedep,options)		@@\
-baseobj.Osuf:	basedep.CCsuf						@@\
-	test -r basedep.C || $(LN) basedep.CCsuf basedep.C		@@\
-	$(CXX) -c $(CXXFLAGS) options basedep.C
-
-
-#define BuildLibPathVar		LIBPATH
-#define SystemV			YES
-#define LdCombineFlags		-r
-#define ExecableScripts		YES
-#define Malloc0ReturnsNull	YES
-#define CppCmd			/usr/ccs/lib/cpp
-#define ExpandManNames		YES
-#define ExtensionOSDefines	-DXTESTEXT1
-#define XibmServer		YES
-#define ibmIncludeSKYWAY	YES
-
-/* IBM cpp has slightly non-standard line directives, but supports -P */
-#define CppNoLineInfoOption	-P
-
-#if OSMajorVersion > 3
-#define StandardDefines		-DSYSV -DAIXV3 -DAIXV4 -D_ALL_SOURCE
-#define XawI18nDefines		-DHAS_WCHAR_H -DHAS_ISW_FUNCS
-#define ServerExtraDefines	-D_IBM_LFT
-#if ThreadedX
-#define CcCmd			xlc_r
-#else
-#define CcCmd			xlc
-#endif
-#define SystemMTDefines		/* xlc_r defines -D_THREAD_SAFE */
-#define ThreadsLibraries	-lpthreads /* xlc_r does -lc_r */
-#define ThreadsCplusplusLibraries	-lpthreads
-#define AvoidNullMakeCommand	YES
-#define NullMakeCommand		@ echo
-/* AIX 4 appends all MAKEFLAGS (even dups), so cannot pass on command line. */
-#define ConstructMFLAGS		NO
-#define LdPreLib		_Use(-L$(USRLIBDIR),-L$(BUILDLIBDIR))
-#define ExtraFilesToClean	*.inp
-#else 	/* OSMajorVersion < 4 */
-#define StandardDefines         -DSYSV -DAIXV3 -D_ALL_SOURCE
-#define ServerExtraDefines	-D_IBM_HFT
-#define CcCmd			xlc
-#define ThreadPreStdAPIDefines	-DXPRE_STANDARD_API
-#define SystemMTDefines		-D_THREAD_SAFE
-#define ThreadsLibraries	-lpthreads -lc_r
-#endif	/* OSMajorVersion */
-
-#define OPERATING_SYSTEM 	AIX /* directory name under server/ddx/ibm/ */
-#define InstallCmd              /usr/ucb/install
-#include <ibmLib.rules>
-
-#ifndef ManKeywordsTarget
-#define ManKeywordsTarget(manpath)					@@\
-man_keywords::								@@\
-	/usr/lib/makewhatis $(DESTDIR)manpath
-#endif
-
-#define DtMailDefines		\
-  -DI_HAVE_NO_BOOL -DI_HAVE_SELECT_H \
-  -DBIG_ENDIAN -DSTRCASECMP_NOT_DEFINED -DDO_ANONYMOUS_MAP -DSENDMAIL_LOCKS \
-  -DMAILGROUP_REQUIRED -DMAIL_SPOOL_PATH=\"/var/spool/mail/%s\"
-
-#define ArchitectureDefines	-DIBM_ARCHITECTURE
-
-#define ExportListGenSource	elistgen.ibm
-
-#define CdeProjectDefines \
-	-D_AIX -D__AIX -D__aix -D_aix -Daix -DMULTIBYTE -DNLS16 -DMESSAGE_CAT \
-	-DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion -DAIX
-
-/*
- * -D__STR31__ disables inlining of memcpy to work around optimization bug
- * in XLC v1.2.0.7. Bug report filed as PMR 8X196, branch 060.
- */
-#ifndef OptimizedCDebugFlags
-#define OptimizedCDebugFlags	-O -D__STR31__ -DNDEBUG
-#endif
-
-#define CdeTicDefines	-DHAS_KNL -DHAS_KTAB
--- a/Xvnc/config/cf/ibmLib.rules
+++ /dev/null
@@ -1,204 +0,0 @@
-XCOMM $XConsortium: ibmLib.rules /main/15 1996/12/30 16:06:05 kaleb $
-
-/*
- * AIX shared library rules
- */
-
-#ifndef HasSharedLibraries
-# define HasSharedLibraries YES
-#endif
-#ifndef ForceNormalLib
-# define ForceNormalLib NO
-#endif
-#ifndef SharedDataSeparation
-# define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-# define SharedCodeDef -DSHAREDCODE
-#endif
-#ifndef SharedLibraryDef
-# define SharedLibraryDef -DAIXSHLIB
-#endif
-#ifndef ShLibIncludeFile
-# define ShLibIncludeFile <ibmLib.tmpl>
-#endif
-#ifndef PositionIndependentCFlags
-# define PositionIndependentCFlags -bM\:SRE
-#endif
-#ifndef ExtraLoadFlags
-# define ExtraLoadFlags -bnodelcsect
-#endif
-#if !defined(LdPostLib) && !defined(UseInstalled) && OSMajorVersion > 3
-# if ThreadedX
-#  define LdPostLib -blibpath:$(USRLIBDIRPATH):/usr/lib/threads:/usr/lib:/lib
-# else
-#  define LdPostLib -blibpath:$(USRLIBDIRPATH):/usr/lib:/lib
-# endif
-# define SharedLibPostRef $(LDPOSTLIBS)
-#endif
-#ifndef SharedLibPostRef
-# define SharedLibPostRef $(LDPOSTLIBS)
-#endif
-#if ThreadedX
-# define BaseShLibReqs -lc_r -lm
-#else
-# define BaseShLibReqs -lc -lm
-#endif
-#ifndef UseExportLists
-# define UseExportLists YES
-#endif
-
-/*
- * MakeExportList - generate an export list file for linking libraries.
- */
-#ifndef MakeExportList
-# if UseExportLists
-#  define MakeExportList(libname,result) \
-	@-RemoveFile(result)						@@\
-	case ,$(SHR4OBJLIBS), in *,libname,*) shr4obj=shr4.o;; esac &&\	@@\
-		echo "#! $@ ($${shr4obj:-shr.o})" > result		@@\
-	if [ -f Concat(lib,libname.elist) ]; then \			@@\
-	    $(CPP) $(ALLINCLUDES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) Concat(lib,libname.elist) | CppSedMagic > $@.list; \	@@\
-	    $(EXPORTLISTGEN) $@~ $@.list >> result; \			@@\
-	    RemoveFile($@.list); \					@@\
-	else \								@@\
-	    dump -g $@~ | sed -n -e 's/^[ 	]*[0-9][0-9]*[	 ]*\([^	 .][^	 ]*\)$$/\1/p' >> result; \	@@\
-	fi;
-# else
-#  define MakeExportList(libname,result) \
-	@-RemoveFile(result)						@@\
-	case ,$(SHR4OBJLIBS), in *,libname,*) shr4obj=shr4.o;; esac &&\	@@\
-		echo "#! $@ ($${shr4obj:-shr.o})" > result		@@\
-	dump -g $@~ | sed -n -e 's/^[ 	]*[0-9][0-9]*[	 ]*\([^	 .][^	 ]*\)$$/\1/p' >> result;
-# endif
-#endif /* MakeExportList */
-
-
-#if !defined(UseInstalled) && !defined(UseInstalledX11) \
-    && !defined(UseImports) && !defined(ImportX11)
-   /* we want this to be defined only when building X */
-
-# if OSMajorVersion < 4
-/*
- * SharedDSLibReferences - variables for shared libraries
- */
-
-#  ifndef SharedLibReferences
-#   define SharedLibReferences(varname,libname,libsource,revname,rev)	@@\
-Concat3(DEP,varname,LIB) = /**/						@@\
-Concat(varname,LIB) = _Use(Concat(-l,libname),Concat(libsource/lib,libname.a)) @@\
-LintLibReferences(varname,libname,libsource)
-#  endif
-
-# else
-
-#  ifndef SharedLibReferences
-#   define SharedLibReferences(varname,libname,libsource,revname,rev)	@@\
-Concat3(DEP,varname,LIB) = /**/						@@\
-Concat(varname,LIB) = _Use(Concat(-l,libname),Concat($(BUILDLIBDIR),/libname.imp) Concat3($(BUILDLIBDIR),/lib,libname.a)) @@\
-LintLibReferences(varname,libname,libsource)
-#  endif
-
-# endif
-
-/*
- * SharedDSLibReferences - variables for shared libraries
- */
-# ifndef SharedDSLibReferences
-#  define SharedDSLibReferences(varname,libname,libsource,revname,rev)	@@\
-SharedLibReferences(varname,libname,libsource,revname,rev)
-# endif
-
-# if OSMajorVersion == 4
-/*
- * UnsharedLibReferences - variables for unshared libraries
- */
-#  ifndef UnsharedLibReferences
-#   define UnsharedLibReferences(varname,libname,libsource)		@@\
-Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/lib,$(BUILDLIBDIR)/lib,libname.a)	@@\
-Concat(varname,LIB) = _Use(Concat(-l,libname),Concat($(BUILDLIBDIR)/lib,libname.a))	@@\
-LintLibReferences(varname,libname,libsource)
-#  endif
-# endif
-
-#endif /* !defined(UseInstalled) && !defined(UseInstalledX11) ... */
-
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-# define InstallSharedLibrary(libname,rev,dest)				@@\
-InstallLibrary(libname,dest)
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-# define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that the we do not hose people by having
- * the library gone for long periods.
- *
- * IBM uses an unusual shared object file name (shr4.o) in some libraries. 
- * Duplicate this behavior to preserve compatibility with IBM's libraries.
- */
-#if OSMajorVersion < 4
-
-# ifndef SharedLibraryTarget
-#  define SharedLibraryTarget(libname,rev,solist,down,up)		@@\
-AllTarget(Concat(lib,libname.a))					@@\
-									@@\
-Concat(lib,libname.a):  solist $(UNSHAREDOBJS) $(EXTRALIBRARYDEPS)	@@\
-	$(RM) $@~ shr.o shr4.o						@@\
-	(cd down; $(AR) up/$@~ solist)					@@\
-	dump -g $@~ | sed -n -e 's/^[ 	]*[0-9][0-9]*[	 ]*\([^	 .][^	 ]*\)$$/\1/p' > $@.syms	@@\
-	$(LD) -o shr.o $@~ -H512 -T512 -bM\:SRE -bE\:$@.syms $(REQUIREDLIBS) BaseShLibReqs SharedLibPostRef	@@\
-	$(LN) shr.o shr4.o						@@\
-	$(RM) $@~							@@\
-	case ,$(SHR4OBJLIBS), in *,libname,*) shr4obj=shr4.o;; esac &&\	@@\
-		$(AR) $@~ $${shr4obj} shr.o $(UNSHAREDOBJS)		@@\
-	$(RM) $@.syms $@ shr.o shr4.o					@@\
-	$(MV) $@~ $@							@@\
-	LinkBuildLibrary($@)						@@\
-									@@\
-clean::									@@\
-	$(RM) Concat(lib,libname.a)
-# endif /* SharedLibraryTarget */
-
-#else /* OSMajorVersion >= 4 */
-
-# ifndef SharedLibraryTarget
-#  define SharedLibraryTarget(libname,rev,solist,down,up)		@@\
-AllTarget(Concat(lib,libname.a))					@@\
-									@@\
-Concat(lib,libname.a):  solist $(UNSHAREDOBJS) $(EXTRALIBRARYDEPS)	@@\
-	RemoveFiles($@~ shr.o shr4.o)					@@\
-	(cd down; $(AR) up/$@~ solist)					@@\
-	MakeExportList(libname,libname.imp)				@@\
-	$(LD) -o shr.o $@~ -H512 -T512 -bM\:SRE -bE\:libname.imp -bnoentry $(REQUIREDLIBS) BaseShLibReqs $(LDPOSTLIBS)	@@\
-	$(LN) shr.o shr4.o						@@\
-	RemoveFile($@~)							@@\
-	case ,$(SHR4OBJLIBS), in *,libname,*) shr4obj=shr4.o;; esac &&\	@@\
-		$(AR) $@~ $${shr4obj} shr.o $(UNSHAREDOBJS)		@@\
-	RemoveFile($@)							@@\
-	$(MV) $@~ $@							@@\
-	LinkBuildLibrary($@)						@@\
-	LinkBuildLibrary(libname.imp)					@@\
-									@@\
-clean::									@@\
-	$(RM) Concat(lib,libname.a)
-# endif /* SharedLibraryTarget */
-
-#endif
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-# define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryTarget */
--- a/Xvnc/config/cf/ibmLib.tmpl
+++ /dev/null
@@ -1,76 +0,0 @@
-XCOMM $XConsortium: ibmLib.tmpl /main/21 1996/12/04 12:21:49 swick $
-
-/*
- * AIX shared library template
- */
-
-/*
- * IBM used an unusual shared object file name in some librares. 
- * Mimic this behavior to preserve compatibility with IBM's libraries.
- */
-#ifndef IBMShr4Compatibility
-#define IBMShr4Compatibility	YES
-#endif
-
-/*
- * Imake thinks lines with colons are the result of a broken cpp
- * inserting extra leading whitespace, so use ',' as a separator.
- */
-#if IBMShr4Compatibility
-      SHR4OBJLIBS = X11,Xt,oldX,Xm,Mrm,Uil
-#endif
-
-#if ThreadedX
-#define SharedThreadReqs -lpthreads
-#define SharedX11Reqs -lpthreads
-#else
-#define SharedThreadReqs /**/
-#endif
-
-#define SharedXextReqs	$(XLIBONLY)
-#define SharedXmuReqs	$(XTOOLLIB) $(XLIB)
-#define SharedOldXReqs	$(XLIBONLY)
-#define SharedXtReqs	$(XLIBONLY) $(SMLIB) $(ICELIB) SharedThreadReqs
-#define SharedXawReqs	$(XMULIB) $(XTOOLLIB) $(XLIB)
-#define SharedXiReqs	$(XLIB)
-#define SharedXtstReqs	$(XLIB)
-#define SharedPexReqs	$(XLIBONLY)
-#define SharedXieReqs	$(XLIBONLY)
-#define SharedSMReqs	$(ICELIB)
-#define SharedXpReqs	$(XLIB)
-
-#define SharedXReqs	$(XTOOLLIB) $(XPLIB) $(XLIB) SharedThreadReqs
-#define SharedXmReqs	$(LDPRELIBS) SharedXReqs
-#define SharedMrmReqs	$(LDPRELIBS) $(XMLIB) SharedXReqs
-#define SharedUilReqs	$(LDPRELIBS) $(MRESOURCELIB) $(XMLIB) SharedXReqs
-
-/* #define SharedPamReqs */
-#define SharedTtReqs	$(LDPRELIBS) SharedXReqs $(CXXLIB)
-#define SharedDtSvcReqs	$(LDPRELIBS) $(TTLIB) $(XMLIB) SharedXReqs $(CXXLIB)
-#define SharedDtMmdbReqs $(LDPRELIBS) $(DTSVCLIB) $(TTLIB) $(XMLIB) SharedXReqs $(CXXLIB)
-#define SharedDtSearchReqs $(LDPRELIBS) -lisode
-#define SharedDtWidgetReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXReqs 
-#define SharedDtHelpReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXReqs -liconv
-#define SharedDtPrintReqs $(LDPRELIBS) $(DTSVCLIB) $(DTHELPLIB) $(XMLIB) SharedXReqs
-#define SharedDtTermReqs $(LDPRELIBS) $(DTHELPLIB) $(DTSVCLIB) $(XMLIB) SharedXReqs -liconv -lm
-#define SharedDtMrmReqs $(LDPRELIBS) $(DTTERMLIB) $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(MRESOURCELIB) $(XMLIB) SharedXReqs
-#define SharedCsaReqs	$(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXReqs
-
-#if !defined(UseInstalled) && !defined(UseInstalledX11) \
-    && !defined(UseImports) && !defined(ImportX11)
-   /* we want this to be defined only when building X */
-# ifndef FixupLibReferences
-# define FixupLibReferences()						@@\
-DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libXt.a)
-# endif
-#endif
-
-/* The inbuf paramter to iconv(3) is "const char**", not "char **" */
-ICONV_INBUF_DEFINE = -DICONV_INBUF_CONST
-
-ICONVSYSLIB = -liconv
-
-#if (OSMajorVersion > 4) || ((OSMajorVersion == 4) && (OSMinorVersion >= 2))
-DYNLIBSYSLIB = -ldl
-#endif
-
--- a/Xvnc/config/cf/isc.cf
+++ /dev/null
@@ -1,214 +0,0 @@
-XCOMM $XConsortium: isc.cf /main/1 1996/10/31 14:45:18 kaleb $
-
-
-
-XCOMM platform:  $XFree86: xc/config/cf/isc.cf,v 3.11.2.1 1998/02/15 16:08:33 hohndel Exp $
-
-#ifndef HasGcc2
-#define HasGcc2			YES
-#endif
-
-/* INTERACTIVE UNIX SYSTEM (IUS) Version 3.x 4.x */
-
-#if IscVersion > 300
-# define ISCVerDef -DISC40 -DISC30
-# define OSVendor		(IUS Version 4.x)
-#else
-# if IscVersion == 300
-#  define ISCVerDef -DISC30
-#  define OSVendor		(ISC Version 3.0)
-# else
-#  if IscVersion == 202
-#   define OSVendor		(ISC Version 2.0.2)
-#   define ISCVerDef -DISC202
-#  else
-#   define OSVendor		(ISC Version 2.2.1)
-#   define ISCVerDef -DISC22
-#  endif
-# endif
-#endif
-
-/* gcc 2.7.2 tested Optimization Flags                               */
-#ifndef DefaultGcc2i386Opt
-# define DefaultGcc2i386Opt	-m486 -O2 -fno-strength-reduce -malign-loops=2 -malign-jumps=2 -malign-functions=2
-/* -fomit-frame-pointer */ 
-#endif
-
-/* For a POSIXized build on Interactive maybe needed to use gcc2.7.2 */
-#ifndef UsePosix
-# define UsePosix		YES
-#endif
-
-/* ISC 4.1Mu 
-#define IscCompileVersion	410
-*/
-
-#if !defined(IscCompileVersion) && IscVersion < 410
-/* ISC 4.0 compatible */
-#define IscCompileVersion	400
-#endif
-
-#if IscCompileVersion == 400
-
-/* binaries which should run on ISC 4.0 or for the build on a real 4.0 System */
-# define UseChmod		YES
-
-/* for compatibility with ISC 4.0 - reported by Ami Fischmann            */
-/* troubles when linking with libX11.a build on ISC4.1 and used with 4.0 */
-# define HasSnprintf		NO
-# define UseXwctomb		YES
-
-#endif
-
-#if defined(UseXwctomb)
-# define XwctombDefine	-DUSE_XMBTOWC 
-#else
-# define XwctombDefine	
-#endif 
-
-#if defined(UseChmod)
-# define IscCompatDefines	XwctombDefine -DUSE_CHMOD
-#else
-# define IscCompatDefines	XwctombDefine
-#endif 
-
-#ifdef UsePosix
-# define PosixDefines		-posix -D_SYSV3 -D_POSIX_SOURCE 
-#else
-# define PosixDefines
-#endif
-
-#define OSDefines		-DISC ISCVerDef IscCompatDefines
-
-/*
-#define OSName			Unix System V/386 Release 3.2
-#define OSMajorVersion		3
-#define OSMinorVersion		2
-*/
-#ifndef OSMajorVersion
-#define OSMajorVersion		DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion		DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion		DefaultOSTeenyVersion
-#endif
-
-#ifndef OSName
-#define OSName			INTERACTIVE UNIX System V/386 Release 3.2
-#endif
-
-XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-
-/* Note, cpp already does -Di386 */
-#define BootstrapCFlags		OSDefines -DSYSV
-
-#if IscVersion > 202
-# define LocalLibraries	-lpt
-# define PosixLibraries	-lcposix
-#else
-# define LocalLibraries        MallocLibrary -lpt
-# define PosixLibraries
-#endif
-
-#define SocketLibraries		-linet
-
-#ifndef GnuMallocLibrary
-#ifndef UseIscLd
-# define GnuMallocLibrary	-L/usr/local/lib -lgmalloc
-#else
-# define GnuMallocLibrary       /usr/local/lib/libgmalloc.a
-#endif
-#endif
-
-#ifndef MallocLibrary
-# if UseGnuMalloc
-#  define MallocLibrary		GnuMallocLibrary
-# else
-#  define MallocLibrary		-lmalloc
-# endif
-#endif
-
-#ifndef ExtraLibraries
-# if UseGnuMalloc
-#  define ExtraLibraries SocketLibraries LocalLibraries MallocLibrary PosixLibraries
-# else
-#  define ExtraLibraries SocketLibraries LocalLibraries PosixLibraries
-# endif
-#endif
-
-/* Don't know if this is necessary, but it avoids breaking the current setup */
-#define MallocLibraries		/**/
-
-#if UseXwctomb
-#define XawI18nDefines		-DUSE_XWCHAR_STRING
-#else
-#define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-#endif
-
-#if HasCbrt
-#define MathLibrary -loptm
-#endif
-
-#ifdef UseInlineMath
-#define InlineMathDefines	-DUseInlineMath
-#if !HasCbrt
-#define ServerExtraSysLibs	$(CBRT) MathLibrary
-#endif
-#endif
-
-#ifndef ServerExtraSysLibs
-#define ServerExtraSysLibs	$(CBRT)
-#endif
-
-#define ServerExtraDefines	SVR3mmapFlags XFree86ServerDefines
-
-#if IscVersion > 300
-# ifndef HasSymLinks
-#  define HasSymLinks           YES
-# endif
-#endif
-
-#define HasShm			YES
-
-#ifndef HasSnprintf
-#define HasSnprintf		YES
-#endif
-
-#ifndef HasLibCrypt
-#define HasLibCrypt		YES
-#define SpecialLibCrypt        -lcrypt
-#endif
-
-#ifndef DefaultCDebugFlags
-# if HasGcc2
-#  define DefaultCDebugFlags DefaultGcc2i386Opt PosixDefines InlineMathDefines
-# else
-#  define DefaultCDebugFlags -O PosixDefines InlineMathDefines
-# endif
-#endif
-
-#if HasGcc2
-# define CcCmd gcc 
-#endif
-
-#ifndef DefaultCplusplusOptions
-#define DefaultCplusplusOptions	-fno-implicit-templates
-#endif
-
-#ifndef ConnectionFlags
-#define ConnectionFlags -DLOCALCONN -DTCPCONN 
-/* -DSTREAMSCONN -DUNIXCONN -- does not work on ISC SVR3 */
-#endif
-
-#define CompressManCmd $(COMPRESS) -v
-
-#define XmanSearchPath /usr/catman
-
-#ifndef RemoveDSDENroffMacros
-#define RemoveDSDENroffMacros   YES
-#endif
-
-#include <svr3.cf>
-
--- a/Xvnc/config/cf/linux.cf
+++ /dev/null
@@ -1,390 +0,0 @@
-XCOMM platform:  $TOG: linux.cf /main/36 1997/06/16 22:21:03 kaleb $
-XCOMM platform:  $XFree86: xc/config/cf/linux.cf,v 3.57.2.12 1998/03/01 01:57:10 dawes Exp $
-
-#ifndef LinuxElfDefault
-#define LinuxElfDefault		YES
-#endif
-
-#ifndef UseElfFormat
-#define UseElfFormat		LinuxElfDefault
-#endif
-
-#ifndef OSBinaryType
-#if UseElfFormat
-#define OSBinaryType		[ELF]
-#else
-#ifdef AlphaArchitecture
-#define OSBinaryType		[ECOFF]
-#else
-#define OSBinaryType		[a.out]
-#endif
-#endif
-#endif
-
-#ifndef OSName
-#define OSName			DefaultOSName OSBinaryType
-#endif
-
-#ifndef OSVendor
-#define OSVendor		/**/
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion		DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion		DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion		DefaultOSTeenyVersion
-#endif
-
-/* Set some defaults for the Default* values in case imake doesn't find them */
-#ifndef DefaultLinuxCLibMajorVersion
-#if defined(AlphaArchitecture) || defined(PowerPCArchitecture) || \
-    defined(SparcArchitecture) || defined(ArmArchitecure) || \
-    defined(i386Architecture) || defined(s390Architecture) || \
-    defined(s390xArchitecture)
-#define DefaultLinuxCLibMajorVersion	6
-#else
-#define DefaultLinuxCLibMajorVersion	5
-#endif
-#endif
-#ifndef DefaultLinuxCLibMinorVersion
-#if DefaultLinuxCLibMajorVersion > 5
-#define DefaultLinuxCLibMinorVersion	0
-#else
-#define DefaultLinuxCLibMinorVersion	4
-#endif
-#endif
-#ifndef DefaultLinuxCLibTeenyVersion
-#define DefaultLinuxCLibTeenyVersion	0
-#endif
-
-#ifndef LinuxCLibMajorVersion
-#define LinuxCLibMajorVersion	DefaultLinuxCLibMajorVersion
-#endif
-#ifndef LinuxCLibMinorVersion
-#define LinuxCLibMinorVersion	DefaultLinuxCLibMinorVersion
-#endif
-#ifndef LinuxCLibTeenyVersion
-#define LinuxCLibTeenyVersion	DefaultLinuxCLibTeenyVersion
-#endif
-
-#ifndef LinuxBinUtilsMajorVersion
-#define LinuxBinUtilsMajorVersion	DefaultLinuxBinUtilsMajorVersion
-#endif
-
-XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-XCOMM libc:	(LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyVersion)
-XCOMM binutils:	(LinuxBinUtilsMajorVersion)
-
-/*
- * The Linux BinUtils major version.  25 => 2.5.x, which is what is included
- * with Slackware 3.0
- *
- * This remains for compatibility only.
- *
- */
-#ifndef BinUtilsMajorVersion
-#define BinUtilsMajorVersion	LinuxBinUtilsMajorVersion
-#endif
-
-#if LinuxCLibMajorVersion >= 6 || \
-	(LinuxCLibMajorVersion == 5 && LinuxCLibMinorVersion == 99)
-#define LinuxSourceDefines	-D_POSIX_C_SOURCE=199309L \
-				-D_POSIX_SOURCE -D_XOPEN_SOURCE=500L \
-				-D_BSD_SOURCE -D_SVID_SOURCE
-#define XawI18nDefines		-DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
-#if !defined(AlphaArchitecture)
-#define HasPosixThreads		YES
-#define ThreadedX		YES
-#define HasThreadSafeAPI	YES
-#define ThreadsLibraries	-lpthread
-#define SystemMTDefines		-D_REENTRANT
-#endif
-#ifndef HasLibCrypt
-#define HasLibCrypt		YES
-#endif
-#else
-#define LinuxSourceDefines	-D_POSIX_SOURCE \
-				-D_BSD_SOURCE -D_SVID_SOURCE -DX_LOCALE
-#define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-#ifndef HasLibCrypt
-#define HasLibCrypt		NO
-#endif
-#endif
-
-/* For compatibility */
-#define SourceDefines		LinuxSourceDefines
-
-#define HasGcc			YES
-#define HasGcc2			YES
-#ifndef HasGcc2ForCplusplus
-# define HasGcc2ForCplusplus	YES
-#endif
-#define GccUsesGas		YES
-#define UseGas			YES
-#define GnuCpp			YES
-#ifndef HasShadowPasswd
-# if UseElfFormat
-#  define HasShadowPasswd	YES
-# else
-#  define HasShadowPasswd	NO
-# endif
-#endif
-#define HasPutenv		YES
-#define HasShm			YES
-#define HasSockets		YES
-#if UseElfFormat || defined(AlphaArchitecture)
-#define HasSnprintf		YES
-#define HasMkstemp		YES
-#endif
-
-#define AvoidNullMakeCommand	YES
-#define StripInstalledPrograms	YES
-#define CompressAllFonts	YES
-#define Malloc0ReturnsNull	YES
-#define NeedConstPrototypes	YES
-#define NeedFunctionPrototypes	YES
-#define NeedNestedPrototypes	YES
-#define NeedVarargsPrototypes	YES
-#ifndef NeedWidePrototypes
-#define NeedWidePrototypes	NO
-#endif
-#define SetTtyGroup		YES
-
-#ifndef UseStaticTermcapLib
-#define UseStaticTermcapLib	NO
-#endif
-
-#define MkdirHierCmd		mkdir -p
-#if LinuxElfDefault
-#if UseElfFormat
-#define CcCmd			gcc
-#define AsCmd			as
-#define LdCmd			ld
-#define AsmDefines		-D__ELF__
-#define CplusplusCmd		c++
-#if UseStaticTermcapLib
-#define TermcapLibrary		StaticLibrary(/usr/lib/termcap,termcap)
-#endif
-#else
-#ifdef AlphaArchitecture
-#define CcCmd			gcc -b alpha-linuxecoff
-#define CplusplusCmd		g++ -b alpha-linuxecoff
-#define AsCmd			/usr/alpha-linuxecoff/bin/as
-#define LdCmd			/usr/alpha-linuxecoff/bin/ld -m alpha
-#define AsmDefines		-DUSE_GAS -U__ELF__
-#endif /* AlphaArchitecture */
-#ifdef SparcArchitecture
-#define AsmDefines		-D__ELF__
-#endif /* SparcArchitecture */
-#ifdef i386Architecture
-#define CcCmd			gcc -b i486-linuxaout
-#define CplusplusCmd		g++ -b i486-linuxaout
-#define AsCmd			/usr/i486-linuxaout/bin/as
-#define LdCmd			/usr/i486-linuxaout/bin/ld -m i386linux
-#define AsmDefines		-DUSE_GAS -U__ELF__
-#endif /* i386Architecture */
-#ifdef Mc68020Architecture
-#define CcCmd			gcc -b m68k-linuxaout
-#define CplusplusCmd		g++ -b m68k-linuxaout
-#define AsCmd			/usr/m68k-linuxaout/bin/as
-#define LdCmd			/usr/m68k-linuxaout/bin/ld -m m68klinux
-#define AsmDefines		-DUSE_GAS -U__ELF__
-#endif /* Mc68020Architecture */
-#endif
-#else
-#if UseElfFormat
-#ifdef AlphaArchitecture
-#define CcCmd			gcc -b alpha-linux
-#define AsCmd			/usr/alpha-linux/bin/as
-#define LdCmd			ld -m elf64alpha
-#define AsmDefines		-D__ELF__
-#define CplusplusCmd		c++ -b alpha-linux
-#endif /* AlphaArchitecture */
-#ifdef SparcArchitecture
-#define AsmDefines		-D__ELF__
-#endif /* SparcArchitecture */
-#ifdef i386Architecture
-#define CcCmd			gcc -b i486-linux
-#define AsCmd			/usr/i486-linux/bin/as
-#define LdCmd			ld -m elf_i386
-#define AsmDefines		-D__ELF__
-#define CplusplusCmd		c++ -b i486-linux
-#endif /* i386Architecture */
-#ifdef Mc68020Architecture
-#define CcCmd			gcc -b m68k-linux
-#define AsCmd			/usr/m68k-linux/bin/as
-#define LdCmd			ld -m m68kelf
-#define AsmDefines		-D__ELF__
-#define CplusplusCmd		c++ -b m68k-linux
-#endif /* Mc68020Architecture */
-#else
-#define CcCmd			gcc
-#define AsCmd			as
-#define LdCmd			ld
-#define AsmDefines		-DUSE_GAS
-#endif
-#endif
-#if UseElfFormat
-#ifndef BuildDynamicLoading
-#define BuildDynamicLoading	YES
-#endif
-#endif
-#define CppCmd			/lib/cpp
-#ifdef USE_BYACC
-#define YaccCmd			byacc
-#else
-#define YaccCmd			bison -y
-#endif
-#define LexCmd			flex -l
-#define LexLib			-lfl
-#define PreProcessCmd		CcCmd -E
-#define PostIncDir		DefaultGccIncludeDir
-#define LdCombineFlags		-r
-#define LdPostLib		/* Never needed */
-#define HasWChar32		YES
-#define StandardCppDefines	-traditional StandardDefines
-
-#ifdef i386Architecture
-#define OptimizedCDebugFlags	DefaultGcc2i386Opt
-#define LinuxMachineDefines	-D__i386__
-#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
-#define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
-#endif /* i386Architecture */
-
-#ifdef x86_64Architecture
-#define OptimizedCDebugFlags	-O2
-#define LinuxMachineDefines	-D__x86_64__
-#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
-#define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
-#endif /* x86_64Architecture */
-
-#ifdef AlphaArchitecture
-#define OptimizedCDebugFlags	-O2
-#define LinuxMachineDefines	-D__alpha__
-#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
-#define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
-#endif /* AlphaArchitecture */
-
-#ifdef Mc68020Architecture
-#define OptimizedCDebugFlags	-O2
-#define LinuxMachineDefines 	-D__mc68000__
-#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
-#define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
-#endif /* Mc68020Architecture */
-
-#ifdef s390Architecture
-#define OptimzedCDebugFlags	-O2
-#define LinuxMachineDefines	-D__s390__
-#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
-#define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
-#endif /* s390Architecture */
-
-#ifdef s390xArchitecture
-#define OptimzedCDebugFlags	-O2
-#define LinuxMachineDefines	-D__s390x__
-#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
-#define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
-#endif /* s390xArchitecture */
-
-#ifdef PowerPCArchitecture
-#define DefaultCCOptions        -fsigned-char
-#define OptimizedCDebugFlags	-O2
-#define LinuxMachineDefines 	-D__powerpc__
-#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
-#define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
-#endif /* PowerPCArchitecture */
-
-#ifdef ArmArchitecture
-#define DefaultCCOptions	-fsigned-char
-#define OptimizedCDebugFlags	-O2
-#define LinuxMachineDefines	-D__arm__
-#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
-#define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
-#endif /* Arm */
-
-#ifdef SparcArchitecture
-#define OptimizedCDebugFlags	-O2
-#define LinuxMachineDefines 	-D__sparc__
-#define ServerOSDefines		-DDDXOSINIT
-#define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
-#define AsVISOption		-Av9a
-#ifdef Sparc64Architecture
-#define AsOutputArchSize	64
-#else
-#define AsOutputArchSize	32
-#endif
-#if LinuxCLibMajorVersion <= 5
-/* Why we lack this when everybody else has it? */
-#define HasCbrt NO
-#endif
-#endif /* SparcArchitecture */
-
-/*================================================================
-   BEGIN ORL VNC modification
-   Always define _REENTRANT since we may use threaded libraries */
-
-/* REMOVE
-#define StandardDefines		-Dlinux LinuxMachineDefines LinuxSourceDefines
-*/
-
-#define StandardDefines		-Dlinux LinuxMachineDefines \
-				LinuxSourceDefines -D_REENTRANT
-
-/* END ORL VNC modification
-================================================================*/
-
-#if UseElfFormat
-#define DlLibrary		-rdynamic -ldl
-#else
-#define DlLibrary		/**/
-#endif
-
-#if BuildDynamicLoading
-#define ServerExtraSysLibs	DlLibrary
-#else
-#define ServerExtraSysLibs	/**/
-#endif
-#define ConnectionFlags		-DUNIXCONN -DTCPCONN
-
-/* Some of these man page defaults are overriden in the above OS sections */
-#ifndef ManSuffix
-# define ManSuffix	1x
-#endif
-#ifndef ManDir
-# define ManDir		$(MANSOURCEPATH)1
-#endif
-#ifndef LibManSuffix
-# define LibManSuffix	3x
-#endif
-#ifndef LibmanDir
-# define LibmanDir	$(MANSOURCEPATH)3
-#endif
-#ifndef FileManSuffix
-# define FileManSuffix	5x
-#endif
-#ifndef FileManDir
-# define FileManDir	$(MANSOURCEPATH)5
-#endif
-
-#ifndef StaticLibrary
-#define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
-#endif
-
-#define HasGnuMake	YES
-
-#define MakeNamedTargetSubdir(dir,flags,subname)\
-	$(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname
-
-#ifndef HasZlib
-# define HasZlib	YES
-#endif
-
-#ifndef HasFfsl
-#define HasFfsl         YES
-#endif
-
-#include <lnxLib.rules>
-#include <xfree86.cf>
--- a/Xvnc/config/cf/lnxLib.rules
+++ /dev/null
@@ -1,565 +0,0 @@
-XCOMM $XConsortium: lnxLib.rules /main/13 1996/09/28 16:11:01 rws $
-XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.28.2.3 1997/06/22 10:32:20 dawes Exp $
-
-/*
- * Linux shared library rules (DLL & ELF versions)
- */
-#ifndef HasSharedLibraries
-#define HasSharedLibraries YES
-#endif
-#ifndef ForceNormalLib
-#define ForceNormalLib NO
-#endif
-
-#define SharedOldX NO
-
-#if UseElfFormat
-
-#if (LinuxCLibMajorVersion >= 5 && LinuxCLibMinorVersion >= 4) || LinuxCLibMajorVersion >= 6
-#undef SpecialMalloc
-#define SpecialMalloc NO
-#undef UseInternalMalloc
-#define UseInternalMalloc NO
-#endif
-
-/*
- *	#define BaseShLibReqs	-lc
- *
- * I don't want to use this since the normal ELF executables should
- * be linked with libc.so. If it is not, i.e., static, the variables in
- * libc.so which is loaded in because of the other shared libraries
- * may have different values than the ones in the static ELF
- * executables. That happens if the binaries are linked with libg.a
- * or libc_p.a.
- *
- * If an ELF executable linked with libg.a or libc_p.a loads a shared
- * object which needs libc.so via dlopen (), I think it should fail.
- * It is a very bad idea. The moral story is DON'T USE dlopen () IN
- * ELF EXECUTABLES LINKED WITH libg.a OR libc_p.a. H.J.
- *
- */
-#define BaseShLibReqs
-
-#ifndef SharedDataSeparation
-#define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef /**/
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <lnxLib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags -shared
-#endif
-#ifndef PositionIndependentCFlags
-#define PositionIndependentCFlags -fPIC
-#endif
-#ifndef PositionIndependentCplusplusFlags
-#define PositionIndependentCplusplusFlags -fPIC
-#endif
-#ifndef ExtraLoadFlags
-#if LinuxBinUtilsMajorVersion >= 26
-#ifdef UseInstalled
-#if LinuxBinUtilsMajorVersion < 27
-#define ExtraLoadFlags -Wl,-rpath-link,$(USRLIBDIRPATH)
-#endif
-#else
-#define ExtraLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR)
-#endif
-#else
-#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
-#endif
-#endif
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- * NOTE: file must be executable, hence "INSTBINFLAGS"
- */
-#ifndef InstallSharedLibrary
-#define	InstallSharedLibrary(libname,rev,dest)				@@\
-install:: Concat(lib,libname.so.rev) 					@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
-	@T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`;\
-	  set -x; $(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T	@@\
-	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
-	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-#define	InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedLibraryTarget
-#ifdef UseInstalled
-#define LinkBuildSonameLibrary(lib) true
-#else
-#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \
-	cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .)
-#endif
-
-#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
-AllTarget(Concat(lib,libname.so.rev))					@@\
-									@@\
-Concat(lib,libname.so.rev):  solist $(EXTRALIBRARYDEPS)			@@\
-	$(RM) $@~							@@\
-	@SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \		@@\
-		(cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
-		$(RM) $$SONAME; $(LN) $@ $$SONAME; \			@@\
-		LinkBuildSonameLibrary($$SONAME)			@@\
-	$(RM) $@ 							@@\
-	$(MV) $@~ $@							@@\
-	$(RM) Concat(lib,libname.so)					@@\
-	$(LN) $@ Concat(lib,libname.so)					@@\
-	LinkBuildLibrary($@)						@@\
-	LinkBuildLibrary(Concat(lib,libname.so))			@@\
-									@@\
-clean::									@@\
-	@MAJREV=`expr rev : '\(.*\)\.'`; \				@@\
-	set -x; $(RM) Concat(lib,libname.so.$$MAJREV)			@@\
-	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-
-#endif /* SharedLibraryTarget */
-
-#ifndef SharedDepModuleTarget
-#define SharedDepModuleTarget(name,deps,solist)				@@\
-AllTarget(name)								@@\
-									@@\
-name: deps								@@\
-	$(RM) $@~							@@\
-	$(CC) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) BaseShLibReqs @@\
-	$(RM) $@							@@\
-	$(MV) $@~ $@							@@\
-									@@\
-clean::									@@\
-	$(RM) name
-
-#endif /* SharedDepModuleTarget */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryTarget */
-
-#else /* UseElfFormat */
-
-#ifndef SharedDataSeparation
-#define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef /**/
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <lnxLib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags /**/
-#endif
-#ifndef PositionIndependentCFlags
-#define PositionIndependentCFlags -B/usr/bin/jump
-#endif
-
-/*
- * These definitions are now extended to work with the X sources and
- * external sources wishing to build shared libs.
- *
- * A library can create it's own shlibs (.so) or can be incorporated into
- * another "host" lib. All libraries generate stub (.sa) files.
- * A "host" lib does all the work to generate the stubs for itself and its
- * "guests", invoking the "guest" Makefiles to create the objects for
- * inclusion into the "host" shlib. A "guest" lib will ask the "host" to
- * create the stubfiles, then copy its own into its directory.
- * Most external libs are "host" libs; the concept of "guest" is a holdover
- * from older libs during the days of scarce shared library address space.
- *
- * To create a simple "host" shared lib, Xfoo, define:
- *
- *  JUMP_ROOT_Xfoo = <source directory>
- *  JUMP_IS_HOST_Xfoo = YES
- *  JUMP_STUBLIBS_Xfoo = libXfoo.sa
- *  JUMP_DIR_Xfoo = $(JUMP_ROOT_Xfoo)/shared		<work directory>
- *  JUMP_DEFS_Xfoo = -DFOO				<defs for jump files>
- *  JUMP_VARS_Xfoo = $(JUMP_ROOT_Xfoo)/jump_vars	<see DLL docs>
- *  JUMP_FUNCS_Xfoo = $(JUMP_ROOT_Xfoo)/jump_funcs	<see DLL docs>
- *  JUMP_IGNORE_Xfoo = $(JUMP_ROOT_Xfoo)/jump_ignore	<see DLL docs>
- *  JUMP_EXPORT_Xfoo = $(JUMP_DIR_Xfoo)/jump.vars	<exported symbols>
- *  JUMP_IMPORT_Xfoo = $(JUMP_EXPORT_Xbar)		<imported symbols>
- *  JUMP_ADDRESS_Xfoo = 0xXXXXXXXX			<fill in with address>
- *  JUMP_JUMPTABLESIZE_Xfoo = 0x4000			<adjust if necessary>
- *  JUMP_GOTSIZE_Xfoo = 4096				<adjust if necessary>
- *  JUMP_STUBNAMES_Xfoo = libXfoo			<and others>
- *  JUMP_STUBS_IMPORT_Xfoo = /usr/lib/libc.sa		<and others>
- *  JUMP_LDLIBS_Xfoo = `$(CC) --print-libgcc-file-name` -lc <and others>
- *
- * To create a complex "host", you need to add
- *  JUMP_SIBARS_Xt = jump/libXbar.a~			<and others>
- * These are the archives of the shared objects of the "guest" libs. They
- * need to be added to the JUMP_LDLIBS_Xfoo lines.
- *
- * For further clarification, study the definitions of libXaw, a simple "host"
- * lib, libXt, a complex "host" lib, and libXmu, one of libXts "guests".
- *
- * As a hint of how to start (with the DLL docs), touch jump_vars, jump_funcs
- * and jump_ignore, then compile. Then massage the jump.vars and jump.funcs
- * files in the shared subdirectory into jump_xxx files.
- */
-
-#ifndef UseInstalled
-XCOMM These are only needed to build the server
-
-#if LinuxElfDefault
-LIBC_SA = /usr/i486-linuxaout/lib/libc.sa
-LIBM_SA = /usr/i486-linuxaout/lib/libm.sa
-#else
-LIBC_SA = /usr/lib/libc.sa
-LIBM_SA = /usr/lib/libm.sa
-#endif
-
-JUMP_LDLIBS_libc = `$(CC) --print-libgcc-file-name` -lc
-
-XCOMM libX11.so (X11, SM, ICE)
-JUMP_ROOT_X11 = $(XLIBSRC)
-JUMP_IS_HOST_X11 = YES
-JUMP_STUBLIBS_X11 = libX11.sa libSM.sa libICE.sa
-JUMP_SIBDIRS_X11 = $(JUMP_ROOT_SM) $(JUMP_ROOT_ICE)
-JUMP_DIR_X11 = $(JUMP_ROOT_X11)/shared
-JUMP_DEFS_X11 = $(XDMAUTHDEFS) $(XKB_DEFINES)
-JUMP_VARS_X11 = $(JUMP_ROOT_X11)/jump_vars
-JUMP_FUNCS_X11 = $(JUMP_ROOT_X11)/jump_funcs
-JUMP_IGNORE_X11 = $(JUMP_ROOT_X11)/jump_ignore
-JUMP_EXPORT_X11 = $(JUMP_DIR_X11)/jump.vars
-JUMP_ADDRESS_X11 = 0x60200000
-JUMP_JUMPTABLESIZE_X11 = 0x4000
-JUMP_GOTSIZE_X11 = 4096
-JUMP_STUBNAMES_X11 = libX11 libSM libICE
-JUMP_STUBS_IMPORT_X11 = $(LIBC_SA)
-JUMP_SIBARS_X11 = jump/libSM.a~ jump/libICE.a~
-JUMP_LDLIBS_X11 = $(JUMP_SIBARS_X11) $(JUMP_LDLIBS_libc)
-
-XCOMM libSM (part of libX11.so)
-JUMP_ROOT_SM = $(SMSRC)
-JUMP_IS_HOST_SM = NO
-JUMP_HOST_SM = $(JUMP_ROOT_X11)
-JUMP_DIR_SM = $(JUMP_DIR_X11)
-
-XCOMM libICE (part of libX11.so)
-JUMP_ROOT_ICE = $(ICESRC)
-JUMP_IS_HOST_ICE = NO
-JUMP_HOST_ICE = $(JUMP_ROOT_X11)
-JUMP_DIR_ICE = $(JUMP_DIR_X11)
-
-XCOMM libXt.so (Xt, Xmu, Xext, Xi, Xtst, Xp)
-JUMP_ROOT_Xt = $(TOOLKITSRC)
-JUMP_IS_HOST_Xt = YES
-JUMP_STUBLIBS_Xt = libXt.sa libXmu.sa libXext.sa libXi.sa libXtst.sa libXp.sa
-JUMP_SUBDIRS_Xt = $(JUMP_ROOT_X11)
-JUMP_SIBDIRS_Xt = $(JUMP_ROOT_Xmu) $(JUMP_ROOT_Xext) \
-	$(JUMP_ROOT_Xi) $(JUMP_ROOT_Xtst) $(JUMP_ROOT_Xp)
-JUMP_DIR_Xt = $(JUMP_ROOT_Xt)/shared
-JUMP_VARS_Xt = $(JUMP_ROOT_Xt)/jump_vars
-JUMP_FUNCS_Xt = $(JUMP_ROOT_Xt)/jump_funcs
-JUMP_IGNORE_Xt = $(JUMP_ROOT_Xt)/jump_ignore
-JUMP_EXPORT_Xt = $(JUMP_DIR_Xt)/jump.vars
-JUMP_IMPORT_Xt = $(JUMP_EXPORT_X11)
-JUMP_ADDRESS_Xt = 0x602a0000
-JUMP_JUMPTABLESIZE_Xt = 0x4000
-JUMP_GOTSIZE_Xt = 4096
-JUMP_STUBNAMES_Xt = libXt libXmu libXext libXi libXtst libXp
-JUMP_STUBS_IMPORT_Xt = $(JUMP_STUBS_IMPORT_X11)
-JUMP_SIBARS_Xt = jump/libXmu.a~ jump/libXext.a~ jump/libXi.a~ jump/libXtst.a~ jump/libXp.a~
-JUMP_LDLIBS_Xt = $(JUMP_SIBARS_Xt) $(JUMP_ROOT_ICE)/libICE.sa \
-	$(JUMP_ROOT_SM)/libSM.sa $(JUMP_ROOT_X11)/libX11.sa $(JUMP_LDLIBS_libc)
-
-XCOMM libXmu (part of libXt.so)
-JUMP_ROOT_Xmu = $(XMUSRC)
-JUMP_IS_HOST_Xmu = NO
-JUMP_HOST_Xmu = $(JUMP_ROOT_Xt)
-JUMP_DIR_Xmu = $(JUMP_DIR_Xt)
-
-XCOMM libXext (part of libXt.so)
-JUMP_ROOT_Xext = $(XEXTLIBSRC)
-JUMP_IS_HOST_Xext = NO
-JUMP_HOST_Xext = $(JUMP_ROOT_Xt)
-JUMP_DIR_Xext = $(JUMP_DIR_Xt)
-
-XCOMM libXi (part of libXt.so)
-JUMP_ROOT_Xi = $(XILIBSRC)
-JUMP_IS_HOST_Xi = NO
-JUMP_HOST_Xi = $(JUMP_ROOT_Xt)
-JUMP_DIR_Xi = $(JUMP_DIR_Xt)
-
-XCOMM libXtst (part of libXt.so)
-JUMP_ROOT_Xtst = $(XTESTLIBSRC)
-JUMP_IS_HOST_Xtst = NO
-JUMP_HOST_Xtst = $(JUMP_ROOT_Xt)
-JUMP_DIR_Xtst = $(JUMP_DIR_Xt)
-
-XCOMM libXp (part of libXt.so)
-JUMP_ROOT_Xp = $(XPLIBSRC)
-JUMP_IS_HOST_Xp = NO
-JUMP_HOST_Xp = $(JUMP_ROOT_Xt)
-JUMP_DIR_Xp = $(JUMP_DIR_Xt)
-
-XCOMM libXaw.so (Xaw)
-JUMP_ROOT_Xaw = $(AWIDGETSRC)
-JUMP_IS_HOST_Xaw = YES
-JUMP_STUBLIBS_Xaw = libXaw.sa
-JUMP_SUBDIRS_Xaw = $(JUMP_ROOT_Xt)
-JUMP_DIR_Xaw = $(JUMP_ROOT_Xaw)/shared
-JUMP_VARS_Xaw = $(JUMP_ROOT_Xaw)/jump_vars
-JUMP_FUNCS_Xaw = $(JUMP_ROOT_Xaw)/jump_funcs
-JUMP_IGNORE_Xaw = $(JUMP_ROOT_Xaw)/jump_ignore
-JUMP_EXPORT_Xaw = $(JUMP_DIR_Xaw)/jump.vars
-JUMP_IMPORT_Xaw = $(JUMP_EXPORT_Xt) $(JUMP_EXPORT_X11)
-JUMP_ADDRESS_Xaw = 0x60300000
-JUMP_JUMPTABLESIZE_Xaw = 0x4000
-JUMP_GOTSIZE_Xaw = 4096
-JUMP_STUBNAMES_Xaw = libXaw
-JUMP_STUBS_IMPORT_Xaw = $(JUMP_STUBS_IMPORT_X11)
-JUMP_LDLIBS_Xaw = $(JUMP_ROOT_Xt)/libXt.sa $(JUMP_ROOT_Xt)/libXmu.sa \
-	$(JUMP_ROOT_Xt)/libXext.sa $(JUMP_ROOT_X11)/libX11.sa \
-	$(JUMP_LDLIBS_libc)
-
-# libPEX.so (PEX5)
-JUMP_ROOT_PEX5 = $(PEXLIBSRC)
-JUMP_IS_HOST_PEX5 = YES
-JUMP_STUBLIBS_PEX5 = libPEX5.sa
-JUMP_SUBDIRS_PEX5 = $(JUMP_ROOT_X11)
-JUMP_DIR_PEX5 = $(JUMP_ROOT_PEX5)/shared
-JUMP_VARS_PEX5 = $(JUMP_ROOT_PEX5)/jump_vars
-JUMP_FUNCS_PEX5 = $(JUMP_ROOT_PEX5)/jump_funcs
-JUMP_IGNORE_PEX5 = $(JUMP_ROOT_PEX5)/jump_ignore
-JUMP_EXPORT_PEX5 = $(JUMP_DIR_PEX5)/jump.vars
-JUMP_IMPORT_PEX5 = $(JUMP_EXPORT_X11)
-JUMP_ADDRESS_PEX5 = 0x60b00000
-JUMP_JUMPTABLESIZE_PEX5 = 0x4000
-JUMP_GOTSIZE_PEX5 = 4096
-JUMP_STUBNAMES_PEX5 = libPEX5
-JUMP_STUBS_IMPORT_PEX5 = $(JUMP_STUBS_IMPORT_X11) $(LIBM_SA)
-JUMP_LDLIBS_PEX5 = $(JUMP_ROOT_X11)/libX11.sa $(JUMP_LDLIBS_libc) -lm
-
-# libXIE.so (XIE)
-JUMP_ROOT_XIE = $(XIELIBSRC)
-JUMP_IS_HOST_XIE = YES
-JUMP_STUBLIBS_XIE = libXIE.sa
-JUMP_SUBDIRS_XIE = $(JUMP_ROOT_X11)
-JUMP_DIR_XIE = $(JUMP_ROOT_XIE)/shared
-JUMP_VARS_XIE = $(JUMP_ROOT_XIE)/jump_vars
-JUMP_FUNCS_XIE = $(JUMP_ROOT_XIE)/jump_funcs
-JUMP_IGNORE_XIE = $(JUMP_ROOT_XIE)/jump_ignore
-JUMP_EXPORT_XIE = $(JUMP_DIR_XIE)/jump.vars
-JUMP_IMPORT_XIE = $(JUMP_EXPORT_X11)
-JUMP_ADDRESS_XIE = 0x60be0000
-JUMP_JUMPTABLESIZE_XIE = 0x4000
-JUMP_GOTSIZE_XIE = 4096
-JUMP_STUBNAMES_XIE = libXIE
-JUMP_STUBS_IMPORT_XIE = $(JUMP_STUBS_IMPORT_X11) $(LIBM_SA)
-JUMP_LDLIBS_XIE = $(JUMP_ROOT_X11)/libX11.sa $(JUMP_LDLIBS_libc) -lm
-
-#endif /* !UseInstalled */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shared data file
- */
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)
-#endif
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * There are two basic flavors of libs: self-generating, which create
- * their own (and possibly other) libs, and hosted, which rely on another
- * lib for all the work.
- */
-#ifndef SharedLibraryTarget
-#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
-XCOMM This logic is such to compile the libs in their proper order,	@@\
-XCOMM remain dependent on subsidiary libs, and yet minimize local work	@@\
-									@@\
-JUMP_DIR=./jump								@@\
-JUMP_LIB=Concat(lib,libname)						@@\
-									@@\
-XCOMM  this is needed for newer gnumake versions			@@\
-export JUMP_DIR JUMP_LIB						@@\
-									@@\
-JUMP_IS_HOST=$(Concat(JUMP_IS_HOST_,libname))				@@\
-JUMP_AR=$(JUMP_DIR)/Concat(lib,libname.a~)				@@\
-JUMP_SA=Concat(lib,libname.sa)						@@\
-JUMP_SO=Concat(lib,libname.so.rev)					@@\
-									@@\
-JUMP_HOST=$(Concat(JUMP_HOST_,libname))					@@\
-									@@\
-INSTSOLIBFLAGS=-m 0555							@@\
-									@@\
-AllTarget($(BUILDLIBDIR)/$(JUMP_SA))					@@\
-									@@\
-$(BUILDLIBDIR)/$(JUMP_SA): $(JUMP_SA)					@@\
-	LinkBuildLibrary($(JUMP_SA))					@@\
-									@@\
-$(JUMP_SA) $(Concat(JUMP_STUBLIBS_,libname)) do_JUMP_SA: \
-		down/mk_JUMP_SA_$(JUMP_IS_HOST)				@@\
-									@@\
-down/mk_JUMP_SA_0:: mk_JUMP_HOST					@@\
-									@@\
-down/mk_JUMP_SA_0:: $(JUMP_HOST)/$(JUMP_SA)				@@\
-	$(RM) $(JUMP_SA)						@@\
-	$(LN) $(JUMP_HOST)/$(JUMP_SA) $(JUMP_SA)			@@\
-	touch $@							@@\
-									@@\
-down/mk_JUMP_SA_1:: $(JUMP_SO)						@@\
-									@@\
-down/mk_JUMP_SA_1:: down/mk_JUMP_SO_2					@@\
-	$(RM) $(Concat(JUMP_STUBLIBS_,libname))				@@\
-	mkstubs -v rev -l $(JUMP_LIB) \
-		-a $(Concat(JUMP_ADDRESS_,libname)) \
-		-j $(Concat(JUMP_JUMPTABLESIZE_,libname)) \
-		-g $(Concat(JUMP_GOTSIZE_,libname)) \
-		-- $(Concat(JUMP_STUBNAMES_,libname))			@@\
-	verify-shlib -l $(JUMP_SO) \
-		$(Concat(JUMP_STUBLIBS_,libname))			@@\
-	$(MV) verify.out $(JUMP_DIR)					@@\
-	touch $@							@@\
-									@@\
-mk_JUMP_HOST:								@@\
-	@echo checking stub library $(JUMP_SA) in $(JUMP_HOST)...	@@\
-	@(cd $(JUMP_HOST); $(MAKE) $(MFLAGS) $(JUMP_SA)) || exit 1	@@\
-	@echo ok. continuing in $(Concat(JUMP_ROOT_,libname))...	@@\
-									@@\
-$(JUMP_SO): down/mk_JUMP_SO_$(JUMP_IS_HOST)				@@\
-									@@\
-down/mk_JUMP_SO_0:							@@\
-									@@\
-down/mk_JUMP_SO_1:: $(JUMP_AR) mk_JUMP_SIBDIRS down/mk_JUMP_SO_2	@@\
-									@@\
-down/mk_JUMP_SO_2: down/mk_JUMP_AR $(Concat(JUMP_SIBARS_,libname))	@@\
-	$(RM) $(JUMP_SO)						@@\
-	mkimage -f -v rev -l $(JUMP_LIB) \
-		-a $(Concat(JUMP_ADDRESS_,libname)) \
-		-j $(Concat(JUMP_JUMPTABLESIZE_,libname)) \
-		-g $(Concat(JUMP_GOTSIZE_,libname)) \
-		-- $(JUMP_AR) $(Concat(JUMP_LDLIBS_,libname))		@@\
-	$(RM) $(JUMP_DIR)/__jump.s $(JUMP_DIR)/__jump.o			@@\
-	LinkBuildLibrary($(JUMP_SO))					@@\
-	touch $@							@@\
-									@@\
-mk_JUMP_SIBDIRS:							@@\
-	@for d in $(Concat(JUMP_SIBDIRS_,libname)); do \
-		echo checking ar library in $$d...; \
-		(cd $$d ; $(MAKE) $(MFLAGS) fastdo_JUMP_AR) || exit 1; \
-		echo ok. continuing in $(Concat(JUMP_ROOT_,libname))...;done@@\
-									@@\
-fastdo_JUMP_AR: $(JUMP_DIR) down/mk_JUMP_AR				@@\
-									@@\
-$(JUMP_AR) do_JUMP_AR:: jumpsetup down/mk_JUMP_AR			@@\
-									@@\
-jumpsetup: $(JUMP_DIR) jumpsetup_$(JUMP_IS_HOST)			@@\
-									@@\
-$(JUMP_DIR):								@@\
-	$(RM) jump							@@\
-	LibMkdir($(Concat(JUMP_DIR_,libname)))				@@\
-	$(LN) $(Concat(JUMP_DIR_,libname)) jump				@@\
-									@@\
-jumpsetup_0:								@@\
-	@echo doing jump setup in host $(JUMP_HOST)...			@@\
-	@(cd $(JUMP_HOST); $(MAKE) $(MFLAGS) jumpsetup) || exit 1	@@\
-	@echo ok. continuing in $(Concat(JUMP_ROOT_,libname))...	@@\
-									@@\
-jumpsetup_1::								@@\
-	@for d in $(Concat(JUMP_SUBDIRS_,libname)); do \
-		echo checking stub library in $$d...; \
-		(cd $$d ; $(MAKE) $(MFLAGS) do_JUMP_SA) || exit 1; \
-		echo ok. continuing in $(Concat(JUMP_ROOT_,libname))...;done@@\
-									@@\
-jumpsetup_1:: $(JUMP_DIR)/jump.funcs $(JUMP_DIR)/jump.vars \
-	$(JUMP_DIR)/jump.ignore $(JUMP_DIR)/jump.import			@@\
-									@@\
-$(JUMP_DIR)/jump.funcs: $(Concat(JUMP_FUNCS_,libname))			@@\
-	$(RM) $(JUMP_DIR)/jump.funcs					@@\
-	cat $(Concat(JUMP_FUNCS_,libname)) | \
-		$(CPP) $(ALLDEFINES) $(Concat(JUMP_DEFS_,libname)) > $@	@@\
-									@@\
-$(JUMP_DIR)/jump.vars: $(Concat(JUMP_VARS_,libname))			@@\
-	$(RM) $(JUMP_DIR)/jump.vars					@@\
-	cat $(Concat(JUMP_VARS_,libname)) | \
-		$(CPP) $(ALLDEFINES) $(Concat(JUMP_DEFS_,libname)) > $@	@@\
-									@@\
-$(JUMP_DIR)/jump.ignore: $(Concat(JUMP_IGNORE_,libname))		@@\
-	$(RM) $(JUMP_DIR)/jump.ignore					@@\
-	cat $(Concat(JUMP_IGNORE_,libname)) | \
-		$(CPP) $(ALLDEFINES) $(Concat(JUMP_DEFS_,libname)) > $@	@@\
-									@@\
-$(JUMP_DIR)/jump.import: $(JUMP_DIR)/stubs.import \
-		$(Concat(JUMP_IMPORT_,libname))				@@\
-	$(RM) $(JUMP_DIR)/jump.import					@@\
-	cat $(JUMP_DIR)/stubs.import $(Concat(JUMP_IMPORT_,libname)) > $@ @@\
-									@@\
-$(JUMP_DIR)/stubs.import: $(Concat(JUMP_STUBS_IMPORT_,libname))		@@\
-	$(RM) $(JUMP_DIR)/stubs.import					@@\
-	nm --no-cplus $(Concat(JUMP_STUBS_IMPORT_,libname)) | grep '__GOT__' | \
-		sed 's/__GOT__/_/' > $@					@@\
-									@@\
-down/mk_JUMP_AR: solist							@@\
-	$(RM) $(JUMP_AR)						@@\
-	@if [ -s $(JUMP_DIR)/jump.log ]; then \
-		echo "Error: Leftover globals for shared lib"; \
-		exit 1; fi						@@\
-	(cd down; $(AR) up/$(JUMP_AR) solist) || exit 1			@@\
-	$(RANLIB) $(JUMP_AR)						@@\
-	touch $@							@@\
-									@@\
-clean:: jumpclean							@@\
-									@@\
-jumpclean: jumpclean_$(JUMP_IS_HOST)					@@\
-	$(RM) $(JUMP_SA) down/mk_JUMP_AR				@@\
-	$(RM) -r $(JUMP_DIR)						@@\
-									@@\
-jumpclean_0:								@@\
-	$(RM) down/mk_JUMP_SA_0						@@\
-	$(RM) $(JUMP_HOST)/$(JUMP_SA)					@@\
-									@@\
-jumpclean_1:								@@\
-	$(RM) -r $(JUMP_SO) $(Concat(JUMP_DIR_,libname)) \		@@\
-		down/mk_JUMP_SA_1 down/mk_JUMP_SO_1 down/mk_JUMP_SO_2
-#endif /* SharedLibraryTarget */
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-#define	InstallSharedLibrary(libname,rev,dest)				@@\
-install:: $(JUMP_SA) $(JUMP_SO)						@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	@if [ "$(JUMP_IS_HOST)" = YES ]; then \
-		(T=$(DESTDIR)dest/`echo $(JUMP_SO)|sed 's/\.[^\.]*$$//'`;\
-		set -x; \
-		$(INSTALL) -s -c $(INSTSOLIBFLAGS) $(JUMP_SO) $(DESTDIR)dest; \
-		$(RM) $$T && $(LN) $(JUMP_SO) $$T); fi			@@\
-	$(INSTALL) -c $(INSTLIBFLAGS) $(JUMP_SA) $(DESTDIR)dest
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-#define	InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-#endif /* UseElfFormat */
--- a/Xvnc/config/cf/lnxLib.tmpl
+++ /dev/null
@@ -1,41 +0,0 @@
-XCOMM $XConsortium: lnxLib.tmpl,v 1.5 95/01/11 21:44:44 kaleb Exp $
-XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.9 1996/02/24 04:32:52 dawes Exp $
-
-/*
- * Linux shared library template
- */
-
-#if UseElfFormat
-
-#ifndef FixupLibReferences
-#define FixupLibReferences()						@@\
-XMULIBONLY = -lXmu							@@\
-XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
-#endif
-
-#ifndef XawClientLibs
-#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
-#endif
-
-#define CplusplusLibC
-
-#define SharedX11Reqs
-#define SharedOldXReqs	$(LDPRELIB) $(XLIBONLY)
-#define SharedXtReqs	$(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB)
-#define SharedXawReqs	$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-#define SharedXmuReqs	$(LDPRELIB) $(XTOOLLIB) $(XLIB)
-#define SharedXextReqs	$(LDPRELIB) $(XLIBONLY)
-#define SharedXiReqs	$(LDPRELIB) $(XLIB)
-#define SharedPexReqs	$(LDPRELIB) $(XLIBONLY) MathLibrary
-#define SharedXtstReqs	$(LDPRELIB) $(XLIB)
-#define SharedXieReqs	$(LDPRELIB) $(XLIBONLY)
-#define SharedSMReqs	$(LDPRELIB) $(ICELIB)
-
-#else	/* UseElfFormat */
-
-#ifndef FixupLibReferences
-#define FixupLibReferences()						@@\
-XMULIB = -lXmu $(XLIB)
-#endif
-
-#endif	/* UseElfFormat */
--- a/Xvnc/config/cf/lnxdoc.rules
+++ /dev/null
@@ -1,166 +0,0 @@
-XCOMM $XFree86: xc/config/cf/lnxdoc.rules,v 3.9 1997/01/26 05:10:25 dawes Exp $
-XCOMM
-XCOMM Rules for formatting Linuxdoc-SGML documentation
-XCOMM
-
-#include <lnxdoc.tmpl>
-
-#ifdef DontInstallLinuxDoc
-#define LinuxDocInstall(file,dest)	/* do nothing */
-#define LinuxDocInstallMultiple(files,dest)	/* do nothing */
-#else
-#define LinuxDocInstall(file,dest)	InstallNonExecFile(file,dest)
-#define LinuxDocInstallMultiple(files,dest)				@@\
-InstallMultipleDest(install,files,dest)
-#endif
-
-#if !HasSgmlFmt
-/* Version for Linuxdoc-SGML */
-#if BuildLinuxDocPS
-#define LinuxDocSgmlToPs(sgmlfile,base) 				@@\
-AllTarget(base.ps)							@@\
-									@@\
-base.ps: sgmlfile							@@\
-	RemoveFile(base.dvi)						@@\
-	$(LINUXDOCFORMAT) -T latex sgmlfile | \				@@\
-	    $(LINUXDOCLATEX) -d > base.dvi				@@\
-	RemoveFile(base.ps)						@@\
-	$(DVIPS) $(DVIPSOPTIONS) -o base._ps base.dvi && \		@@\
-	    $(MV) base._ps $@						@@\
-	RemoveFile(base.dvi)						@@\
-									@@\
-LinuxDocInstall(base.ps,$(XFREE86PSDOCDIR))				@@\
-									@@\
-clean::									@@\
-	RemoveFiles(base.dvi base._ps base.ps)
-#else
-#define LinuxDocSgmlToPs(sgmlfile,base) /**/
-#endif
-
-#if BuildLinuxDocText
-#define LinuxDocSgmlToText(sgmlfile,textfile)				@@\
-AllTarget(textfile)							@@\
-									@@\
-textfile: sgmlfile							@@\
-	RemoveFile(textfile)						@@\
-	$(LINUXDOCFORMAT) -T nroff sgmlfile | \				@@\
-	    $(LINUXDOCROFF) | $(XFREE86IDENTFIX) > _$@ && \		@@\
-	    $(MV) _$@ $@						@@\
-									@@\
-LinuxDocInstall(textfile,$(XFREE86DOCDIR))				@@\
-									@@\
-clean::									@@\
-	RemoveFiles(Concat(_,textfile) textfile)
-#else
-#define LinuxDocSgmlToText(sgmlfile,textfile) /**/
-#endif
-
-/*
- * The 'echo' stuff here is a bit of a hack, but 'set -x' doesn't show
- * what is going on.
- */
-#if BuildLinuxDocHtml
-#define LinuxDocSgmlToHtml(sgmlfile,base)				@@\
-AllTarget(base.html)							@@\
-									@@\
-base.html: sgmlfile							@@\
-	@(TMP=/tmp/tmp.$$$$; \						@@\
-	  RemoveFile($${TMP}); \					@@\
-	  echo RemoveFiles(base*.html); \				@@\
-	  RemoveFiles(base*.html); \					@@\
-	  echo "$(LINUXDOCFORMAT) -T html sgmlfile |" \			@@\
-	    "$(LINUXDOCPREHTML) | $(LINUXDOCFIXREF) > $${TMP}"; \	@@\
-	  $(LINUXDOCFORMAT) -T html sgmlfile | \			@@\
-	    $(LINUXDOCPREHTML) | $(LINUXDOCFIXREF) > $${TMP};	 \	@@\
-	  echo "$(LINUXDOCFORMAT) -T html sgmlfile |" \			@@\
-	    "$(LINUXDOCPREHTML) >> $${TMP}"; \				@@\
-	  $(LINUXDOCFORMAT) -T html sgmlfile | \			@@\
-	    $(LINUXDOCPREHTML) >> $${TMP}; \				@@\
-	  echo "$(LINUXDOCHTML) base < $${TMP} > base.html &&" \	@@\
-	    "$(MV) base._html $@"; \					@@\
-	  $(LINUXDOCHTML) base < $${TMP} > base._html && \		@@\
-	    $(MV) base._html $@; \					@@\
-	  RemoveFile($${TMP}))						@@\
-									@@\
-LinuxDocInstallMultiple(base*.html,$(XFREE86HTMLDOCDIR))		@@\
-									@@\
-clean::									@@\
-	RemoveFiles(base*.html base._html)
-#else
-#define LinuxDocSgmlToHtml(sgmlfile,base) /**/
-#endif
-
-#else /* HasSgmlFmt */
-
-/* Version for FreeBSD's sgmlfmt */
-#if BuildLinuxDocPS
-#define LinuxDocSgmlToPs(sgmlfile,base) 				@@\
-AllTarget(base.ps)							@@\
-									@@\
-base.ps: sgmlfile							@@\
-	RemoveFile(base.ps)						@@\
-	@(BASE=`basename sgmlfile .sgml`;\				@@\
-	  set -x;\							@@\
-	  RemoveFile($$BASE.ps);\					@@\
-	  $(SGMLFMTCMD) -f ps sgmlfile && $(MV) $$BASE.ps $@)		@@\
-									@@\
-LinuxDocInstall(base.ps,$(XFREE86PSDOCDIR))				@@\
-									@@\
-clean::									@@\
-	RemoveFile(base.ps)
-#else
-#define LinuxDocSgmlToPs(sgmlfile,base) /**/
-#endif
-
-#if BuildLinuxDocText
-#define LinuxDocSgmlToText(sgmlfile,textfile)				@@\
-AllTarget(textfile)							@@\
-									@@\
-textfile: sgmlfile							@@\
-	RemoveFile(textfile)						@@\
-	@(BASE=`basename sgmlfile .sgml`;\				@@\
-	  set -x;\							@@\
-	  RemoveFile($$BASE.latin1);\					@@\
-	  $(SGMLFMTCMD) -f latin1 sgmlfile; \				@@\
-	  $(XFREE86IDENTFIX) < $$BASE.latin1 > _$@ && $(MV) _$@ $@)	@@\
-									@@\
-LinuxDocInstall(textfile,$(XFREE86DOCDIR))				@@\
-									@@\
-clean::									@@\
-	RemoveFiles(Concat(_,textfile) textfile)
-#else
-#define LinuxDocSgmlToText(sgmlfile,textfile) /**/
-#endif
-
-#if BuildLinuxDocHtml
-#define LinuxDocSgmlToHtml(sgmlfile,base)				@@\
-AllTarget(base.html)							@@\
-									@@\
-base.html: sgmlfile							@@\
-	@if [ sgmlfile != base.sgml ]; then $(LN) sgmlfile base.sgml; fi @@\
-	RemoveFiles(base*.html)						@@\
-	$(SGMLFMTCMD) -f html base.sgml || RemoveFile($@)		@@\
-	@if [ sgmlfile != base.sgml ]; then RemoveFile(base.sgml); fi	@@\
-									@@\
-LinuxDocInstallMultiple(base*.html,$(XFREE86HTMLDOCDIR))		@@\
-									@@\
-clean::									@@\
-	RemoveFiles(base*.html)
-#else
-#define LinuxDocSgmlToHtml(sgmlfile,base) /**/
-#endif
-
-#endif /* HasSgmlFmt */
-
-
-#define LinuxDocTargetLong(sgmlfile,textfile,base)			@@\
-LinuxDocSgmlToText(sgmlfile,textfile)					@@\
-LinuxDocSgmlToHtml(sgmlfile,base)					@@\
-LinuxDocSgmlToPs(sgmlfile,base)
-
-#define LinuxDocReadmeTarget(base)					@@\
-LinuxDocTargetLong(base.sgml,README.base,base)
-
-#define LinuxDocTarget(base)						@@\
-LinuxDocTargetLong(base.sgml,base,base)
-
--- a/Xvnc/config/cf/lnxdoc.tmpl
+++ /dev/null
@@ -1,101 +0,0 @@
-XCOMM $XFree86: xc/config/cf/lnxdoc.tmpl,v 3.5 1997/01/26 05:10:26 dawes Exp $
-XCOMM
-
-#ifndef HasLinuxDoc
-#define HasLinuxDoc		NO
-#endif
-
-#ifndef HasSgmlFmt
-#define HasSgmlFmt		NO
-#endif
-
-#ifndef LinuxDocDir
-#define LinuxDocDir		/usr/local/linuxdoc-sgml
-#endif
-
-#ifndef LinuxDocBinDir
-#define LinuxDocBinDir		$(LINUXDOCPATH)/bin
-#endif
-
-#ifndef LinuxDocFormatCmd
-#define LinuxDocFormatCmd	$(LINUXDOCBIN)/ldformat
-#endif
-
-#ifndef LinuxDocRoffCmd
-#define LinuxDocRoffCmd		$(LINUXDOCBIN)/qroff
-#endif
-
-#ifndef XFree86IdentFix
-#define XFree86IdentFix		sed '/\$$\XFree86:/s/\$$/Generated from /'
-#endif
-
-#ifndef LinuxDocFixrefCmd
-#define LinuxDocFixrefCmd	$(LINUXDOCBIN)/fixref
-#endif
-
-#ifndef LinuxDocPreHtmlCmd
-#define LinuxDocPreHtmlCmd	$(LINUXDOCBIN)/prehtml
-#endif
-
-#ifndef LinuxDocHtmlCmd
-#define LinuxDocHtmlCmd		$(LINUXDOCBIN)/html2html
-#endif
-
-#ifndef HasLatex
-#define HasLatex		NO
-#endif
-
-#ifndef LinuxDocLatexCmd
-#define LinuxDocLatexCmd	$(LINUXDOCBIN)/qtex
-#endif
-
-#ifndef SgmlFmtCmd
-#define SgmlFmtCmd		sgmlfmt
-#endif
-
-#ifndef HasDvips
-#define HasDvips		NO
-#endif
-
-#ifndef DvipsOptions
-#define DvipsOptions		/**/
-#endif
-
-#ifndef DvipsCmd
-#define DvipsCmd		dvips
-#endif
-
-#ifndef BuildLinuxDocText
-#define BuildLinuxDocText	HasLinuxDoc
-#endif
-
-#ifndef BuildLinuxDocHtml
-#define BuildLinuxDocHtml	NO
-#endif
-
-#ifndef BuildLinuxDocPS
-#define BuildLinuxDocPS		(HasLatex && HasDvips) || HasSgmlFmt
-#endif
-
-
-     LINUXDOCPATH = LinuxDocDir
-      LINUXDOCENV = LINUXDOC=$(LINUXDOCPATH)
-      LINUXDOCBIN = LinuxDocBinDir
-   LINUXDOCFORMAT = $(LINUXDOCENV) LinuxDocFormatCmd
-     LINUXDOCROFF = $(LINUXDOCENV) LinuxDocRoffCmd
-    LINUXDOCLATEX = $(LINUXDOCENV) LinuxDocLatexCmd
-   LINUXDOCFIXREF = $(LINUXDOCENV) LinuxDocFixrefCmd
-  LINUXDOCPREHTML = $(LINUXDOCENV) LinuxDocPreHtmlCmd
-     LINUXDOCHTML = $(LINUXDOCENV) LinuxDocHtmlCmd
-  XFREE86IDENTFIX = XFree86IdentFix
-            DVIPS = DvipsCmd
-     DVIPSOPTIONS = DvipsOptions
-       SGMLFMTCMD = SgmlFmtCmd
-
-XCOMM Some extra things to clean
-
-#ifdef ExtraFilesToClean
-#undef ExtraFilesToClean
-#endif
-#define ExtraFilesToClean *.aux *.dvi *.log *.tex *.toc *.html *.ps *.latin1
-
--- a/Xvnc/config/cf/luna.cf
+++ /dev/null
@@ -1,117 +0,0 @@
-XCOMM platform:  $XConsortium: luna.cf /main/35 1996/09/28 16:11:11 rws $
-/*
- *	Please set the values for OSMajorVerion and OSMinorVersion
- *	before making makefiles.	 
- *
- *	The Luna version of the make program doesn't define the standard
- *	macro MAKE, so you must run it as "make MAKE=make" at top level,
- *	e.g., "make MAKE=make World"
- */
-
-#ifdef Mc68000Architecture
-# ifdef luna2
-#ifndef OSName
-#define OSName            Mach 2.5 Vers 1.40
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion    1
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion    40
-#endif
-# else 
-#ifndef OSName
-#define OSName            UNIOS-B 4.3BSD UNIX: 2.00
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion    2
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion    0
-#endif
-#define DirFailPrefix -
-# endif
-#else  /* Mc88000Architecture */
-#ifndef OSName
-#define OSName            Mach 2.5 Vers 2.00.1
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion    2
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion    0
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion    1
-#endif
-#endif
-XCOMM operating system:  OSName
-
-#define HasBsearch		NO
-#define HasVoidSignalReturn	NO
-#define HasGcc			YES
-#define HasCThreads		YES
-#define HasThreadSafeAPI	NO
-#define Malloc0ReturnsNull	HasCThreads    /* -lthreads fails, -lc works */
-#define XawI18nDefines		-DHAS_WCHAR_H -DHAS_ISW_FUNCS
-#define BootstrapCFlags		-DUSE_CC_E -DNFS_STDOUT_BUG
-
-#define ThreadsLibraries		-lthreads -lmach
-#define ThreadsCplusplusLibraries	-lthreads -lmach
-
-#define PrimaryScreenResolution 100
-#define	BuildXKB	YES
-
-#ifdef Mc68000Architecture
-#ifdef	luna2
-#if ((OSMajorVersion <= 1) && (OSMinorVersion < 40))
-#define ServerExtraDefines -DUNUSE_DRV_TIME -DUNUSE_SIGIO_SIGNAL 
-#endif
-#else	/* luna1 */
-#if ((OSMajorVersion <= 1) && (OSMinorVersion <= 60))
-#define StandardDefines         -Dluna -Duniosb
-#endif
-#if ((OSMajorVersion < 2) || ((OSMajorVersion == 2) && (OSMinorVersion < 1)))
-#define ServerExtraDefines -DUNUSE_DRV_TIME -DUNUSE_SIGIO_SIGNAL 
-#endif
-#endif	/* luna2 */
-#if HasGcc
-#define OptimizedCDebugFlags    -O -traditional
-#define ServerCDebugFlags       -Dmc68020 -O -traditional
-#else	/* cc */
-#define OptimizedCDebugFlags    -O -Z18
-#define ServerCDebugFlags       -Dmc68020 -O -Z18
-#endif /* HasGcc */
-#endif /* Mc68000Architecture */
-
-
-#ifdef Mc88000Architecture
-#if ((OSMajorVersion <= 1) && (OSMinorVersion <= 12))
-#define ServerExtraDefines -DUNUSE_DRV_TIME -DUNUSE_SIGIO_SIGNAL 
-#endif
-#define HasNdbm			YES
-#define ExtraLibraries		-li18n
-#if HasGcc
-#define CcCmd                   gcc -fstrength-reduce
-#define PreIncDir		/usr/local/lib/gcc/gcc-include
-#define OptimizedCDebugFlags    -O2 /* -traditional */
-#else
-#define PreIncDir		/usr/lib/ccom/include
-#endif
-#define PostIncDir		/usr/mach/include
-#endif
-
-#ifdef Mc68000Architecture
-#define UnalignedReferencesAllowed YES  /* if arbitrary deref is okay */
-#define BuildPexExt		NO		
-#define XlunaServer 		YES
-#endif
-
-#ifdef Mc88000Architecture
-#define BuildPexExt		NO
-#define XlunaServer 		YES
-#endif
-
-#if ((OSMajorVersion >= 2) && (OSMinorVersion >= 0) && (OSTeenyVersion >= 1))
-#define HasWChar32              YES
-#endif
--- a/Xvnc/config/cf/lynx.cf
+++ /dev/null
@@ -1,316 +0,0 @@
-XCOMM platform:  $XFree86: xc/config/cf/lynx.cf,v 3.12.2.6 1998/02/01 16:03:19 robin Exp $
-
-#ifdef i386Architecture
-# define OSName			LynxOS AT
-#endif
-#ifdef ppcArchitecture
-# define OSName			LynxOS PowerPC
-#endif
-#ifdef SparcArchitecture
-# define OSName			LynxOS microSPARC
-#endif
-#define OSVendor		(LYNX Real-Time Systems, Inc)
-#define OSMajorVersion		2
-#define OSMinorVersion		5
-#define OSTeenyVersion		0
-
-#define HasGcc			YES
-#if OSMajorVersion == 2 && OSMinorVersion > 2
-# define HasGcc2		YES
-# ifndef HasGcc2ForCplusplus
-#  define HasGcc2ForCplusplus	YES
-# endif
-#else
-# define HasGcc2		NO
-#endif
-#ifndef HasGcc2ForCplusplus
-# define HasGcc2ForCplusplus	YES
-#endif
-#define GccUsesGas		YES
-#define UseGas			YES
-#define GnuCpp			YES
-#define HasShadowPasswd		NO
-#ifndef HasLibCrypt
-# define HasLibCrypt		NO
-#endif
-#define HasPutenv		YES
-#define HasShm			YES
-#define HasSockets		YES
-#define HasVFork		NO
-#define HasVarDirectory		NO
-#if OSMajorVersion == 2 && OSMinorVersion > 4
-# define HasBSD44Sockets 	YES
-#endif
-
-#define HasPosixThreads		YES
-#define ThreadedX		YES
-#define HasThreadSafeAPI	YES	/* only 2.[345].0 ?? */
-#if HasGcc2
-# if OSMajorVersion == 2 && OSMinorVersion == 3
-#  define ThreadsCompileFlags	-mposix -mthreads
-#  define ThreadsCplusplusCompileFlags	-mposix -mthreads
-# else
-#  define ThreadsCompileFlags	-mthreads
-#  define ThreadsCplusplusCompileFlags	-mthreads
-# endif
-#else
-# define ThreadsCompileFlags	-m
-# define ThreadsCplusplusCompileFlags	-m
-#endif
-#if OSMajorVersion == 2 && OSMinorVersion < 3
-# define ThreadsLibraries /lib/thread/libc.a /lib/thread/libc_p.a
-#endif
-#if OSMinorVersion <= 5
-# define ThreadPreStdAPIDefines	-DXPRE_STANDARD_API
-#endif
-#define AvoidNullMakeCommand	YES
-#if OSMajorVersion == 2 && OSMinorVersion > 2
-#define StripInstalledPrograms	YES
-#else
-/* under LynxOS AT V2.x /bin/strip will leave file.unstripped around
- * and fail if installing across different file systems
- */
-#define StripInstalledPrograms	NO
-#endif
-#define CompressAllFonts	YES
-#define Malloc0ReturnsNull	NO
-#define NeedConstPrototypes	YES
-#define NeedFunctionPrototypes	YES
-#define NeedNestedPrototypes	YES
-#define NeedVarargsPrototypes	YES
-#define NeedWidePrototypes	NO
-
-#if HasGcc2
-# if OSMajorVersion == 2 && OSMinorVersion == 3
-#  define CplusplusCmd		g++ -mposix
-#  define CcCmd			gcc -mposix
-# else
-#  define CplusplusCmd		g++
-#  define CcCmd			gcc
-# endif
-# if OSMajorVersion == 2 && OSMinorVersion == 5
-#  define DefaultCCOptions -ansi -pedantic -fcommon
-# endif
-#else
-# define CplusplusCmd		g++ 
-# define CcCmd			gcc 
-# define DefaultCCOptions	-ansi
-# define GccGasOption		-DGCCUSESGAS /* For SuperProbe */
-#endif
-#define AsCmd			as
-#define LdCmd			ld
-#define AsmDefines		-DUSE_GAS
-#define CppCmd			/lib/cpp
-#define YaccCmd			bison -y
-/* make sure we take the right flex on 2.3.0 and 2.4.0 */
-#define LexCmd			/bin/flex
-#if OSMinorVersion >= 5
-# define LexLib			-lfl
-#else
-# define LexLib			/**/
-#endif
-/* On LynxOS AT 2.3.0 /lib/libm.a is a symbolic link to /lib/libc.a, so we
- * screw up some POSIX functionality when -lm comes before -lc_p in our
- * ld argument list. For LynxOS-AT we don't need -lm but for others we 
- * do (e.g. SPARC)
- */
-#if OSMajorVersion == 2 && OSMinorVersion == 3
-# define MathLibrary		-lc_p -lm
-# define TermcapLibrary		-lc_p -ltermcap
-#else
-# define MathLibrary		-lm
-# define TermcapLibrary		-ltermcap
-#endif
-#define PreProcessCmd		CcCmd -E
-#if HasGcc2
-# define PostIncDir		DefaultGccIncludeDir
-#endif
-#define LdCombineFlags		-r
-#if HasGcc2
-# ifdef i386Architecture
-#  define OptimizedCDebugFlags	DefaultGcc2i386Opt
-# else
-#  define OptimizedCDebugFlags	-O2
-# endif
-#else
-# define OptimizedCDebugFlags	-O
-#endif
-#if OSMajorVersion == 2 && OSMinorVersion <= 2
-# define StandardDefines		-DLynx -DLynx_22 -DX_NOT_POSIX
-#else
-# if defined(i386Architecture) && OSMajorVersion == 2 && OSMinorVersion > 4
-/* need __i386__ for 2.5.0 AT and higher */
-#  define StandardDefines		-DLynx -DX_LOCALE -D__i386__
-# else
-#  define StandardDefines		-DLynx -DX_LOCALE
-# endif
-#endif
-#define StandardCppDefines	-traditional StandardDefines
-#ifdef i386Architecture
-# define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET
-# define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
-#else
-# if defined(SparcArchitecture)
-#  define SparcConsoleDefines	-DPATCHED_CONSOLE
-#  define ServerOSDefines 	-DDDXOSINIT
-#  define ServerExtraDefines	-DGCCUSESGAS SparcConsoleDefines
-#  define XkbServerDefines	-DXKB_ALWAYS_USES_SOFT_REPEAT
-# else
-#  define ServerOSDefines 	/**/
-#  define ServerExtraDefines	-DGCCUSESGAS
-# endif
-#endif
-#define ServerExtraSysLibs	$(CBRT) MathLibrary
-#define ConnectionFlags		-DUNIXCONN -DTCPCONN
-#if OSMajorVersion == 2 && OSMinorVersion < 5
-# define ExtraLibraries		-lbsd
-#else
-# define ExtraLibraries		-lbsd -llynx
-#endif
-#if !HasGcc2
-# define ExtraLoadFlags		-k
-#endif
-#if OSMajorVersion == 2 && OSMinorVersion <= 2
-# define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-#endif
-
-/* define HasMotif to YES for LynxOS with Motif
- * installed according to the notes in README.LynxOS.
- */
-#ifndef HasMotif
-# define HasMotif 		NO
-#endif
-#if HasMotif
-# ifndef UseInstalledMotif
-#  define UseInstalledMotif	YES
-# endif
-# ifndef SaberProgramTarget
-#  define SaberProgramTarget(program,srclist,objlist,locallibs,syslibs) /**/
-# endif
-# define LocalTmplFile		<Motif.tmpl>
-# define LocalRulesFile		<Motif.rules>
-#endif
-
-#define ManSourcePath   $(MANPATH)/cat
-
-#ifndef ManSuffix
-# define ManSuffix	1
-#endif
-#ifndef ManDir
-# define ManDir		$(MANSOURCEPATH)1
-#endif
-#ifndef LibManSuffix
-# define LibManSuffix	3
-#endif
-#ifndef LibmanDir
-# define LibmanDir	$(MANSOURCEPATH)3
-#endif
-#ifndef FileManSuffix
-# define FileManSuffix	5
-#endif
-#ifndef FileManDir
-# define FileManDir	$(MANSOURCEPATH)5
-#endif
-
-/* groff 1.09 compiles right out of the box with LynxOS 2.3,
- * so if you want to have manual pages you should install groff 1.09
- * before you run 'make install.man'
- */
-#ifndef InstallManPageLong
-#define InstallManPageLong(file,destdir,dest)                           @@\
-install.man:: file.man                                                  @@\
-	MakeDir($(DESTDIR)destdir)					@@\
-	$(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)*			@@\
-	groff -e -t -man -Tascii file.man >/tmp/file.man		@@\
-	$(INSTALL) -c $(INSTMANFLAGS) /tmp/file.man $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\
-	echo dest dest $(MANSUFFIX) >> $(DESTDIR)destdir/LIST$(MANSUFFIX) @@\
-	gawk '					\			@@\
-	/^\.SH[ 	]*NAME/ 	{ 	\			@@\
-		getline; sub("\\\\", "(" p ") "); print; exit	\	@@\
-	}' p=$(MANSUFFIX) file.man  >> $(DESTDIR)destdir/../whatis	@@\
-	$(RM) /tmp/file.man
-#endif
-
-#ifndef InstallManPageAliases
-#define InstallManPageAliases(file,destdir,aliases)                     @@\
-install.man::                                                           @@\
-	@(SUFFIX=`echo $(DESTDIR)destdir/file.* | cut -f2,3 -d.`; \	@@\
-	for i in aliases; do (set -x; \ 				@@\
-	$(RM) $(DESTDIR)destdir/$$i.*; \				@@\
-	(cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \			@@\
-	$$i.$${SUFFIX})); \						@@\
-	echo $$i dest $(MANSUFFIX) >> $(DESTDIR)destdir/LIST$(MANSUFFIX); \ @@\
-	done)
-#endif
-
-#ifndef InstallGenManPageLong
-#define InstallGenManPageLong(file,destdir,dest,suffix)                 @@\
-install.man:: file.man                                                  @@\
-	MakeDir($(DESTDIR)destdir)					@@\
-	$(RM) $(DESTDIR)destdir/dest.suffix*				@@\
-	groff -e -t -man -Tascii file.man >/tmp/file.man		@@\
-	$(INSTALL) -c $(INSTMANFLAGS) /tmp/file.man $(DESTDIR)destdir/dest.suffix @@\
-	echo dest dest suffix >> $(DESTDIR)destdir/Concat(LIST,suffix)	 @@\
-	gawk '					\			@@\
-	/^\.SH[ 	]*NAME/ 	{ 	\			@@\
-		getline; sub("\\\\", "(" p ") "); print; exit	\	@@\
-	}' p=suffix file.man  >> $(DESTDIR)destdir/../whatis	@@\
-	$(RM) /tmp/file.man)
-#endif
-
-#ifndef InstallMultipleMan
-#define InstallMultipleMan(list,dest)                                   @@\
-install.man:: list                                                      @@\
-	MakeDir($(DESTDIR)dest)						@@\
-	@case '${MFLAGS}' in *[i]*) set +e;; esac; \			@@\
-	for i in list; do \						@@\
-		(set -x; \						@@\
-		MNAME=`echo $$i | cut -f1 -d.`; \			@@\
-		$(RM) $(DESTDIR)dest/$${MNAME}*; \			@@\
-		groff -e -t -man -Tascii $$i >/tmp/$$i; \		@@\
-		$(INSTALL) -c $(INSTMANFLAGS) /tmp/$$i $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \      @@\
-		echo $${MNAME} $${MNAME} $(MANSUFFIX) >> $(DESTDIR)dest/LIST$(MANSUFFIX)\  @@\
-		gawk '							\  @@\
-		/^\.SH[ 	]*NAME/ 	{ 			\  @@\
-			getline; sub("\\\\", "(" p ") "); print; exit	\  @@\
-		}' p=$(MANSUFFIX) $$i  >> $(DESTDIR)dest/../whatis	\  @@\
-		$(RM) /tmp/$$i); \					   @@\
-	done
-#endif
-
-/*
- * Definitions for the SUN server on LynxOS SPARC
- */
-#ifdef SparcArchitecture
-# define XsunLynxServer			YES
-# define XsunLynxMonoServer		NO
-# define BuildPexExt			YES
-# define BuildXIE			YES
-# ifndef BuildScreenSaverLibrary
-#  define BuildScreenSaverLibrary	YES
-# endif
-# if BuildXInputExt
-#  undef BuildXInputExt
-# endif
-# define BuildXInputExt			NO
-# if BuildDPMSExt
-#  undef BuildDPMSExt
-# endif
-# define BuildDPMSExt			NO
-# define BuildXF86MiscExt		NO
-/*
- * XFree86 uses its own (more portable) database routines to speed up 
- * the RGB database lookups
- * However, if you want to use ndbm anyway, you can set that to NO in 
- * site.def
- */
-# ifndef UseRgbTxt
-#  define UseRgbTxt	YES
-# endif
-#endif
-
-#ifndef i386Architecture
-# define BuildXF86DGA NO
-#endif
-
-#include <xfree86.cf>
--- a/Xvnc/config/cf/macII.cf
+++ /dev/null
@@ -1,53 +0,0 @@
-XCOMM platform:  $XConsortium: macII.cf /main/50 1996/09/28 16:11:19 rws $
-
-#ifndef OSName
-#define OSName            A/UX 3.0.1
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion    3
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion    0
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion    1
-#endif
-XCOMM operating system:  OSName
-
-#if HasGcc
-#define BootstrapCFlags   -DmacII
-#endif
-#define SystemV             YES
-#define HasPoll		    NO
-#define NeedBerklib         YES
-#define ExtraLibraries      $(XBSDLIB) -lposix -lm -lmr
-#define Malloc0ReturnsNull  YES
-#define StandardDefines     -DmacII -DSYSV
-#define ExecableScripts     NO
-#define RemoveTargetProgramByMoving YES
-#define ExpandManNames      YES
-#define PexShmIPC           NO
-#define XmacIIServer        YES
-#define XawI18nDefines      -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-#if MacHasc89
-#define CcCmd c89 -D_POSIX_SOURCE
-#else
-#define HasVoidSignalReturn NO
-#endif
-#if OSMajorVersion <= 2
-#define ServerExtraDefines  -DSUPPORT_2_0
-#endif
-#define InstKmemFlags	    -g sys -m 2711
-#define ExtensionOSDefines  -DXTESTEXT1
-
-#if !HasGcc
-#define DefaultCCOptions -A 3
-#define PexCCOptions -A 4
-#endif
-
-/*
- * If you wish to override the man page directories, do so here using just
- * one tab between the parameter name (e.g. ManDirectoryRoot) and the
- * value so that cpp doesn't get confused.
- */
-#define ManDirectoryRoot	/usr/catman/u_man
--- a/Xvnc/config/cf/mach.cf
+++ /dev/null
@@ -1,81 +0,0 @@
-XCOMM $TOG: mach.cf /main/2 1997/06/08 20:08:20 kaleb $
-
-
-
-XCOMM platform:  $XFree86: xc/config/cf/mach.cf,v 3.7.2.2 1997/07/05 15:55:29 dawes Exp $
-
-#define OSName           Mach 2.5/3.0
-#define OSVendor          /**/
-XCOMM operating system:  OSName
-#define OSMajorVersion  	1
-#define OSMinorVersion    	1
-
-#define HasGcc 			YES
-#define HasGcc2			YES
-#define GccUsesGas		YES
-#define UseGas			YES
-#define GnuCpp			YES
-#define UseGccMakeDepend	YES
-#ifndef HasGcc2ForCplusplus
-#define HasGcc2ForCplusplus	YES
-#endif
-
-#define CcCmd			gcc
-#define CppCmd			/usr/mach3/lib/gcc-lib/i386-mach/2.3.3/cpp
-#define PreProcessCmd		/usr/mach3/lib/gcc-lib/i386-mach/2.3.3/cpp
-#define DefaultCCOptions	/**/
-#define GccGasOption 		-DGCCUSESGAS
-#if HasGcc2 && defined(i386Architecture)
-#define OptimizedCDebugFlags	DefaultGcc2i386Opt
-#else
-#define OptimizedCDebugFlags	-O2
-#endif
-
-#define AsmDefines		-DUSE_GAS
-#define BootstrapCFlags		-DNOSTDHDRS
-#define ExtensionOSDefines	/* -DXTESTEXT1 */
-#define ServerExtraSysLibs	/usr/lib/libmach.a
-#ifdef i386Architecture
-#define ServerExtraDefines	GccGasOption XFree86ServerDefines
-#else
-#define ServerExtraDefines	GccGasOption
-#endif
-#define StandardCppDefines	-traditional
-#define StandardDefines		-DNOSTDHDRS -DMACH386
-#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME
-
-#define AvoidNullMakeCommand	YES
-#define CompressAllFonts	YES
-#define DirFailPrefix -
-#define HasNdbm         	YES
-#define HasPutenv       	YES
-#define Malloc0ReturnsNull	YES
-#define NeedConstPrototypes	YES
-#define NeedFunctionPrototypes	YES
-#define NeedNestedPrototypes	YES
-#define NeedVarargsPrototypes	YES
-#define NeedWidePrototypes	NO
-#define StripInstalledPrograms	YES
-
-#ifndef GnuMallocLibrary
-#define GnuMallocLibrary	/* -lgnumalloc */
-#endif
-
-#ifdef InstallCmd
-#undef  InstallCmd
-#endif
-#define InstallCmd		/usr/bin/install
-
-#ifndef PreIncDir
-# define PreIncDir	/usr/include
-#endif
-
-#define TroffCmd        groff -Tps
-
-#ifndef ExtraFilesToClean
-# define ExtraFilesToClean *.core
-#endif
-
-#ifdef i386Architecture
-# include <xfree86.cf>
-#endif
--- a/Xvnc/config/cf/minix.cf
+++ /dev/null
@@ -1,64 +0,0 @@
-XCOMM $XConsortium: minix.cf /main/1 1996/10/31 14:47:22 kaleb $
-
-
-
-XCOMM platform:  $XFree86: xc/config/cf/minix.cf,v 3.4 1996/12/27 06:50:21 dawes Exp $
-
-
-/*
- * If you want to change any of these, do it in the BeforeVendorCF part
- * of site.def
- */
-#define OSName			Minix-386vm
-#define OSVendor		/* philip@cs.vu.nl */
-#define OSMajorVersion		1
-#define OSMinorVersion		6
-#define OSTeenyVersion		25.1.0
-
-#define AcdGcc
-
-#ifdef AcdGcc
-#define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
-#define AsmDefines 		-DUSE_GAS
-#define GccGasOption		-DGCCUSESGAS /* For SuperProbe */
-#endif
-
-/* Defaults for Minix */
-
-#define ConnectionFlags		-DMNX_TCPCONN
-#define StandardDefines		-D_MINIX -DMINIX -D_POSIX_SOURCE
-#define StandardIncludes	
-
-#define DoRanlibCmd		NO
-#define AvoidNullMakeCommand	YES
-#define HasSockets		NO
-#define HasStreams		NO
-#define HasVFork		NO
-#define HasNdbm			YES
-#define	ExtraLibraries		-lnbio
-#define NeedConstPrototypes	YES
-#define NeedVarargsPrototypes	YES
-#define NeedNestedPrototypes	YES
-/* #define UseCCMakeDepend		YES */
-#define	DefaultCCOptions	-wo -fsoft
-#define ArCmd			CcCmd -c.a -o
-#define ArAddCmd		ArCmd
-#define CcCmd			acd -descr gcc -name cc
-#define AsCmd			CcCmd -c
-#define CppCmd			/usr/lib/cpp
-#define LdCmd			CcCmd
-#define LdCombineFlags		-r
-#define LexLib			/* */
-
-#define	SetTtyGroup		YES	/* for xterm */
-#define HasPutenv		YES	/* for xsm */
-
-#ifndef AssembleObject
-#define AssembleObject(flags) $(RM) $@                                    @@\
-	$(CPP) AsmDefines $(DEFINES) $(INCLUDES) flags $*.s | \           @@\
-	    grep -v '^\#' > $*.i.s                                        @@\
-	$(AS) -o $*.o $*.i.s                                              @@\
-	$(RM) $*.i.s
-#endif
-
-#include <xfree86.cf>
--- a/Xvnc/config/cf/moto.cf
+++ /dev/null
@@ -1,58 +0,0 @@
-XCOMM platform:  $XConsortium: moto.cf /main/16 1996/09/28 16:11:24 rws $
-
-#if defined(MotoR3Architecture)
-
-#ifndef OSName
-#define OSName                 Motorola R32V2/R3V6.2
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion         3
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion         2
-#endif
-
-#define SystemV			YES
-#define BootstrapCFlags		-DSYSV -DMOTOROLA
-#define StandardDefines		-DSYSV -DUSG -DMOTOROLA
-#define Malloc0ReturnsNull	YES
-#define BuildServer		NO
-#define UseCCMakeDepend		YES
-#define OptimizedCDebugFlags	/* -O */
-
-#define DefaultUserPath   	:/bin:/usr/bin:$(BINDIR)
-#define DefaultSystemPath 	/etc:/bin:/usr/bin:$(BINDIR)
-
-#endif /* MotoR3Architecture */
-
-
-#if defined(MotoR4Architecture)
-
-#ifndef OSName
-#define OSName			Motorola R40V4
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion		4
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion		4
-#endif
-
-#define SystemV4		YES
-#define BootstrapCFlags		-DSVR4 -DMOTOROLA
-#define StandardDefines         -DSVR4 -DMOTOROLA
-#define BuildServer		NO
-
-#define CppCmd                  /usr/ccs/lib/cpp
-#define LdCmd                   /usr/ccs/bin/ld
-#define LexCmd                  /usr/ccs/bin/lex
-#define MakeCmd                 /usr/ccs/bin/make
-#define YaccCmd                 /usr/ccs/bin/yacc
-#define CcCmd                   /bin/cc     /* a front-end to gcc/CI5 */
-#define DefaultCCOptions                    /* -Xc  no longer needed */
-
-#include <sv4Lib.rules>
-
-#endif /* MotoR4Architecture */
-
-XCOMM operating system:  OSName
--- a/Xvnc/config/cf/ncr.cf
+++ /dev/null
@@ -1,125 +0,0 @@
-XCOMM platform:  $XConsortium: ncr.cf /main/28 1996/09/28 16:11:31 rws $
-XCOMM platform:  $XFree86: xc/config/cf/ncr.cf,v 3.18 1996/12/27 06:50:22 dawes Exp $
-
-#ifndef OSName
-#define OSName			Unix System V Release 4/MP-RAS
-#endif
-#ifndef OSVendor
-#define OSVendor		NCR
-#endif
-XCOMM operating system:  OSName
-
-#define BootstrapCFlags		-DNCR
-#define HasStreams		YES
-#define XawI18nDefines		-DUSE_XWCHAR_STRING
-
-/* Build Flags */
-
-XCOMM
-XCOMM These flags build correctly on SVR4/MP-RAS 3.0. If building on
-XCOMM SVR4/MP-RAS 2.X, you must add -DWINTCP to StandardDefines
-XCOMM
-#define StandardDefines		-DSVR4 -DNCR -Di386
-#define DefaultCCOptions	-Xa -Hnocopyr -W0,-asm
-#define DefaultCDebugFlags	-O3
-#define AllocateLocalDefines	-DINCLUDE_ALLOCA_H
-#define ServerExtraDefines      -DNO_SECONDARY AllocateLocalDefines XFree86ServerDefines
-#define ServerOSDefines         -DDDXTIME XFree86ServerOSDefines
-#define ToolkitStringsABIOptions -intelabi
-
-XCOMM This has not been tested, don't turn it on yet.
-XCOMM #define ExtensionOSDefines	-DXTESTEXT1
-
-#define ExtraLoadFlags -lc -L/usr/ucblib -lucb -lm -lgen -lcmd
-
-/* Setup proper ownership of installed files */
-
-#define StripInstalledPrograms	YES
-#define InstPgmFlags		-s -m 0711 -o bin -g bin
-#define InstBinFlags		-m 0755 -o bin -g bin
-#define InstUidFlags		-m 4711 -o root -g bin
-#define InstLibFlags		-m 0644 -o bin -g bin
-#define InstIncFlags		-m 0444 -o bin -g bin
-#define InstManFlags		-m 0444 -o bin -g bin
-#define InstDatFlags		-m 0444 -o bin -g bin
-
-/* Various Configuration settings */
-
-#define DefaultUserPath		/bin:/sbin:/usr/bin:/usr/sbin:$(BINDIR):/usr/ucb
-#define DefaultSystemPath	/etc:/bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR):/usr/ucb
-#define ExtraFilesToClean	*.z
-
-/* Create man pages properly */
- 
-#define BookFormatManPages	YES
-#define ManDirectoryRoot	/usr/catman/X115
-#define ManSuffix		1X
-#define LibManSuffix		3X
-#define FileManSuffix		4X
-#define ManSourcePath		$(MANPATH)/g
-#define XmanSearchPath		/usr/catman
-
-#define	TblCmd /usr/ucb/tbl
-#define	EqnCmd /usr/ucb/eqn
-#define ColCmd /usr/bin/col
-#define NeqnCmd /usr/ucb/neqn
-#define NroffCmd /usr/ucb/nroff -Tlp
-
-/*
- * Man pages need to be formatted when installed, so override the default
- * imake rules.
- */
-#define InstallManPageLong(file,destdir,dest)                           @@\
-all:: file.z								@@\
-									@@\
-file.z:: file.man							@@\
-	@if [ -f file.man ]; \						@@\
-	then \								@@\
-	cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \	@@\
-	$(RM) /tmp/$$$$.man.z; \					@@\
-	pack -f /tmp/$$$$.man; \					@@\
-	cp /tmp/$$$$.man.z file.z; \					@@\
-	$(RM) /tmp/$$$$.man.z; \					@@\
-	fi 								@@\
-									@@\
-file.man::								@@\
-									@@\
-install.man::                                                           @@\
-	MakeDir($(DESTDIR)destdir)					@@\
-	-@if [ -f file.z ]; \						@@\
-	then \								@@\
-	$(INSTALL) -c $(INSTMANFLAGS) file.z $(DESTDIR)destdir/dest.z; \@@\
-	fi
-
-#define InstallGenManPageLong(file,destdir,dest,suffix)			@@\
-	InstallManPageLong(file,destdir,dest)
-
-#define InstallMultipleManSuffix(list,dest,suff)                        @@\
-install.man:: 								@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	MakeFlagsToShellFlags(i,set +e); \				@@\
-	for i in list; do \                                             @@\
-	  (set -x; \							@@\
-	  cat $$i.suff | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.suff; \	@@\
-	  pack -f /tmp/$$$$.suff; \					@@\
-	  $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$$$.suff.z $(DESTDIR)dest/$$i.z; \	@@\
-	  $(RM) /tmp/$$$$.suff.z); \						@@\
-	done
-
-#define InstallMultipleMan(list,dest)                                   @@\
-	InstallMultipleManSuffix(list,dest,man)
-
-#define InstallManPageAliases(file,destdir,aliases)                     @@\
-install.man:: 								@@\
-	@MakeFlagsToShellFlags(i,set +e); \				@@\
-	for i in aliases; do \                                          @@\
-		(set -x; \						@@\
-		$(RM) $(DESTDIR)destdir/$$i.z;\  			@@\
-		(cd $(DESTDIR)destdir; $(LN) file.z $$i.z);\		@@\
-		); \							@@\
-	done
-
-#define InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
-	InstallManPageAliases(file,destdir,aliases)
-
-#include <svr4.cf>
--- a/Xvnc/config/cf/nec.cf
+++ /dev/null
@@ -1,131 +0,0 @@
-XCOMM platform:  $XConsortium: nec.cf /main/4 1996/09/28 16:11:37 rws $
-
-#ifdef nec_ews_svr2
-# define NecCISCArchitecture
-#else /* !defined(nec_ews_svr2) */
-# if defined(nec_ews_svr4) || defined(_nec_ews_svr4) || defined(_nec_up)
-#  define NecRISCArchitecture
-# else /* !(defined(nec_ews_svr4) || defined(_nec_ews_svr4) || defined(_nec_up)) */
-#  ifdef SX
-#   define NecSX3Architecture
-#  else /* !defined(SX) */
-#   ifdef _nec_ft
-#    define NecFaultTolerantArchitecture
-#   else /* !defined(_nec_ft) */
-#    ifdef PC_UX
-#     define NecPCArchitecture
-#    endif /* PC_UX */
-#   endif /* !defined(_nec_ft) */
-#  endif /* !defined(SX) */
-# endif /* !(defined(nec_ews_svr4) || defined(_nec_ews_svr4) || defined(_nec_up)) */
-#endif /* !defined(nec_ews_svr2) */
-
-#ifdef NecCISCArchitecture
-#ifndef OSName
-#define OSName            	EWS-UX/V
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion    	10
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion    	1
-#endif
-#define HasSharedLibraries	NO
-#define HasVoidSignalReturn	NO
-#define HasSockets		YES
-#define SystemV			YES
-#define StandardDefines		-Dnec_ews -Dnec_ews_svr2 -DUSG -DSYSV
-#define StandardCppDefines	-Dnec_ews -Dnec_ews_svr2 -DUSG -DSYSV
-#define LnCmd			ln -s
-        LEXOPTION = -j
-#endif
-
-#ifdef NecRISCArchitecture
-# ifdef _nec_up
-#ifndef OSName
-#define OSName            	UP-UX/V
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion    	5
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion    	1
-#endif
-# else
-#ifndef OSName
-#define OSName            	EWS-UX/V\(Rel4.2\)
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion    	9
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion    	1
-#endif
-# endif
-#define HasSharedLibraries	YES
-#define HasVoidSignalReturn 	YES
-#define SystemV4		YES
-#define HasSockets		YES
-#endif
-
-#ifdef NecSX3Architecture
-#ifndef OSName
-#define OSName		 	SUPER-UX
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion	 	3
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion		1
-#endif
-#define SystemV			YES
-#define HasSharedLibraries 	NO
-#define HasVoidSignalReturn	YES
-#endif
-
-#ifdef NecFaultTolerantArchitecture
-#ifndef OSName
-#define OSName			FT-UX/V
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion		5
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion		1
-#endif
-#define HasSharedLibraries	YES
-#define HasVoidSignalReturn	YES
-#define SystemV4		YES
-#define HasSockets		YES
-#endif
-
-#ifdef NecPCArchitecture
-#ifndef OSName
-#define OSName			PC-UX/V
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion		3
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion		1
-#endif
-#define HasSharedLibraries	NO
-#define HasVoidSignalReturn	NO
-#define SystemV			YES
-#endif
-
-#define HasSaberC	NO		/* for machines that have it */
-#define HasGcc		NO
-#define HasBsearch	YES
-
-#define DefaultCCOptions	-Wf,-XNp9000,-XNd6000
-#define ExtraLibraries		-lsocket -lnsl -lw
-
-#define BuildServer			NO
-/* #define InstallCmd $(INS) */
-#define	RemoveTargetProgramByMoving	YES
-
-#include <necLib.rules>
-
-#define LibraryCCOptions DefaultCCOptions
-#define LibraryDefines  StandardDefines
--- a/Xvnc/config/cf/necLib.rules
+++ /dev/null
@@ -1,103 +0,0 @@
-XCOMM $XConsortium: necLib.rules /main/4 1996/09/28 16:11:42 rws $
-
-/*
- * NECOS shared library rules
- */
-
-#ifndef HasSharedLibraries
-#define HasSharedLibraries YES
-#endif
-#ifndef SharedDataSeparation
-#define SharedDataSeparation YES
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <necLib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags
-#endif
-#ifndef PositionIndependentCFlags
-#define PositionIndependentCFlags
-#endif
-
-
-#ifndef SeparateSharedCompile
-#define SeparateSharedCompile NO
-#endif
-
-#define SharedLibObjCompile(options) $(_NULLCMD_)
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-#define	InstallSharedLibrary(libname,rev,dest)				@@\
-install:: Concat(lib,libname.so.rev) 					@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
-	cd $(DESTDIR)/dest; $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so)	@@\
-
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-#define	InstallSharedLibraryData(libname,rev,dest)			@@\
-install:: Concat(lib,libname.sa.rev)					@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.sa.rev) $(DESTDIR)dest @@\
-	RanLibrary($(RANLIBINSTFLAGS) Concat($(DESTDIR)dest/lib,libname.sa.rev))
-
-#endif /* InstallSharedLibraryData */
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedLibraryTarget
-#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
-AllTarget(Concat(lib,libname.so.rev))					@@\
-									@@\
-Concat(lib,libname.so.rev):  solist $(EXTRALIBRARYDEPS)			@@\
-	$(RM) $@~							@@\
-	$(CC) -G -o $@~ $(SHLIBLDFLAGS) solist				@@\
-	$(RM) $@ 							@@\
-	$(MV) $@~ $@							@@\
-									@@\
-AllTarget(Concat(lib,libname.so))					@@\
-									@@\
-Concat(lib,libname.so):  Concat(lib,libname.so.rev)			@@\
-	$(RM) $@ 							@@\
-	$(LN) $? $@							@@\
-	LinkBuildLibrary($@)						@@\
-	LinkBuildLibrary(Concat(lib,libname.so))			@@\
-									@@\
-clean::									@@\
-	$(RM) Concat(lib,libname.so.rev)
-
-#endif /* SharedLibraryTarget */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)			@@\
-AllTarget(Concat(lib,libname.sa.rev))					@@\
-									@@\
-Concat(lib,libname.sa.rev):  salist $(EXTRALIBRARYDEPS)			@@\
-	$(RM) $@							@@\
-	$(AR) $@ salist							@@\
-	RanLibrary($@)							@@\
-									@@\
-clean::									@@\
-	$(RM) Concat(lib,libname.sa.rev)
-
-#endif /* SharedLibraryDataTarget */
--- a/Xvnc/config/cf/necLib.tmpl
+++ /dev/null
@@ -1,29 +0,0 @@
-XCOMM $XConsortium: necLib.tmpl,v 1.1 94/03/26 18:15:22 rws Exp $
-
-/*
- * NEC shared library template
- */
-
-#ifndef SharedXlibRev
-#define SharedXlibRev 4.10
-#endif
-#ifndef SharedOldXRev
-#define SharedOldXRev 4.10
-#endif
-#ifndef SharedXtRev
-#define SharedXtRev 4.10
-#endif
-#ifndef SharedXawRev
-#define SharedXawRev 5.0
-#endif
-#ifndef SharedXmuRev
-#define SharedXmuRev 4.10
-#endif
-#ifndef SharedXextRev
-#define SharedXextRev 4.10
-#endif
-#ifndef SharedXinputRev
-#define SharedXinputRev 4.10
-#endif
-
-#include <sv4Lib.tmpl>
--- a/Xvnc/config/cf/noop.rules
+++ /dev/null
@@ -1 +0,0 @@
-
--- a/Xvnc/config/cf/oldlib.rules
+++ /dev/null
@@ -1,109 +0,0 @@
-/* You should not use these any more, use new Library.tmpl insead */
-
-XCOMM $XConsortium: oldlib.rules,v 1.2 91/04/09 19:15:13 rws Exp $
-
-/*
- * ProfiledLibraryObjectRule - generate make rules to build both profiled
- * and "normal" objects.
- */
-#ifndef ProfiledLibraryObjectRule
-#define	ProfiledLibraryObjectRule()					@@\
-all::									@@\
-	LibMkdir(profiled)						@@\
-									@@\
-.c.o:									@@\
-	ProfiledLibObjCompile(NullParameter)				@@\
-	NormalLibObjCompile(NullParameter)				@@\
-									@@\
-clean::									@@\
-	LibCleanDir(profiled)						@@\
-
-#endif /* ProfiledLibraryObjectRule */
-
-
-/*
- * DebuggedLibraryObjectRule - generate make rules to build both debuggable
- * and "normal" objects.
- */
-#ifndef DebuggedLibraryObjectRule
-#define	DebuggedLibraryObjectRule()					@@\
-all::									@@\
-	LibMkdir(debugger)						@@\
-									@@\
-.c.o:									@@\
-	DebuggedLibObjCompile(NullParameter)				@@\
-	NormalLibObjCompile(NullParameter)				@@\
-									@@\
-clean::									@@\
-	LibCleanDir(debugger)						@@\
-
-#endif /* DebuggedLibraryObjectRule */
-
-
-/*
- * DebuggedAndProfiledLibraryOjbectRule - generate make rules to build
- * debuggable, profiled, and "normal" objects.
- */
-#ifndef DebuggedAndProfiledLibraryObjectRule
-#define	DebuggedAndProfiledLibraryObjectRule()				@@\
-all::									@@\
-	LibMkdir(profiled)						@@\
-	LibMkdir(debugger)						@@\
-									@@\
-.c.o:									@@\
-	ProfiledLibObjCompile(NullParameter)				@@\
-	DebuggedLibObjCompile(NullParameter)				@@\
-	NormalLibObjCompile(NullParameter)				@@\
-									@@\
-clean::									@@\
-	LibCleanDir(profiled)						@@\
-	LibCleanDir(debugger)						@@\
-
-#endif /* DebuggedAndProfiledLibraryObjectRule */
-
-
-/*
- * SpecialProfiledObjectRule - generate rules to compile a file with special
- * flags and to make a profiled version.
- */
-#ifndef SpecialProfiledObjectRule
-#define	SpecialProfiledObjectRule(objs,depends,options)			@@\
-all::									@@\
-	LibMkdir(profiled)						@@\
-									@@\
-objs:	depends								@@\
-	ProfiledLibObjCompile(options)					@@\
-	NormalLibObjCompile(options)
-#endif /* SpecialProfiledObjectRule */
-
-
-/*
- * SpecialDebuggedObjectRule - generate rules to compile a file with special
- * flags and to make a debuggable version.
- */
-#ifndef SpecialDebuggedObjectRule
-#define	SpecialDebuggedObjectRule(objs,depends,options)			@@\
-all::									@@\
-	LibMkdir(debugger)						@@\
-									@@\
-objs:	depends								@@\
-	DebuggedLibObjCompile(options)					@@\
-	NormalLibObjCompile(options)
-#endif /* SpecialDebuggedObjectRule */
-
-
-/*
- * SpecialDebuggedAndProfiledObjectRule - generate rules to compile a file 
- * with special flags and to make debuggable and profiled versions.
- */
-#ifndef SpecialDebuggedAndProfiledObjectRule
-#define	SpecialDebuggedAndProfiledObjectRule(objs,depends,options)	@@\
-all::									@@\
-	LibMkdir(profiled)						@@\
-	LibMkdir(debugger)						@@\
-									@@\
-objs:	depends								@@\
-	ProfiledLibObjCompile(options)					@@\
-	DebuggedLibObjCompile(options)					@@\
-	NormalLibObjCompile(options)
-#endif /* SpecialDebuggedAndProfiledObjectRule */
--- a/Xvnc/config/cf/os2.cf
+++ /dev/null
@@ -1,252 +0,0 @@
-XCOMM $XConsortium: os2.cf /main/1 1996/10/31 14:47:25 kaleb $
-
-
-
-XCOMM platform:  $XFree86: xc/config/cf/os2.cf,v 3.18.2.4 1998/02/22 01:04:50 robin Exp $
-
-#define OSName           OS/2
-#define OSVendor	 IBM
-#define OSMajorVersion    3
-#define OSMinorVersion    0
-
-/*
- * C library features
- */
-#ifdef __EMX__
-
-/* set this to what you like (almost :-) 
- * OS/2 does a nonstandard bootstrap of imake 
- */
-#define BootstrapCFlags   -DBSD43
-
-/* X_WCHAR and X_LOCALE are set in Xosdefs.h */
-#define StandardDefines   /**/
-#define XawI18nDefines    -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-
-/* This will redirect everything to /XFree86
- * Care will be taken that programs that need a file from this tree
- * will add the environment variable X11ROOT to the search path
- * so you can redirect the stuff to a different drive
- */
-#ifdef ProjectRoot
-#undef ProjectRoot
-#endif
-/* This will be mangled with a drive letter in most OS/2 rules ... */
-#define ProjectRoot	/XFree86
-
-/* ... but not when a user tries to compile something from a different drive 
- * Please report any directories missed to Holger.Veit@gmd.de 
-*/
-#ifdef UseInstalled
-#define IncRoot $(X11ROOT)/XFree86/include
-#define LdPreLib -L$(X11ROOT)/XFree86/lib
-#endif
-
-/* more directories */
-#define AdmDir		        $(LIBDIR)/adm
-#define ConfigDir		$(X11ROOT)$(LIBDIR)/config
-        DESTDIR = $(X11ROOT)
-
-/* for the man pages */
-#define BookFormatManPages	YES
-#define ManDirectoryRoot /XFree86/man/man
-#define ManSuffix	1
-#define LibManSuffix	3
-#define FileManSuffix	4
-#define XmanSearchPath	/XFree86/man/man
-#define ManSourcePath	$(MANPATH)
-
-/* you must have installed groff! */
-#define TblCmd		tbl
-#define ColCmd		cat
-#define NeqnCmd		eqn 
-#define NroffCmd	groff -Tascii
-#define	EqnCmd 		eqn -Tascii
-#define TroffCmd        groff -Tps
-         NEQN = NeqnCmd
-        NROFF = NroffCmd
-
-/* A set of standard defines: */
-#define OSDefines		-D__EMX__ -D__i386__ -Demxos2 -D_POSIX_SOURCE \
-				-D_BSD_SOURCE -D_GNU_SOURCE
-
-#define BuildXKB		YES
-#define BuildImplibs		YES
-#define BuildLBX		YES
-
-/* some more properties of the OS/2 implementation */
-#define HasNdbm         	YES
-#define HasPutenv       	YES
-#define HasSockets		YES
-#define HasSnprintf		YES
-#define HasBsearch		NO
-#define HasLargeTmp		NO
-#define HasPoll			NO
-#define HasBSD44Sockets 	NO
-#define HasSecureRPC		NO
-#define	HasSymLinks		NO
-#define HasVFork		NO
-#define HasVarDirectory		NO
-#define HasStrcasecmp		NO
-#define Malloc0ReturnsNull	YES
-#define SetTtyGroup     	NO
-#ifndef HasLibCrypt
-# define HasLibCrypt		NO
-#endif
-#ifndef HasShm
-# define HasShm          	YES
-#endif
-#define ConnectionFlags		-DTCPCONN -DOS2PIPECONN
-#define StdIncDir $(C_INCLUDE_PATH)
-
-/* XF86Setup stuff - does not work yet! */
-#define HasTcl			NO
-/*define TclLibDir		$(X11ROOT)$(SHLIBDIR)*/
-/*define TclIncDir		$(X11ROOT)$(INCROOT)/tcl*/
-/*define TclLibName		xtcl*/
-
-#define HasTk			NO
-/*define TkLibDir		$(X11ROOT)$(SHLIBDIR)*/
-/*define TkIncDir		$(X11ROOT)$(INCROOT)/tk*/
-/*define TkLibName		xtk*/
-
-/*
- * Compiler Features
- */
-#define HasGcc			YES
-#define HasGcc2			YES
-#define HasCplusplus		YES
-#define HasGcc2ForCplusplus	YES
-#define GccUsesGas		YES
-#define UseGas			YES
-#define GnuCpp			YES
-#define DoRanlibCmd		YES
-#define NeedConstPrototypes	YES
-#define NeedFunctionPrototypes	YES
-#define NeedNestedPrototypes	YES
-#define NeedVarargsPrototypes	YES
-#define NeedWidePrototypes	NO
-
-#define CppCmd	cpp
-#define StandardCppDefines	-traditional
-#define PreProcessCmd	CppCmd
-
-#define CcCmd	gcc
-#define DefaultCCOptions	-D__ST_MT_ERRNO__ -Zmtd -Zsysv-signals
-#define LibraryCCOptions	-D__ST_MT_ERRNO__ -Zmtd -Zsysv-signals
-#define ServerCCOptions	-D__ST_MT_ERRNO__ -Zmtd -Zsysv-signals
-
-#define CplusplusCmd g++
-#define CplusplusOptions	-Zmtd -Zsysv-signals
-
-#define MakeCmd x11make 
-#define AsCmd	gcc -S
-#define GccGasOption	-DGCCUSESGAS
-#define AsmDefines	-DUSE_GAS
-
-#define InstallCmd	install
-
-#define LdCmd	ld
-#define ExtraLoadFlags	-Zbin-files
-#define ExtraLibraries	-lsocket -lbsd
-
-/* quite a number of programs you need, most of them the same as
- * with Unix, but listed here for completeness
- */
-#define ArCmd	ar cq
-#define RanlibCmd	ar s
-#define BourneShell	/**/
-#define LexCmd	flex -l
-#define LexLib	-lfl
-#define YaccCmd	yacc
-#define LintCmd	/**/
-#define MvCmd	mv
-#define CompressCmd	compress
-#define GzipCmd	gzip
-#define LnCmd cp
-#define CpCmd cp
-#define RmCmd	ImakeHelper 4 
-
-#ifndef UseInstalled
-#define ImakeCmd \imake
-#define MkdirHierCmd \mkdirhier
-#define DependCmd \makedepend
-#else
-/* imake and mkdirhier come from Imake.tmpl, but DependCmd must be overriden */
-#define DependCmd makedepend
-#endif
-
-/* "shell scripts" in OS/2 have this extension */
-#define SHsuf cmd
-
-#define InstPgmFlags /**/
-#define InstBinFlags /**/
-#define InstUidFlags /**/
-#define InstLibFlags /**/
-#define InstIncFlags /**/
-#define InstManFlags /**/
-#define InstDatFlags /**/
-#define InstallFlags /**/
-
-#define OptimizedCDebugFlags 	DefaultGcc2i386Opt
-#define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
-#define ServerExtraDefines GccGasOption XFree86ServerDefines
-
-#if HasShm
-# define ServerExtraSysLibs	-lshm
-#endif
-
-/*
- * Make & install Features
- */
-
-#define AvoidNullMakeCommand 	YES
-_NULLCMD_ = @ rem
-#define NullMakeCommand	@ rem
-#define StripInstalledPrograms	NO
-#define CompressAllFonts	YES
-#define CompressManPages	YES
-#define GzipFontCompression	YES
-#define DefaultUserPath		.;/os2;/emx/bin;/tcpip/bin;$(BINDIR)
-#define DefaultSystemPath	/os2;/emx/bin;$(BINDIR)
-
-#ifndef ExtraFilesToClean
-# define ExtraFilesToClean 	*.~* *.exe *.dll *.obj *.lib *.map
-#endif
-
-#if CompressManPages
-#define CompressManCmd	gzip -n
-   COMPRESSMANCMD = CompressManCmd
-#endif
-
-#define ProgramTargetName(target)target.exe
-
-/* we don't name libraries lib*.a */
-#define LibraryTargetName(libname) libname.a
-#define LibraryTargetNameSuffix(libname,suffix)Concat(libname,suffix.a)
-
-/* ... and we even don't do it in rules that should have used the above
- * LibraryTargetName macro
- */
-#ifndef UnSharedLibReferences
-#define UnsharedLibReferences(varname,libname,libsource)		@@\
-Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/,$(BUILDLIBDIR)/,libname.a)	@@\
-Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname)		@@\
-LintLibReferences(varname,libname,libsource)
-#endif
-
-#ifndef SharedLibReferences
-#define SharedLibReferences(varname,libname,libsource,revname,rev)	@@\
-Concat3(DEP,varname,LIB) = SharedLibDependencies(libname,libsource,revname) @@\
-Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname)		@@\
-LintLibReferences(varname,libname,libsource)
-#endif
-
-#include <os2.rules>
-#include <os2Lib.rules>
-
-# include <xfree86.cf>
-
-#else
-#error You must edit os2.cf for your (non-EMX) OS/2 dev system
-#endif
--- a/Xvnc/config/cf/os2.rules
+++ /dev/null
@@ -1,537 +0,0 @@
-XCOMM $XConsortium: os2.rules /main/1 1996/10/31 14:47:27 kaleb $
-
-
-
-XCOMM platform:  $XFree86: xc/config/cf/os2.rules,v 3.15 1997/01/05 11:49:39 dawes Exp $
-
-.SUFFIXES: .Osuf .c .CCsuf
-
-.c.Osuf:
-	$(CC) $(CFLAGS) -c $*.c
-
-#if HasCplusplus
-.CCsuf.Osuf:
-	$(CXX) $(CFLAGS) -c $*.CCsuf
-#endif
-
-#ifndef UseInstalled
-#define ImakeHelper \imakesvc
-#define IMmode n
-#define ImakeIndir \indir
-#define ImakeSubCmdHelper \imake -I$(IRULESRC) $(IMAKE_DEFINES)
-#define Fontc \bdftopcf
-#define MkFontDir \mkfontdir
-#define XkbComp \xkbcomp
-#else
-#define ImakeHelper imakesvc
-#define IMmode u
-#define ImakeIndir indir
-#define ImakeSubCmdHelper $(IMAKE_CMD)
-#define Fontc bdftopcf
-#define MkFontDir mkfontdir
-#define XkbComp xkbcomp
-#endif
-
-#define echo ImakeHelper 8 
-#define RunProgram(progvar,options) $(subst /,\,$(progvar)) options
-#define RemoveFile(file) $(RM) file
-#define RemoveFiles(files) $(RM) files
-#define NeedLdLibraryPathForXkbComp NO
-
-#define LibObjCompile(dir,options) RemoveFiles($@ dir\$@)		@@\
-	$(CC) $(CCOPTIONS) $(ALLDEFINES) options -c  $*.c		@@\
-	$(MV) $@ dir\$@
-
-#define MakeDir(dir) $(MKDIRHIER) dir
-
-#define BuildIncludesTop(srclist)					@@\
-includes:: srclist							@@\
-	MakeDir($(BUILDINCDIR))						@@\
-	@for %i in (srclist) do ImakeHelper 2 $(BUILDINCDIR) $(BUILDINCTOP) $(CURRENT_DIR) %i
-
-#define	ProgramTargetHelper(program,srcs,objs,deplib,locallib,syslib)	@@\
-ProgramTargetName(program): $(objs) 					@@\
-	RemoveTargetProgram($@)						@@\
-	LinkRule($@,$(LDOPTIONS),$(objs),locallib $(LDLIBS) syslib)	@@\
-									@@\
-InstallProgram(program,$(BINDIR))					@@\
-InstallManPage(program,$(MANDIR))
-
-#if 0
-#define	ProgramTargetHelperNoMan(program,srcs,objs,deplib,locallib,syslib)	@@\
-ProgramTargetName(program): $(objs) 					@@\
-	RemoveTargetProgram($@)						@@\
-	LinkRule($@,$(LDOPTIONS),$(objs),locallib $(LDLIBS) syslib)	@@\
-									@@\
-InstallProgram(program,$(BINDIR))
-#endif
-
-
-#define BuildIncludes(srclist,dstsubdir,dstupdir)			@@\
-includes:: srclist							@@\
-	MakeDir($(BUILDINCDIR)/dstsubdir)				@@\
-	@for %i in (srclist) do ImakeHelper 3 $(BUILDINCTOP)/dstupdir/$(CURRENT_DIR) $(BUILDINCDIR)/dstsubdir %i
-
-#define LinkFileList(step,list,dir,sub)					@@\
-step::  list								@@\
-	@for %i in (list) do ImakeHelper 3 sub dir %i
-
-#define ComplexProgramTarget(program)					@@\
-PROGRAM = ProgramTargetName(program)					@@\
-									@@\
-AllTarget(ProgramTargetName(program))					@@\
-									@@\
-ProgramTargetHelper(program,SRCS,OBJS,DEPLIBS,$(LOCAL_LIBRARIES),NullParameter) @@\
-									@@\
-DependTarget()								@@\
-LintTarget()								@@\
-									@@\
-clean::									@@\
-	RemoveFile($(PROGRAM))
-
-#define ComplexProgramTarget_1(program,locallib,syslib)			@@\
-OBJS = $(OBJS1) $(OBJS2) $(OBJS3)					@@\
-SRCS = $(SRCS1) $(SRCS2) $(SRCS3)					@@\
-PROGRAM1 = ProgramTargetName(program)					@@\
-									@@\
-AllTarget($(PROGRAM1) $(PROGRAM2) $(PROGRAM3))				@@\
-									@@\
-ProgramTargetHelper(program,SRCS1,OBJS1,DEPLIBS1,locallib,syslib)	@@\
-									@@\
-DependTarget()								@@\
-LintTarget()								@@\
-									@@\
-clean::									@@\
-	RemoveFiles($(PROGRAMS))
-
-#define ComplexProgramTarget_2(program,locallib,syslib)			@@\
-PROGRAM2 = ProgramTargetName(program)					@@\
-									@@\
-ProgramTargetHelper(program,SRCS2,OBJS2,DEPLIBS2,locallib,syslib)
-
-#define ComplexProgramTarget_3(program,locallib,syslib)			@@\
-PROGRAM3 = ProgramTargetName(program)					@@\
-									@@\
-ProgramTargetHelper(program,SRCS3,OBJS3,DEPLIBS3,locallib,syslib)
-
-#define NormalProgramTarget(program,objects,deplibs,locallibs,syslibs)	@@\
-ProgramTargetName(program): objects 					@@\
-	RemoveTargetProgram($@)						@@\
-	LinkRule($@,$(LDOPTIONS),objects,locallibs $(LDLIBS) syslibs)	@@\
-									@@\
-clean::									@@\
-	RemoveFile(ProgramTargetName(program))
-
-#if 0
-#define ComplexProgramTargetNoMan(program)				@@\
-PROGRAM = ProgramTargetName(program)					@@\
-									@@\
-AllTarget(ProgramTargetName(program))					@@\
-									@@\
-ProgramTargetHelperNoMan(program,SRCS,OBJS,DEPLIBS,$(LOCAL_LIBRARIES),NullParameter) @@\
-									@@\
-DependTarget()								@@\
-LintTarget()								@@\
-									@@\
-clean::									@@\
-	RemoveFile($(PROGRAM))
-#endif
-
-#define MoveToBakFile(file) ImakeHelper 5 file
-
-#define RMoveToBakFile(file) ImakeHelper 6 file
-
-#define InstallMultipleDestFlags(step,list,dest,flags)			@@\
-step:: list								@@\
-	MakeDir($(DESTDIR)dest)							@@\
-	$(INSTALL) $(INSTALLFLAGS) flags list $(subst /,\,$(DESTDIR)dest)
-
-#define	CleanTarget()							@@\
-clean::									@@\
-	RemoveFiles(FilesToClean ExtraFilesToClean)
-
-#define LinkSourceFile(src,dir)						@@\
-src:									@@\
-	ImakeHelper 3 dir . src						@@\
-									@@\
-includes:: src								@@\
-									@@\
-depends:: src								@@\
-									@@\
-clean::									@@\
-	RemoveFile(src)
-
-#define LinkFile(tofile,fromfile)					@@\
-tofile:: fromfile							@@\
-	ImakeHelper 7 fromfile tofile					@@\
-									@@\
-includes:: tofile							@@\
-									@@\
-depend:: tofile								@@\
-									@@\
-clean::									@@\
-	RemoveFile(tofile)
-
-#ifndef UseInstalled
-#define ImakeDependency(target)						@@\
-target:: ProgramTargetName($(IMAKE))					@@\
-									@@\
-ProgramTargetName($(IMAKE)):						@@\
-	@ImakeIndir $(IMAKESRC) if exist Makefile $(MAKE) SHELL= MAKE=x11make all		@@\
-	@ImakeIndir $(IMAKESRC) if not exist Makefile $(MAKE) SHELL= MAKE=x11make -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"
-#endif
-
-#ifndef UseInstalled
-#define DependDependency() 						@@\
-depend:: ProgramTargetName($(DEPEND))					@@\
-									@@\
-ProgramTargetName($(DEPEND)):						@@\
-	@ImakeIndir $(DEPENDSRC) $(MAKE) SHELL= MAKE=x11make 
-#endif
-
-#define	DependTarget()							@@\
-DependDependency()							@@\
-									@@\
-depend::								@@\
-	$(subst /,\,$(DEPEND)) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS)
-
-#define	DependTarget3(srcs1,srcs2,srcs3)				@@\
-DependDependency()							@@\
-
-/* Currently this stuff doesn't work correctly for libX11
-depend::								@@\
-	$(subst /,\,$(DEPEND)) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs1 @@\
-	$(subst /,\,$(DEPEND)) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs2 @@\
-	$(subst /,\,$(DEPEND)) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- srcs3
-*/
-
-#define ForceSubdirs(dirs)						@@\
-dirs: DONE								@@\
-									@@\
-DONE:									@@\
-	@for %i in (dirs) do ImakeIndir %i $(MAKE) SHELL= MAKE=x11make $(MFLAGS) PassCDebugFlags all @@\
-	touch DONE							@@\
-									@@\
-clean::									@@\
-	RemoveFile(DONE)
-
-#define MakeMakeSubdirs(dirs,target)					@@\
-MMSDIRS = dirs								@@\
-MMSTOP = $(TOP)								@@\
-MMSRULES = $(IRULESRC)							@@\
-MMSCUR = $(CURRENT_DIR)							@@\
-target::								@@\
-	@for %i in ($(subst /,\,$(MMSDIRS))) do ImakeHelper 1 IMmode %i $(MMSRULES) $(MMSTOP) $(MMSCUR)
-
-#define NamedTargetSubdirs(name,dirs,verb,flags,subname)		@@\
-Concat(SUBST,name) = dirs						@@\
-name::									@@\
-	@for %i in ($(subst /,\,$(Concat(SUBST,name)))) do ImakeIndir %i $(MAKE) SHELL= MAKE=x11make $(MFLAGS) flags subname
-
-#define InstallNamedTarget(step,srcname,flags,dest,dstname)		@@\
-step:: srcname								@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) $(INSTALLFLAGS) flags srcname $(subst \,/,$(DESTDIR)dest)/dstname
-
-#define	BuildMakefileTarget(notused,imakeflags)				@@\
-ImakeDependency(Makefile)						@@\
-									@@\
-Makefile:: 								@@\
-	RMoveToBakFile(Makefile)					@@\
-	ImakeSubCmdHelper -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) imakeflags
-
-#define AssembleObject(flags) $(RM) $@                                  @@\
-	$(CPP) AsmDefines $(DEFINES) $(INCLUDES) flags $*.s | \         @@\
-	    grep -v '^\#' > _tmp_.s                                     @@\
-	$(CC) $(CFLAGS) -o $*.Osuf -c _tmp_.s                           @@\
-	$(RM) _tmp_.s
-
-#define NormalAsmObjectRule()                                           @@\
-.s.Osuf:                                                                @@\
-	AssembleObject($(_NOOP_))
-
-#define ObjectMapIncludeFromSpecialSource(dst,src,flags)		@@\
-dst.c: src.c								@@\
-	ImakeHelper 9 $@ mfbmap.h $?					@@\
-									@@\
-SpecialCObjectRule(dst,NullParameter,flags)				@@\
-									@@\
-depend:: dst.c								@@\
-									@@\
-clean::									@@\
-	RemoveFile(dst.c)
-
-#define FontBaseObj(basename)basename.pcf
-/*
- * UncompressedFontTarget
- */
-#define UncompressedFontTarget(basename)				@@\
-FontBaseObj(basename):  FontSrc(basename)				@@\
-	Fontc $(FONTCFLAGS) $? -o $@
-
-/*
- * CompressedFontTarget
- */
-#ifndef CompressedFontTarget
-#if GzipFontCompression
-#define CompressedFontTarget(basename)					@@\
-FontBaseObj(basename).gz:  FontSrc(basename)				@@\
-	Fontc $(FONTCFLAGS) $? | $(GZIPCMD) > $@
-#else
-#define CompressedFontTarget(basename)					@@\
-FontBaseObj(basename).Z:  FontSrc(basename)				@@\
-	Fontc $(FONTCFLAGS) $? | $(COMPRESS) > $@
-#endif
-#endif
-
-/*
- * MakeFontsDir - generate rules to build fonts.dir database.
- */
-#define MakeFontsDir(deplist)						@@\
-all:: fonts.dir								@@\
-									@@\
-fonts.dir:  deplist							@@\
-	MkFontDir .							@@\
-									@@\
-clean::									@@\
-	RemoveFile(fonts.dir)
-
-/* OS/2 scripts are based on REXX
- * it is just the SHELL variable that is messed up that forces me to
- * modify this rule
- */
-#define ConfigTargetLong(target,dep,script,args,extra)			@@\
-all:: Configure								@@\
-									@@\
-Configure:: target.o							@@\
-									@@\
-target.c: script dep							@@\
-	$(MAKE) SHELL= MAKE=x11make $(MFLAGS) extra Concat(Build,target)			@@\
-									@@\
-Concat(Build,target):							@@\
-	$(RM) target.c							@@\
-	script args							@@\
-									@@\
-clean::									@@\
-	$(RM) target.c
-
-#ifndef ServerTargetWithFlags
-#define	ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,flags) @@\
-AllTarget(ProgramTargetName(server))					@@\
-ProgramTargetName(server): subdirs objects libs				@@\
-	MoveToBakFile($@)						@@\
-	LinkRule($@,$(LDOPTIONS),objects,libs $(LDLIBS) syslibs)	@@\
-	emxbind -a ProgramTargetName(server) -h255			@@\
-									@@\
-Concat(load,server):							@@\
-	MoveToBakFile(ProgramTargetName(server))			@@\
-	LinkRule(ProgramTargetName(server),$(LDOPTIONS),objects,libs $(LDLIBS) syslibs) @@\
-									@@\
-loadX:: Concat(load,server)						@@\
-									@@\
-SentinelProgramTarget(server,subdirs objects libs,objects libs $(LDLIBS) syslibs) @@\
-SentinelLinkTarget(Concat(load,server),server,objects libs $(LDLIBS) syslibs) @@\
-PurifyProgramTarget(server,subdirs objects libs,objects libs $(LDLIBS) syslibs) @@\
-PurifyLinkTarget(Concat(load,server),server,objects libs $(LDLIBS) syslibs) @@\
-ProofProgramTarget(server,subdirs objects libs,objects libs $(LDLIBS) syslibs) @@\
-ProofLinkTarget(Concat(load,server),server,objects libs $(LDLIBS) syslibs) @@\
-									@@\
-InstallProgramWithFlags(server,$(BINDIR),flags)				@@\
-									@@\
-clean::									@@\
-	RemoveFile(ProgramTargetName(server))
-#endif /* ServerTargetWithFlags */
-
-/*
- * ServerTarget - rules to compile, link, and relink a normal server
- * Need a .def file for OS/2
- */
-#ifndef ServerTarget
-#define	ServerTarget(server,subdirs,objects,libs,syslibs)		@@\
-ServerTargetWithFlags(server,subdirs,objects,libs,syslibs server.def,$(_NOOP_)) @@\
-									@@\
-ProgramTargetName(server): server.def
-#endif /* ServerTarget */
-
-/*
- * ToolkitMakeStrings generates a string-table, i.e., a C source
- * file and the matching header(s), e.g., Xt's StringDefs.c, StringDefs.h,
- * and Shell.h files; or Motif's XmStrDefs.c and XmStrDefs.h files.
- *
- * The 'files' argument is the list of files that will be produced by
- * this rule, e.g., for Xt they would be "Shell.h StringDefs.c StringDefs.h"
- * and for Motif they would be "XmStrDefs.c XmStrDefs.h".
- *
- * The 'source' argument is the string-list file to be parsed, e.g., in
- * Xt that would be "util/string.list".  For Motif 2.0 it would be
- * "../../tools/makestr/xmstring.list", and for Motif-CDE1 it would be
- * "util/xmstring.list".
- *
- * The 'options' argument is passed by the library's Imakefile, see the
- * Xt Imakefile for an example.  Typically this would be nothing, -intelabi,
- * or -sparcabi; there are other choices, but these are typical.
- *
- * The 'depends' argument names additional files the target files
- * depend on.  It should name the #ctmpl and #htmpl files from the
- * 'source' file.
- *
- * The 'dest' argument is the C source output file.  For Xt this should
- * be "StringDefs.c", and for all versions of Motif it would be "XmStrDefs.c"
- *
- * Headers are generated and named according to data in the 'source'
- * file.
- */
-
-#ifndef ToolkitMakeStrings
-#define ToolkitMakeStrings(files,source,options,depends,dest)		@@\
-MAKESTRS = $(CONFIGSRC)/util/makestrs					@@\
-MAKESTRS1 = /makestrs.exe						@@\
-									@@\
-ProgramTargetName($(MAKESTRS)): $(MAKESTRS).c				@@\
-	ImakeIndir $(CONFIGSRC)/util make SHELL= ProgramTargetName(makestrs)	@@\
-	ImakeHelper 7 $(CONFIGSRC)/util/makestrs.exe /			@@\
-									@@\
-files: ProgramTargetName($(MAKESTRS)) source depends			@@\
-	RemoveFiles(files)						@@\
-	RunProgram(MAKESTRS1,options < source > dest)			@@\
-									@@\
-AllTarget(files)							@@\
-									@@\
-includes:: files							@@\
-									@@\
-depend:: files								@@\
-									@@\
-clean::									@@\
-	RemoveFiles(files)
-
-#endif /* ToolkitMakeStrings */
-
-/*#define CppSedMagic SedMagic*/
-#define CppSedMagic sed -e '/^#  *[0-9][0-9]*  *.*$$/d' -e 's/^XCOMM/#/g' -e 's/^XCOMM[^a-zA-Z0-9_]/#/g'
-
-#ifndef InstallNamedTargetNoClobber
-#define InstallNamedTargetNoClobber(step,srcname,flags,dest,dstname)	@@\
-step:: srcname								@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	if not exist $(subst /,\,$(DESTDIR)dest)\dstname $(INSTALL) $(INSTALLFLAGS) flags srcname $(DESTDIR)dest/dstname
-
-#endif /* InstallNamedTargetNoClobber */
-
-#if CompressManPages
-
-#ifndef InstallManPageLong
-#define InstallManPageLong(file,destdir,dest)                           @@\
-install.man:: file.man                                                  @@\
-	MakeDir($(DESTDIR)destdir)					@@\
-	ImakeHelper 12 file $(DESTDIR)destdir dest
-#endif
-
-#ifndef InstallManPageAliases
-#define InstallManPageAliases(file,destdir,aliases)                     @@\
-install.man::                                                           @@\
-	MakeDir($(DESTDIR)destdir)					@@\
-	for %i in (aliases) do $(INSTALL) $(DESTDIR)destdir/file.gz $(DESTDIR)destdir/%i.gz
-#endif
-
-#ifndef InstallGenManPageLong
-#define InstallGenManPageLong(file,destdir,dest,suffix)                 @@\
-install.man:: file.man                                                  @@\
-	MakeDir($(DESTDIR)destdir)					@@\
-	ImakeHelper 12 file $(DESTDIR)destdir dest
-#endif
-
-#ifndef InstallMultipleMan
-#define InstallMultipleMan(list,dest)                                   @@\
-install.man:: list                                                      @@\
-	MakeDir($(DESTDIR)dest)						@@\
-	for %i in (list) do ImakeHelper 12 %i $(DESTDIR)dest %i
-#endif
-
-#else /* CompressManPages */
-
-#ifndef InstallManPageLong
-#define InstallManPageLong(file,destdir,dest)                           @@\
-install.man:: file.man                                                  @@\
-	MakeDir($(DESTDIR)destdir)					@@\
-	ImakeHelper 10 file $(DESTDIR)destdir dest $(MANSUFFIX)
-#endif
-
-#ifndef InstallManPageAliases
-#define InstallManPageAliases(file,destdir,aliases)                     @@\
-install.man::                                                           @@\
-	MakeDir($(DESTDIR)destdir)					@@\
-	for %i in (aliases) do $(INSTALL) $(DESTDIR)destdir/file.$(MANSUFFIX) $(DESTDIR)destdir/%i.$(MANSUFFIX) 
-#endif
-
-#ifndef InstallGenManPageLong
-#define InstallGenManPageLong(file,destdir,dest,suffix)                 @@\
-install.man:: file.man                                                  @@\
-	MakeDir($(DESTDIR)destdir)					@@\
-	ImakeHelper 10 file $(DESTDIR)destdir dest suffix
-#endif
-
-#ifndef InstallMultipleMan
-#define InstallMultipleMan(list,dest)                                   @@\
-install.man:: list                                                      @@\
-	MakeDir($(DESTDIR)dest)						@@\
-	for %i in (list) do ImakeHelper 10 %i $(DESTDIR)dest %i $(MANSUFFIX)
-#endif
-
-#endif
-
-#ifndef NormalLintTarget
-#define NormalLintTarget(srclist)
-#endif /* NormalLintTarget */
-
-#ifndef MakeDirectories
-#define MakeDirectories(step,dirs)					@@\
-step::									@@\
-	-for %i in (dirs) do $(MKDIRHIER) $(DESTDIR)%i
-#endif /* MakeDirectories */
-
-#ifndef YaccFile
-#define YaccFile(file,flags)						@@\
-depend:: file.c								@@\
-									@@\
-file.h file.c: file.y							@@\
-	$(YACC) flags file.y						@@\
-	$(MV) y.tab.c file.c						@@\
-	@if exist y.tab.h $(MV) y.tab.h file.h				@@\
-									@@\
-clean::									@@\
-	RemoveFiles(y.tab.c y.tab.h file.h file.c)
-#endif /* YaccFile */
-
-#ifndef StaticLibrary
-#define StaticLibrary(libpath,libname) Concat4(libpath,/,libname,_s.a)
-#endif
-
-#ifndef MakeXkbDir
-#define MakeXkbDir(basedir,subdir)					@@\
-all::	Concat(subdir,.dir)						@@\
-									@@\
-Concat(subdir,.dir):							@@\
-	$(XKBCOMPCMD) -lfhlpR -o Concat(subdir,.dir) *			@@\
-									@@\
-InstallTarget(install,Concat(subdir,.dir),$(INSTDATFLAGS),basedir)
-#endif
-
-/* This is to replace an ugly hack in /xc/nls/XLC_LOCALE */
-/* the corresponding Imake.rules rule would be:
-   define LinkFileSpecial(gotodir,tofile,fromfile)	@@\
-        @MakeFlagsToShellFlags(i,set +e); \		@@\
-	cd dir && (set -x; RemoveFile(tofile); $(LN) fromfile tofile)
- */
-#ifndef LinkFileSpecial
-#define LinkFileSpecial(gotodir,tofile,fromfile)			@@\
-	ImakeHelper 13 gotodir fromfile tofile
-#endif
-
-#ifndef LinkBuildBinary
-#define LinkBuildBinary(binary)						@@\
-all:: $(BUILDBINDIR)/binary binary					@@\
-									@@\
-$(BUILDBINDIR)/binary: binary						@@\
-	ImakeHelper 13 $(BUILDBINDIR) $(BUILDBINTOP)/$(CURRENT_DIR)/binary binary @@\
-	$(CP) binary /
-#endif /* LinkBuildBinary */
--- a/Xvnc/config/cf/os2Lib.rules
+++ /dev/null
@@ -1,244 +0,0 @@
-XCOMM $XConsortium: os2Lib.rules /main/1 1996/10/31 14:47:29 kaleb $
-
-
-
-XCOMM $XFree86: xc/config/cf/os2Lib.rules,v 3.7 1997/01/27 06:12:49 dawes Exp $
-
-/*
- * OS2/EMX shared library rules (DLL version)
- */
-#ifndef __EMX__
-#error You must edit os2Lib.rules for your (non-EMX) OS/2 dev system
-#endif
-
-#ifndef HasSharedLibraries
-#define HasSharedLibraries YES
-#endif
-#ifndef ForceNormalLib
-#define ForceNormalLib NO
-#endif
-
-#define SharedOldX NO
-
-#ifndef SharedDataSeparation
-#define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef /**/
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <os2Lib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags /**/
-#endif
-#ifndef PositionIndependentCFlags
-#define PositionIndependentCFlags -Zdll -Zomf -Zmtd
-#endif
-
-#ifndef NormalSharedLibObjCompile
-#define NormalSharedLibObjCompile(options) $(RM) $@                        @@\
-	$(CC) -c $(CFLAGS) options $(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) $*.c @@\
-	touch $*.o
-#endif
-
-#ifndef InstallSharedLibrary
-#ifdef BuildImplibs
-#define InstallSharedLibrary(libname,rev,dest)				@@\
-install:: libname.dll libname.a	libname.lib				@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) -c $(INSTLIBFLAGS) libname.dll $(DESTDIR)dest 	@@\
-	$(INSTALL) -c $(INSTLIBFLAGS) libname.a $(DESTDIR)dest 		@@\
-	$(INSTALL) -c $(INSTLIBFLAGS) libname.lib $(DESTDIR)dest
-#else
-#define InstallSharedLibrary(libname,rev,dest)				@@\
-install:: libname.dll libname.a						@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) -c $(INSTLIBFLAGS) libname.a $(DESTDIR)dest		@@\
-	$(INSTALL) -c $(INSTLIBFLAGS) libname.dll $(DESTDIR)dest
-#endif
-#endif /* InstallSharedLibrary */
-
-/*#ifdef UseInstalled
-#define LinkBuildLibrary(lib) $(_NULLCMD_)
-#else*/
-#define LinkBuildLibrary(lib) MakeDir($(BUILDLIBDIR))			@@\
-	RemoveFile($(BUILDLIBDIR)/lib)					@@\
-	ImakeIndir $(BUILDLIBDIR) $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .
-/*#endif*/
-
-        EMXIMP = emximp
-        EMXOMF = emxomf
-          SHLD = gcc -Zomf -Zdll -Zmtd
-     SHADDLIBS = -lbsd -lsocket -lc_import
-#ifndef BuildDllSupportLibs
-/*#ifdef UseInstalled
-#define BuildDllSupportLibs(slib) $(_NULLCMD_)
-#else*/
-#define BuildDllSupportLibs(slib)					@@\
-	$(EMXIMP) -o slib.imp slib.def					@@\
-	$(EMXIMP) -o slib.a slib.imp					@@\
-	$(EMXOMF) -s -l slib.a 						@@\
-	LinkBuildLibrary(slib.a)					@@\
-	LinkBuildLibrary(slib.lib)
-/*#endif*/
-#endif
-
-#ifndef BuildDllSupportLibs2
-/*#ifdef UseInstalled
-#define BuildDllSupportLibs2(slib) $(_NULLCMD_)
-#else*/
-#define BuildDllSupportLibs2(slib)					@@\
-	$(EMXIMP) -o slib.imp Concat3(slib,os2,.def)			@@\
-	$(EMXIMP) -o slib.a slib.imp					@@\
-	$(EMXOMF) -s -l slib.a 						@@\
-	LinkBuildLibrary(slib.a)					@@\
-	LinkBuildLibrary(slib.lib)
-/*#endif*/
-#endif
-
-#ifndef BuildLibSupportLibs
-/*#ifdef UseInstalled
-#define BuildLibSupportLibs(slib) $(_NULLCMD_)
-#else*/
-#define BuildLibSupportLibs(slib)					@@\
-	$(EMXOMF) -s -l slib.a 						@@\
-	LinkBuildLibrary(slib.a)					@@\
-	LinkBuildLibrary(slib.lib)
-/*#endif*/
-#endif
-
-#ifndef SharedLibraryTarget
-#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
-AllTarget(libname.dll)							@@\
-.SUFFIXES: .obj .rsp .def						@@\
-        LBRPATH = $(subst /,\,$(LIBRARY_PATH))				@@\
-        LBRDEF = Concat3(libname,os2,.def)				@@\
-	LBRCPPDEF = Concat3(libname,os2,-def.cpp)			@@\
-	LBRRSP = Concat3(libname,os2,.rsp)				@@\
-									@@\
-link.rsp: $(LBRRSP) $(LBRDEF)						@@\
-	@echo $(LBRPATH)"\\dll0.obj+" >link.rsp				@@\
-	@cat $(LBRRSP) >>link.rsp					@@\
-	@echo $(LBRPATH)\\mt\\ $(LBRPATH)\\ $(REQUIREDLIBS) bsd socket c_alias c_static c_import os2 emx2 end >>link.rsp	@@\
-	@echo $(LBRDEF) >>link.rsp					@@\
-									@@\
-libname.dll:  $(OBJS) link.rsp						@@\
-	link386 @link.rsp >nul						@@\
-	BuildDllSupportLibs2(libname)					@@\
-	LinkBuildLibrary(libname.dll)					@@\
-									@@\
-clean::									@@\
-	$(RM) libname.lib libname.imp *.obj link.rsp
-#endif /* SharedLibraryTarget */
-
-#ifndef NormalLibraryTarget
-#define	NormalLibraryTarget(libname,objlist)				@@\
-AllTarget(LibraryTargetName(libname))					@@\
-									@@\
-LibraryTargetName(libname): objlist					@@\
-	RemoveFile($@)							@@\
-	MakeLibrary($@,objlist)						@@\
-	RanLibrary($@)							@@\
-	BuildLibSupportLibs($*)
-#endif /* NormalLibraryTarget */
-
-#ifndef NormalDepLibraryTarget
-#define	NormalDepLibraryTarget(libname,deplist,objlist)			@@\
-AllTarget(LibraryTargetName(libname))					@@\
-									@@\
-LibraryTargetName(libname): deplist					@@\
-	RemoveFile($@)							@@\
-	MakeLibrary($@,objlist)						@@\
-	RanLibrary($@)							@@\
-	BuildLibSupportLibs($*)
-#endif /* NormalDepLibraryTarget */
-
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryDataTarget */
-
-#ifndef InstallSharedLibraryData
-#define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-#ifndef InstallLibrary
-#define	InstallLibrary(libname,dest)					@@\
-install:: LibraryTargetName(libname)					@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) LibraryTargetName(libname) $(DESTDIR)dest @@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(libname,.lib) $(DESTDIR)dest @@\
-	RanLibrary($(RANLIBINSTFLAGS) $(DESTDIR)dest/LibraryTargetName(libname))
-#endif /* InstallLibrary */
-
-#ifndef LibMkdir
-#define LibMkdir(dir) ImakeHelper 11 dir
-#endif
-
-#ifndef LibCleanDir
-#define LibCleanDir(dir) 						@@\
-	ImakeIndir dir call RemoveFiles(*.Osuf)
-#endif
-
-#define MakeStaticLibrary(libname) $(AR) libname *.o
-
-#ifndef UnsharedLibraryTarget
-#define	UnsharedLibraryTarget(libname,objlist,down,up)			@@\
-AllTarget(LibraryTargetName(Concat(libname,_s)))			@@\
-									@@\
-LibraryTargetName(Concat(libname,_s)): objlist				@@\
-	RemoveFile($@)							@@\
-	ImakeIndir down MakeStaticLibrary(up/$@)			@@\
-	RanLibrary($@)							@@\
-	_LinkBuildLibrary($@)						@@\
-									@@\
-install::	LibraryTargetName(Concat(libname,_s))			@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) LibraryTargetName(Concat(libname,_s)) $(DESTDIR)$(SHLIBDIR)
-#endif
-
-#ifndef UnsharedLibraryTarget3
-#define	UnsharedLibraryTarget3(libname,objlist1,objlist2,objlist3,down,up) @@\
-AllTarget(LibraryTargetName(Concat(libname,_s)))			@@\
-									@@\
-LibraryTargetName(Concat(libname,_s)): objlist1 objlist2 objlist3	@@\
-	RemoveFile($@)							@@\
-	ImakeIndir down MakeStaticLibrary(up/$@)			@@\
-	RanLibrary($@)							@@\
-	_LinkBuildLibrary($@)						@@\
-									@@\
-install::	LibraryTargetName(Concat(libname,_s))			@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) LibraryTargetName(Concat(libname,_s)) $(DESTDIR)$(SHLIBDIR)
-#endif /* UnsharedLibraryTarget3 */
-
-/*
- * DebuggedLibraryTarget - generate rules to create a debuggable library.
- */
-#ifndef DebuggedLibraryTarget
-#define	DebuggedLibraryTarget(libname,objlist)				@@\
-AllTarget(LibraryTargetNameSuffix(libname,_d))				@@\
-									@@\
-LibraryTargetNameSuffix(libname,_d): objlist $(EXTRALIBRARYDEPS)	@@\
-	RemoveFile($@)							@@\
-	ImakeIndir debugger MakeStaticLibrary(../$@)			@@\
-	RanLibrary($@)							@@\
-	_LinkBuildLibrary($@)
-
-#endif /* DebuggedLibraryTarget */
-
-/*
- * ProfiledLibraryTarget - generate rules to create a profiled library.
- */
-#ifndef ProfiledLibraryTarget
-#define	ProfiledLibraryTarget(libname,objlist)				@@\
-AllTarget(LibraryTargetNameSuffix(libname,_p))				@@\
-									@@\
-LibraryTargetNameSuffix(libname,_p): objlist $(EXTRALIBRARYDEPS)	@@\
-	RemoveFile($@)							@@\
-	ImakeIndir profiled MakeStaticLibrary(../$@)			@@\
-	RanLibrary($@)							@@\
-	_LinkBuildLibrary($@)
-
-#endif /* ProfiledLibraryTarget */
--- a/Xvnc/config/cf/os2Lib.tmpl
+++ /dev/null
@@ -1,119 +0,0 @@
-XCOMM $XConsortium: os2Lib.tmpl /main/1 1996/10/31 14:47:31 kaleb $
-
-
-
-XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.5 1997/01/05 11:49:40 dawes Exp $
-
-/*
- * OS2/EMX shared library template
- */
-#ifndef __EMX__
-#error You must edit os2Lib.tmpl for your (non-EMX) OS/2 dev system
-#endif
-
-/* note these are special because of linking with link386 */
-#ifdef NOT_EMX
-#define SharedXtReqs $(LDPRELIB) $(XLIBONLY)
-#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
-#define SharedSMReqs $(LDPRELIB) $(ICELIB)
-#define SharedXextReqs $(LDPRELIB) $(XLIBONLY)
-#define SharedXiReqs $(LDPRELIB) $(XLIB)
-#define SharedXieReqs $(LDPRELIB) $(XLIB)
-#define SharedXtstReqs $(LDPRELIB) $(XLIB)
-#define SharedOldXReqs $(LDPRELIB) $(XLIBONLY)
-#define SharedPexReqs $(LDPRELIB) $(XLIBONLY) MathLibrary
-#define SharedXpReqs $(LDPRELIBS) $(XLIB)
-#else
-#define SharedXtReqs ..\\..\\exports\\lib\\ ICE SM X11
-#define SharedXawReqs ..\\..\\exports\\lib\\ Xmu Xt X11 Xext
-#define SharedXmuReqs ..\\..\\exports\\lib\\ Xt X11 Xext
-#define SharedSMReqs ..\\..\\exports\\lib\\ ICE
-#define SharedXextReqs ..\\..\\exports\\lib\\ X11
-#define SharedXiReqs ..\\..\\exports\\lib\\ X11 Xext
-#define SharedXieReqs ..\\..\\exports\\lib\\ X11 Xext
-#define SharedXtstReqs ..\\..\\exports\\lib\\ X11 Xext
-#define SharedOldXReqs ..\\..\\exports\\lib\\ X11 Xext
-#define SharedPexReqs ..\\..\\exports\\lib\\ X11 m
-#define SharedXpReqs ..\\..\\exports\\lib\\ X11 Xext
-#endif
-
-/*
- * By setting this in your Imakefile, you can force using static libraries
- * to be linked with you app, rather than DLLs
- */
-#ifndef LinkStatically
-#define LinkStatically NO
-#endif
-
-#if LinkStatically
-#define SDlibX11 -lX11_s
-#define SDlibXExt -lXExt_s
-#define SDlibXmu -lXmu_s
-#define SDlibXt -lXt_s
-#define SDlibXaw -lXaw_s
-#define SDlibXi -lXi_s
-#define SDlibXIE -lXIE_s
-#define SDlibXtst -lXtst_s
-#define SDlibPEX5 -lPEX5_s
-#define SDlibXp -lXp_s
-#else
-#define SDlibX11 -lX11
-#define SDlibXExt -lXExt
-#define SDlibXmu -lXmu
-#define SDlibXt -lXt
-#define SDlibXaw -lXaw
-#define SDlibXi -lXi
-#define SDlibXIE -lXIE
-#define SDlibXtst -lXtst
-#define SDlibPEX5 -lPEX5
-#define SDlibXp -lXp
-#endif
-
-/*
- * and now a little bit of magic for using imake without source tree; if we
- * are using shared libraries, we really do not need to depend on anything
- */
-#if SharedLibXext
- DEPEXTENSIONLIB = 
-    EXTENSIONLIB = _Use(SDlibXExt,-L$(EXTENSIONSRC)/lib SDlibXExt)
-#endif
-#if SharedLibX11
-         DEPXLIB = 
-            XLIB = $(EXTENSIONLIB) _Use(SDlibX11,-L$(XLIBSRC) SDlibX11)
-#endif
-#if SharedLibXmu
-       DEPXMULIB = 
-          XMULIB = _Use(SDlibXmu,-L$(XMUSRC) SDlibXmu) $(XLIB)
-#ifndef XawClientLibs
-#define XawClientLibs $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-#endif
-#endif
-#if SharedOldX
-      DEPOLDXLIB = 
-         OLDXLIB = _Use(-loldX,-L$(OLDXLIBSRC) -loldX)
-#endif
-#if SharedLibXt
-     DEPXTOOLLIB = 
-        XTOOLLIB = _Use(SDlibXt,-L$(TOOLKITSRC) SDlibXt)
-#endif
-#if SharedLibXaw
-       DEPXAWLIB = 
-          XAWLIB = _Use(SDlibXaw,-L$(AWIDGETSRC) SDlibXaw)
-#endif
-#if SharedLibXi
-        DEPXILIB = 
-           XILIB = _Use(SDlibXi,-L$(XILIBSRC) SDlibXi)
-#endif
-#if SharedLibXTest
-    DEPXTESTLIB = 
-       XTESTLIB = _Use(SDlibXtst,-L$(EXTENSIONSRC)/lib/xtest SDlibXtst)
-#endif
-#if SharedLibPex
-      DEPPEXLIB = 
-         PEXLIB = _Use(SDlibPEX5,-L$(PEXLIBSRC) SDlibPEX5)
-#endif
-#if SharedLibXp
- DEPEXTENSIONLIB = 
-    EXTENSIONLIB = _Use(SDlibXp,-L$(EXTENSIONSRC)/lib SDlibXp)
-#endif
--- a/Xvnc/config/cf/osf1.cf
+++ /dev/null
@@ -1,206 +0,0 @@
-XCOMM platform:  $TOG: osf1.cf /main/74 1997/05/27 15:51:24 kaleb $
-/* only tested with Digital OSF/1 */
-
-#ifndef OSName
-# define OSName		DefaultOSName
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion	DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion DefaultOSMinorVersion
-#endif
-XCOMM operating system: OSName (OSMajorVersion.OSMinorVersion)
-
-#define StandardCppDefines	-D__osf__ StandardDefines
-#define BuildLibPathVar		_RLD_ROOT=/dev/null LD_LIBRARY_PATH
-#define HasPutenv		YES
-#define Malloc0ReturnsNull	YES
-#define HasNdbm			YES
-#define HasShm			YES
-#define AvoidNullMakeCommand	YES
-#define NullMakeCommand		@ echo
-#define HasPosixThreads		YES
-#define SystemMTDefines		-D_REENTRANT
-#define CplusplusSystemMTDefines -D_REENTRANT
-#define HasPoll			YES
-#define HasVFork                NO
-#define HasPlugin		YES
-#define InstallCmd		installbsd
-#define RanlibCmd		ranlib -t
-#if OSMajorVersion > 1 || OSMinorVersion > 0
-#define ModernOSF1		YES
-#else
-#define ModernOSF1		NO
-#define ShLibDir		/usr/shlib
-#define SharedLibPex		NO  /* losing, no shared -lm */
-#endif
-#define ThreadedX		ModernOSF1
-
-#if ThreadedX
-#define MTSafeAPIDefines	-DXUSE_MTSAFE_API -DXUSE_NETDB_R_API
-#if OSMajorVersion < 4
-#define ThreadsLibraries		-lpthreads -lmach -lc_r
-#define ThreadsCplusplusLibraries	-lpthreads -lmach
-#define ThreadPreStdAPIDefines		-DXPRE_STANDARD_API
-#else
-#define ThreadsLibraries		-lpthread -lmach -lexc -lc
-#define ThreadsCplusplusLibraries	-lpthread -lmach -lexc
-#define LibraryMTDefines		-DUSE_TIS_SUPPORT
-#endif
-#endif
-
-#if ModernOSF1
-#ifndef OptimizedCDebugFlags
-#define OptimizedCDebugFlags	-O2 -Olimit 2000
-#endif
-#ifndef ExtraLoadFlags
-/*
- * In OSF/1 3.0 Digital has shared libXdmcp and libXau. What's more,
- * the link editor has different search semantics, i.e. it will search
- * for shared libraries first, then, if it can't find a shared lib, it
- * will use a static lib. By using -oldstyle_liblookup the linker will
- * follow "normal" semantics for linking libraries and will get the
- * static libraries we really want. By 3.2 they no longer have libXdmcp 
- * and libXau as shared libraries and we can omit -oldstyle_liblookup. 
- * (What did they have in 3.1?)
- */
-#if OSMajorVersion == 3 && OSMinorVersion == 0
-#define ExtraLoadFlags		-Wl,-rpath,$(USRLIBDIRPATH),-oldstyle_liblookup
-#else
-#define ExtraLoadFlags 		-Wl,-rpath,$(USRLIBDIRPATH)
-#endif
-#endif
-#if OSMajorVersion > 3
-#define TermcapLibrary		-lcurses
-#endif
-#if OSMajorVersion >= 3
-#define HasMkstemp		YES
-#endif
-#endif
-
-/*
- * C++ compiler setup.  This file knows what options to use with the
- * DEC C++ compiler, and may learn about other compilers in the future.
- * 
- * For DEC C++, define HasDECCplusplus to YES in site.def.  
- *
- * For g++ 2.6.x, define HasGcc2ForCplusplus to YES in site.def.
- *
- * For other compilers, define HasCplusplus to YES in site.def, and 
- *    check to see if you need to provide values for CplusplusOptions
- *    and/or DefaultCplusplusOptions.
- *
- * In any case, you may also need to set CplusplusDependIncludes.
- *
- * Note: For DEC C++, the -call_shared option really only needs to 
- * appear when linking C++ executables, not when actually compiling
- * the C++ sources.  But since there's no imake variable that lets
- * us insert flags only into the C++ link stage, we use -call_shared
- * on all compilations when building executables.  This could be 
- * considered a deficiency in the current imake configuration
- */
-
-#if HasDECCplusplus
-#ifndef HasCplusplus 
-#define HasCplusplus YES
-#endif
-#ifndef CplusplusCmd
-#define CplusplusCmd /usr/bin/cxx
-#endif
-#ifndef CplusplusFilt
-# define CplusplusFilt /usr/bin/demangle
-#endif
-#ifndef CplusplusDependIncludes 
-#define CplusplusDependIncludes -D__DECCXX -I/usr/include/cxx
-#endif
-#ifndef CplusplusLibDir
-#define CplusplusLibDir /usr/lib/cmplrs/cxx
-#endif
-#ifndef CplusplusLibC
-#define CplusplusLibC -L/usr/lib/cmplrs/cxx -lcxx
-#endif
-#ifndef CplusplusOptions
-#define CplusplusOptions -call_shared
-#endif
-#endif /* HasDECCplusplus */
-
-
-#if HasGcc2ForCplusplus
-#ifndef CplusplusLibC
-#define CplusplusLibC `$(CXX) -print-libgcc-file-name`
-#endif 
-#endif /* HasGcc2ForCplusplus */
-
-#ifdef CplusplusLibDir
-# define SystemBuildLibPath	\
-/usr/shlib:/usr/ccs/lib:CplusplusLibDir:/usr/lib/cmplrs/cc:/usr/lib:/usr/local/lib:/var/shlib
-#else
-# define SystemBuildLibPath	\
-/usr/shlib:/usr/ccs/lib:/usr/lib/cmplrs/cc:/usr/lib:/usr/local/lib:/var/shlib
-#endif
-
-#include <osfLib.rules>
-#define NoRConst		YES
-
-#ifdef AlphaArchitecture
-#ifndef HasWChar32
-#define HasWChar32		YES
-#endif
-#define ServerExtraDefines	-D_XSERVER64
-#define ServerOSDefines		-DDDXTIME
-#ifndef DefaultCCOptions
-#define DefaultCCOptions	-std1
-#endif
-#ifndef XawI18nDefines
-#define XawI18nDefines		-DHAS_WCHAR_H
-#endif
-#ifndef BuildServer
-#define BuildServer		NO
-#endif
-
-/* For DtHelp's TIFF processing routines. */
-#define LSBBitOrder		YES
-
-#define MotifDefines		-DNO_REGCOMP -DNO_REGEX -DSTRINGS_ALIGNED
-#define DtSvcDefines		-DXK_MISCELLANY -DMULTIBYTE -DMESSAGE_CAT
-#define DtSearchDefines		-DI18N_MSG DtSvcDefines
-#define DtWidgetDefines		DtSearchDefines
-#define DtPrintDefines		DtSearchDefines
-#define DtMailDefines		\
-  -DNEED_MMAP_WRAPPER -DSENDMAIL_LOCKS -DMAIL_SPOOL_PATH=\"/var/spool/mail/%s\"
-
-#define ArchitectureDefines	-DALPHA_ARCHITECTURE
-#endif
-
-#ifdef MipsArchitecture
-#define DefaultCCOptions	-Xa
-#define XdecServer YES
-#define ServerOSDefines -DDDXTIME
-#define PexCCOptions -Xa -Wf,-XNp15000,-XNd15000
-#define NormalLibObjCompile(options) 	ClearmakeOSName			  \
-	$(RM) $@ $*.os \						@@\
-	&& $(CC) -c options $(CFLAGS) $*.c \				@@\
-	&& $(LD) $(LDSTRIPFLAGS) -r $@ -o $*.os \			@@\
-	&& $(MV) $*.os $@
-#endif
-
-#if !HasClearmake
-#ifndef HasMakefileSafeInclude
-#define HasMakefileSafeInclude YES
-#endif
-#ifndef IncludeMakefile
-#define IncludeMakefile(file) @@-include file
-#endif
-#endif
-
-#ifndef ManKeywordsTarget
-#define ManKeywordsTarget(manpath)					@@\
-man_keywords::								@@\
-	catman -M $(DESTDIR)manpath -w
-#endif
-
-#define CdeTicDefines	-DHAS_KNL -DHAS_KTAB
-#define CdeProjectDefines \
-	-DDEC -DMULTIBYTE -DNLS16 \
-	-DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion
--- a/Xvnc/config/cf/osfLib.rules
+++ /dev/null
@@ -1,118 +0,0 @@
-XCOMM $XConsortium: osfLib.rules /main/16 1996/09/28 16:11:55 rws $
-
-/*
- * OSF/1 shared library rules
- */
-
-#ifndef HasSharedLibraries
-#define HasSharedLibraries YES
-#endif
-#ifndef SeparateSharedCompile
-#define SeparateSharedCompile NO
-#endif
-#ifndef SharedDataSeparation
-#define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef /**/
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <osfLib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags -shared -no_archive
-#endif
-
-#ifndef PositionIndependentCFlags
-#define PositionIndependentCFlags /**/
-#endif
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-#define	InstallSharedLibrary(libname,rev,dest)				@@\
-install:: Concat(lib,libname.so.rev) 					@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
-	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
-	cd $(DESTDIR)dest; $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-#define	InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-#ifndef PackageName(libname)
-#if ModernOSF1
-#define PackageName(libname) /**/
-#define Objects(objlist) -all objlist -none 
-#else
-#define PackageName(libname) -package libname
-#define Objects(objlist) objlist
-#endif
-#endif
-#if ThreadedX && ModernOSF1 && OSMajorVersion < 4
-#define BaseShLibReqs -lc_r -lc
-#else
-#define BaseShLibReqs -lc
-#endif
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedLibraryTarget
-#if SeparateSharedCompile
-#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
-AllTarget(Concat(lib,libname.so.rev))					@@\
-									@@\
-Concat(lib,libname.so.rev):  solist $(EXTRALIBRARYDEPS)			@@\
-	$(RM) $@~							@@\
-	(cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) PackageName($@) \	@@\
-		-soname $@ Objects(solist) \				@@\
-		$(REQUIREDLIBS) BaseShLibReqs) 				@@\
-	$(RM) $@ 							@@\
-	$(MV) $@~ $@							@@\
-	$(RM) Concat(lib,libname.so)					@@\
-	$(LN) $@ Concat(lib,libname.so)					@@\
-	LinkBuildLibrary($@)						@@\
-	LinkBuildLibrary(Concat(lib,libname.so))			@@\
-									@@\
-clean::									@@\
-	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-#else
-#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
-AllTarget(Concat(lib,libname.so.rev))					@@\
-									@@\
-Concat(lib,libname.so.rev):  solist $(EXTRALIBRARYDEPS)			@@\
-	$(RM) $@~							@@\
-	$(LD) -o $@~ $(SHLIBLDFLAGS) PackageName($@) \			@@\
-		-soname $@ Objects(solist) \				@@\
-		$(REQUIREDLIBS) BaseShLibReqs 				@@\
-	$(RM) $@ 							@@\
-	$(MV) $@~ $@							@@\
-	$(RM) Concat(lib,libname.so)					@@\
-	$(LN) $@ Concat(lib,libname.so)					@@\
-	LinkBuildLibrary($@)						@@\
-	LinkBuildLibrary(Concat(lib,libname.so))			@@\
-									@@\
-clean::									@@\
-	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-#endif /* SeparateSharedCompile */
-#endif /* SharedLibraryTarget */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryTarget */
--- a/Xvnc/config/cf/osfLib.tmpl
+++ /dev/null
@@ -1,52 +0,0 @@
-XCOMM $XConsortium: osfLib.tmpl /main/22 1996/09/28 16:12:00 rws $
-
-/*
- * OSF/1 shared library template
- */
-
-#if ThreadedX && ModernOSF1
-#if OSMajorVersion < 4
-#define SharedX11Reqs -lpthreads -lmach
-#endif
-#endif
-#define SharedOldXReqs $(LDPRELIBS) $(XLIBONLY)
-
-#if ThreadedX && ModernOSF1 && OSMajorVersion < 4
-#define SharedThreadReqs -lpthreads -lmach
-#else
-#define SharedThreadReqs /**/
-#endif
-#define SharedXtReqs $(LDPRELIBS) $(XLIBONLY) $(SMLIB) $(ICELIB) SharedThreadReqs
-#if ModernOSF1
-#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XLIB)
-#else
-#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XLIB) -init _XawFixupVendorShell
-#endif
-#define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB)
-#define SharedXextReqs $(LDPRELIBS) $(XLIBONLY)
-#define SharedXiReqs $(LDPRELIBS) $(XLIB)
-#define SharedPexReqs $(LDPRELIBS) $(XLIBONLY) MathLibrary
-#define SharedXtstReqs $(LDPRELIBS) $(XLIB)
-#define SharedXieReqs $(LDPRELIBS) $(XLIBONLY)
-#define SharedSMReqs $(LDPRELIBS) $(ICELIB)
-#define SharedXpReqs $(LDPRELIBS) $(XLIB)
-
-#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) SharedThreadReqs $(LDPOSTLIBS)
-#define SharedXmReqs $(LDPRELIBS) SharedXReqs
-#define SharedMrmReqs $(LDPRELIBS) $(XMLIB) SharedXReqs
-#define SharedUilReqs $(LDPRELIBS) $(MRESOURCELIB) $(XMLIB) SharedXReqs
-
-/* #define SharedPamReqs */
-#define SharedTtReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB) SharedThreadReqs $(CXXLIB)
-#define SharedDtSvcReqs $(LDPRELIBS) $(TTLIB) $(XMLIB) SharedXReqs -lm $(CXXLIB)
-#define SharedDtMmdbReqs $(LDPRELIBS) $(DTSVCLIB) $(TTLIB) $(XMLIB) SharedXReqs -lm $(CXXLIB)
-#define SharedDtSearchReqs $(LDPRELIBS) -lm
-#define SharedDtWidgetReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXReqs -lm $(CXXLIB)
-#define SharedDtHelpReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXReqs -lm -liconv
-#define SharedDtPrintReqs $(LDPRELIBS) $(DTSVCLIB) $(DTHELPLIB) $(XMLIB) SharedXReqs -lm $(CXXLIB)
-#define SharedDtTermReqs $(LDPRELIBS) $(DTHELPLIB) $(DTSVCLIB) $(XMLIB) SharedXReqs -lm
-#define SharedDtMrmReqs $(LDPRELIBS) $(DTTERMLIB) $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(MRESOURCELIB) $(XMLIB) SharedXReqs -lm
-#define SharedDtMailReqs $(LDPRELIBS) $(DTHELPLIB) $(DTSVCLIB) $(XMLIB) SharedXReqs -liconv -lm $(CXXLIB)
-#define SharedCsaReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXReqs -lm
-
-ICONVSYSLIB = -liconv
--- a/Xvnc/config/cf/pegasus.cf
+++ /dev/null
@@ -1,34 +0,0 @@
-XCOMM platform:  $XConsortium: pegasus.cf /main/38 1996/09/28 16:12:05 rws $
-
-#ifndef OSName
-#define OSName             UTek 4.0
-#endif
-XCOMM operating system:  OSName
-#ifndef OSMajorVersion
-#define OSMajorVersion     4
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion     0
-#endif
-
-#define HasNdbm		   YES
-#define HasVoidSignalReturn NO
-
-#define BootstrapCFlags    -DM4310 -DUTEK
-#define StandardDefines    -DM4310 -DUTEK -Dpegasus 
-
-#if HasGcc
-/* put back all of the -Ds which -ansi removes */
-#define CcCmd gcc -ansi -fstrength-reduce -fpcc-struct-return -Dmc68000 -Dtektronix -Dutek -Dunix -Dm68k
-#endif
-
-#define BuildServer NO
-/* #define XtekServer YES */
-
-#define ServerExtraDefines   -DM4310 -DM4317
-#define ServerOSDefines -DDDXTIME
-#define FontFilters BDFTOSNFFILT SHELLPATH
-#define PrimaryScreenResolution 95
-
-.DIRECTORIES:		/* Turn off directory search for RCS */
-
--- a/Xvnc/config/cf/sco.cf
+++ /dev/null
@@ -1,206 +0,0 @@
-XCOMM platform:  $XConsortium: sco.cf /main/5 1996/12/04 10:12:36 swick $
-XCOMM platform:  $XFree86: xc/config/cf/sco.cf,v 3.12.2.1 1997/05/24 13:38:09 dawes Exp $
-
-/*
- * This is sco.cf, for SCO Open Server 5.0.2 and SCO UNIX.
- * Please mail hug@netcom.com with any questions.
- *
- * This section is common to all versions of SCO
- */
-
-#ifndef ScoOsMouse
-# define ScoOsMouse             YES
-#endif
-
-#ifndef OSVendor
-#define OSVendor                Santa Cruz Operation
-#endif
-
-#define PosixLibraries          /**/
-#define Malloc0ReturnsNull      YES
-#define RemoveDSDENroffMacros   NO
-#define ExtraLibraries          -lsocket -lmalloc -lpt
-
-#define ManSourcePath           $(MANPATH)/cat.
-
-#ifndef CompressManPages
-#define CompressManPages        YES
-#endif
-
-#if ScoOsMouse
-# define ServerExtraDefines     -DUSE_OSMOUSE XFree86ServerDefines
-# define ServerExtraSysLibs     $(CBRT) -lm -levent
-#else
-# define ServerExtraSysLibs     $(CBRT) -lm
-#endif
-
-/*
- * XBSDLIB is included with the Socket libraries, because SCO needs Xbsd
- * as its bcopy routine doesn't handle overlapping regions. If HasSockets
- * If HasSockets is false the XINETLIB does it for us anyway.
- */
-#define SocketLibraries	        $(XBSDLIB) -lsocket
-
-#define ConnectionFlags         -DLOCALCONN -DTCPCONN -DFD_SETSIZE=256
-
-#if defined(i386Sco324Architecture) || defined(i386Sco325Architecture)
-# ifndef HasSymLinks
-#  define HasSymLinks           YES
-# endif
-# define CompressManCmd         $(COMPRESS) -v
-#else /* SCO 3.2.2 */
-# ifndef HasSymLinks
-#  define HasSymLinks           NO
-# endif
-# define CommpressManCmd        pack
-#endif
-
-/*
- * Due to the extra '.' chars in the SCO man pages file name we have
- * to provide our own version of this macro.
- */
-
-#define InstallManPageAliases(file,destdir,aliases)                     @@\
-install.man::                                                           @@\
-        @(SUFFIX=`echo $(DESTDIR)destdir/file.* | cut -f3,4 -d.`; \     @@\
-        for i in aliases; do (set -x; \                                 @@\
-        $(RM) $(DESTDIR)destdir/$$i.*; \                                @@\
-        (cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \                  @@\
-        $$i.$${SUFFIX})); \                                             @@\
-        done)
-
-/*
- * This is the SCO Open Server 5.0.2 section. BOOTSTRAPCFLAGS is computed
- * automatically. You can simply run make World.
- */
-#ifdef i386Sco325Architecture
-#ifndef OSName
-#define OSName                  OpenServer Release 5
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion          5
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion          0
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion          2
-#endif
-
-#define StandardDefines         -Dsco -DSCO -DSYSV -Di386 -DSCO325 -DSCO324
-#ifdef HasGcc2
-# define DefaultCCOptions       -melf
-# define CcCmd                  gcc
-# define ExtraLoadOptions       -melf
-# define DefaultCDebugFlags     DefaultGcc2i386Opt
-# define OptimizedCDebugFlags   DefaultGcc2i386Opt
-#else
-# define DefaultCCOptions       -dy 
-# define CcCmd                  cc
-# define ExtraLoadOptions       -b elf
-# define DefaultCDebugFlags     -O2
-# define OptimizedCDebugFlags   -O2
-#endif
-
-#define XawI18nDefines          -DHAS_WCHAR_H -DHAS_ISW_FUNCS
-#define NeedWidePrototypes      NO
-#define ServerOSDefines         -DDDXTIME
-#define ToolkitStringsABIOptions -intelabi
-#define ThreadedX               NO
-#define HasThreadSafeAPI        NO
-#define HasNdbm                 YES
-#define HasVFork                YES
-#define HasPutenv               YES
-#define ExecableScripts         YES
-#define HasShadowPasswd         YES
-
-#ifndef HasLibCrypt
-# define HasLibCrypt            YES
-# define SpecialLibCrypt        -lcrypt
-#endif
-
-#ifndef ForceNormalLib
-# define ForceNormalLib         YES 
-#endif
-
-#define SharedLibXmu            NO
-#define SystemV                 YES
-#define LdCombineFlags          -r 
-
-#define HasLdRunPath            YES
-#define HasPoll                 YES
-#define PatheticCpp             YES
-
-#define ArCmdBase               ar
-#define AsCmd                   as
-#define CppCmd                  /lib/cpp
-#define LdCmd                   ld
-#define LexCmd                  lex
-#define MakeCmd                 make
-#define YaccCmd                 yacc
-
-#include <scoLib.rules>  /* minor changes to sv4Lib.rules */
-#include <sv4Lib.rules>
-
-#define DtSvcDefines		-DXK_MISCELLANY -DMULTIBYTE
-#define DtSearchDefines		-DI18N_MSG DtSvcDefines
-#define DtWidgetDefines		DtSearchDefines
-#define DtPrintDefines		DtSearchDefines
-
-#else /* !i386Sco325Architecture */
-/*
- * This is the SCO 3.2v4.x and SCO 3.2v2.x section
- */
-
-/* You must manually compute BootstrapCFlags for initial build */
-
-#define	OSMinorVersion	2
-
-#ifdef i386Sco324Architecture
-# define BootstrapCFlags        -DSYSV -Di386 -DSCO -DSCO324
-# define OSTeenyVersion         4
-# define OSName                 (SCO Version 3.2.4)
-# define OSDefines              -DSCO -DSCO324 -Dsco -Dsco324 -DBROKEN_FTOL \
-                                -D_NO_PROTOTYPE -D_SVID
-#else
-# define BootstrapCFlags        -DSYSV -Di386 -DSCO
-# define OSTeenyVersion         2
-# define OSName                 (SCO Version 3.2.2)
-# define OSDefines              -DSCO -Dsco -DBROKEN_FTOL -DNO_PROTOTYPE \
-                                -D_SVID
-#endif
-
-#ifdef i386Sco324Architecture
-/*
- * if your gcc is compiled with STDC_VALUE=0 then change the 1 to 0
- */
-# define GCC_STDC_VALUE         1
-# if !GCC_STDC_VALUE
-#  define OSDefines             -DSCO -DSCO324 -Dsco -Dsco324 -DBROKEN_FTOL \
-                                -D_NO_PROTOTYPE -D_SVID -D__STDC__=1
-#  undef StandardCppDefines
-#  define StandardCppDefines    -DUNIXCPP=1 StandardDefines
-# endif
-#endif
-
-#define XawI18nDefines		    -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-
-/*
- * The user should override this in their site.def if they have the real
- * crypt library. We default to the international crypt library here as
- * anyone may obtain that.
- */
-
-#ifndef HasLibCrypt
-# define HasLibCrypt            YES
-# define SpecialLibCrypt        -lcrypt_i
-#endif
-
-#include <svr3.cf>
-
-#endif /* SCO 3.2.4 and SCO 3.2.2 section */
-
-#ifdef i386Architecture
-#include <xfree86.cf>
-#endif
-
--- a/Xvnc/config/cf/sco5.cf
+++ /dev/null
@@ -1,139 +0,0 @@
-XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.1.2.4 1997/07/19 04:59:08 dawes Exp $
-
-/*
- * This is for SCO Open Server 5.0.2 or later.
- */
-
-#ifndef ScoOsMouse
-# define ScoOsMouse             YES
-#endif
-
-#ifndef OSName
-#define OSName                  UNIX System V/386 Open Server 5.0.4
-#endif
-#ifndef OSVendor
-#define OSVendor                SCO
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion          5
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion          0
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion          4
-#endif
-
-/*
- * Note: We define FD_SETSIZE here (as opposed to in ConnectionFlags) to
- * guarantee that the same FD_SETSIZE is used. Havoc abounds if we do not
- * do this, as some files which include sys/socket.h and sys/types.h will
- * have different values for FD_SETSIZE.
- */
-
-#define StandardDefines         -Dsco -DSCO -DSYSV -Di386 -DSCO325 -DFD_SETSIZE=256 -D_NO_STATIC
-#ifdef HasGcc2
-# define DefaultCCOptions       -melf
-# define CcCmd                  gcc
-# define ExtraLoadOptions       -melf
-# define DefaultCDebugFlags     -O
-# define OptimizedCDebugFlags   -O
-#else
-# define DefaultCCOptions       -dy 
-# define CcCmd                  cc
-# define ExtraLoadOptions       -b elf
-# define DefaultCDebugFlags     -O
-# define OptimizedCDebugFlags   -O
-#endif
-
-#ifndef PexDynamicModule
-#define PexDynamicModule        YES
-#endif
-#ifndef XieDynamicModule
-#define XieDynamicModule        YES
-#endif
-
-#ifndef HasSymLinks
-# define HasSymLinks            YES
-#endif
-
-#ifdef BuildDynamicLoading
-#define SCODynamicFlags         -Wl,-Bexport
-#endif
-
-#define XawI18nDefines          -DHAS_WCHAR_H -DHAS_ISW_FUNCS
-#if ScoOsMouse
-# define ServerExtraSysLibs     $(CBRT) -lm -levent SCODynamicFlags
-# define ServerExtraDefines     ServerCCOptions -DUSE_OSMOUSE XFree86ServerDefines
-#else
-# define ServerExtraSysLibs     $(CBRT) -lm SCODynamicFlags
-# define ServerExtraDefines     ServerCCOptions XFree86ServerDefines
-#endif
-#define ExtraLibraries          -lsocket
-#define NeedWidePrototypes      NO
-#define ServerOSDefines         -DDDXTIME
-#define ToolkitStringsABIOptions -intelabi
-#define ThreadedX               NO
-#define HasThreadSafeAPI        NO
-#define HasNdbm                 YES
-#define HasVFork                YES
-#define HasPutenv               YES
-#define ExecableScripts         YES
-#define HasShadowPasswd         YES
-#define ManSourcePath           $(MANPATH)/cat.
-#define Malloc0ReturnsNull      YES
-#define RemoveDSDENroffMacros   NO
-#define CompressManPages        YES
-
-#ifndef HasLibCrypt
-# define HasLibCrypt            YES
-# define SpecialLibCrypt        -lcrypt
-#endif
-#define PosixLibraries          /**/
-
-#ifndef ForceNormalLib
-# define ForceNormalLib         YES 
-#endif
-
-#define SharedLibXmu            NO
-#define SystemV                 YES
-#define LdCombineFlags          -r 
-
-#define HasLdRunPath            YES
-#define HasPoll                 NO
-#define PatheticCpp             YES
-
-#define ArCmdBase               ar
-#define AsCmd                   as
-#define CppCmd                  /lib/cpp
-#define LdCmd                   ld
-#define LexCmd                  lex
-#define MakeCmd	                make
-#define YaccCmd                 yacc
-
-#define DefaultUserPath         /bin:/usr/bin:$(BINDIR):/usr/bin/X11:/usr/local/bin:/etc
-#define DefaultSystemPath       /etc:/bin:/usr/bin:$(BINDIR):/usr/bin/X11
-
-/*
- * If you are compiling on an SCO Open Server release prior to 5.0.2,
- * you may need to remove -DLOCALCONN. There have been reports of it
- * working on some 5.0.0 machines but not others.
- */
-#define ConnectionFlags         -DLOCALCONN -DTCPCONN -DUNIXCONN
-
-#define InstallManPageAliases(file,destdir,aliases)                     @@\
-install.man::                                                           @@\
-        @(SUFFIX=`echo $(DESTDIR)destdir/file.* | cut -f3,4 -d.`; \     @@\
-        for i in aliases; do (set -x; \                                 @@\
-        $(RM) $(DESTDIR)destdir/$$i.*; \                                @@\
-        (cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \                  @@\
-        $$i.$${SUFFIX})); \                                             @@\
-        done)
-
-#include <scoLib.rules>  /* minor changes to sv4Lib.rules */
-#include <sv4Lib.rules>
-
-#ifdef i386Architecture
-#include <xfree86.cf>
-#endif
-
--- a/Xvnc/config/cf/scoLib.rules
+++ /dev/null
@@ -1,43 +0,0 @@
-XCOMM $XConsortium: scoLib.rules /main/2 1996/09/28 16:12:20 rws $
-XCOMM $XFree86: xc/config/cf/scoLib.rules,v 1.1.1.2.2.2 1997/07/19 12:59:10 dawes Exp $
-
-/*
- * SharedLibraryTarget3 - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.  
- *
- * Work around SCO sh enviroment size problem.
- */
-#ifndef SharedLibraryTarget3
-#define SharedLibraryTarget3(libname,rev,solist1,solist2,solist3,down,up)	@@\
-AllTarget(Concat(lib,libname.so.rev))					@@\
-									@@\
-Concat(lib,libname.so.rev): solist1 solist2 solist3 $(EXTRALIBRARYDEPS)	@@\
-	$(RM) $@~							@@\
-	echo -n $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $(DESTDIR)$(SHLIBDIR)/$@ solist1 " " > Concat(down/lib,cmd) 	@@\
-	echo -n solist2 " " >> Concat(down/lib,cmd)			@@\
-	echo -n solist3  >> Concat(down/lib,cmd)			@@\
-	(cd down; $(SHELL) Concat(./lib,cmd))				@@\
-	$(RM) $@ Concat(lib,tmp1) Concat(lib,tmp2)			@@\
-	$(MV) $@~ $@							@@\
-	$(RM) Concat(lib,libname.so)					@@\
-	$(LN) $@ Concat(lib,libname.so)					@@\
-	LinkBuildLibrary($@)						@@\
-	LinkBuildLibrary(Concat(lib,libname.so))			@@\
-									@@\
-clean::									@@\
-	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-
-#endif /* SharedLibraryTarget */
-
-/*
- * Redefine this so we can drop -b elf and build COFF objects for the
- * archived library.  This assumes -b elf is hanging out in CCOPTIONS
- */
-#ifndef UnsharedLibObjCompile
-#define UnsharedLibObjCompile(options) RemoveFile($@)                  @@\
-        ClearmakeOSName                                                  \
-        $(CC) -c $(CDEBUGFLAGS) $(THREADS_CFLAGS) $(ALLDEFINES) options $*.c @@\
-        $(MV) $@ unshared/$@
-#endif
-
--- a/Xvnc/config/cf/sequent.cf
+++ /dev/null
@@ -1,84 +0,0 @@
-XCOMM platform:  $XConsortium: sequent.cf /main/4 1996/12/04 10:10:49 swick $
-/*
- * SET VERSION NUMBERS BEFORE MAKING MAKEFILES; also, you'll need to install
- * util/scripts/bsdinstall.sh before doing a "make install"
- */
-
-#if defined(DynixPtxArchitecture) || defined(_SEQUENT_)
-
-# ifndef OSName
-#  define OSName		Dynix/ptx
-# endif
-# ifndef OSMajorVersion
-#  define OSMajorVersion	2
-# endif
-# ifndef OSMinorVersion
-#  define OSMinorVersion	0
-# endif
-
-# define SystemV		YES
-# define SymbolTableFlags
-# define DefaultCCOptions	SymbolTableFlags
-# define SharedLibraryCCOptions	DefaultCCOptions
-# define StandardDefines		-DSYSV
-# define MotifDefines		-DSTRINGS_ALIGNED -DNO_REGCOMP
-# define ExtraLibraries		$(XBSDLIB) -lsocket -linet -lnsl -lseq
-# define XmExtraLibraries	/* -lgen (not official i386 ABI?) */
-
-# define NeedBerklib		YES
-# define HasShadowPasswd	YES
-# define InstallXdmConfig	YES
-# define HasSockets		YES
-
-/*
- * Plan to remove Prototypes defines and use -Xc with
- * Dynix/ptx:
- *   OSMajorVersion=4
- *   OSMinorVersion=0
- * Using -Xc with Version 4.0 will elliminate most warnings
- */
-# define NeedFunctionPrototypes	YES
-# define NeedNestedPrototypes	YES
-# define NeedConstPrototypes	YES
-# define NeedVarargsPrototypes	YES
-
-
-/*
- * unfortunately pbmplus uses this...
- */
-RANLIB = :
-
-#endif /* defined(DynixPtxArchitecture) || defined(_SEQUENT_) */
-
-#if defined(Dynix3Architecture) || defined(sequent)
-
-# ifndef OSName
-#  define OSName		Dynix 3
-# endif
-# ifndef OSMajorVersion
-#  define OSMajorVersion	3
-# endif
-# ifndef OSMinorVersion
-#  define OSMinorVersion	2
-# endif
-
-# define SymbolTableFlags	-W0,-Nn7500 -W0,-Nd10000
-# define DefaultCCOptions	SymbolTableFlags
-# define StandardDefines	-DX_NOT_STDC_ENV -DX_NOT_POSIX
-# define ExtraLibraries		-lseq
-
-# define HasVoidSignalReturn	NO
-# define HasBsearch		NO
-
-# define SetTtyGroup		YES
-
-#endif /* defined(Dynix3Architecture) || defined(sequent) */
-
-#define BuildServer		NO
-#define BuildXInputLib		NO
-#define BuildPexClients		NO
-
-#define LnCmd			ln -s
-
-/* libgen is not part of the i386 ABI.  (Are both architectures i386??) */
-#define UseLocalRegex		YES
--- a/Xvnc/config/cf/sgi.cf
+++ /dev/null
@@ -1,233 +0,0 @@
-XCOMM platform:  $TOG: sgi.cf /main/45 1997/06/18 18:01:03 kaleb $
-
-#ifndef OSName
-# define OSName		DefaultOSName
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion	DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion	DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-# define OSTeenyVersion	DefaultOSTeenyVersion 
-#endif
-XCOMM operating system: OSName (OSMajorVersion.OSMinorVersion.OSTeenyVersion)
-
-#if OSMajorVersion < 4
-/* We do not guarantee this will work */
-#define BootstrapCFlags		-DX_WCHAR -DX_LOCALE -DX_USEBFUNCS -DSYSV
-#define StandardDefines		-DX_WCHAR -DX_LOCALE -DX_USEBFUNCS -DSYSV
-#define SetTtyGroup		NO
-#else
-#define HasPlugin		YES
-#define SetTtyGroup		YES
-#define ExtraFilesToClean	so_locations
-#endif
-
-#if OSMajorVersion < 5
-#define SystemV			YES
-#define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-#else
-#define BootstrapCFlags		-DSVR4
-#define StandardDefines		-DSVR4
-#define SystemV4		YES
-#define HasWChar32              YES
-#define HasVFork		NO
-#if OSMajorVersion < 6
-#define XawI18nDefines		-DHAS_WCTYPE_H -DHAS_ISW_FUNCS
-#else
-#define XawI18nDefines		-DHAS_WCHAR_H -DHAS_ISW_FUNCS
-#endif
-#define AllocateLocalDefines	-DINCLUDE_ALLOCA_H
-#ifndef ExtraLoadFlags
-#define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH)
-#endif
-#endif
-
-/*
- * To build 64-bit binaries define Mips64Architecture in your site.def or
- * host.def file. This is usually on done at the X Consortium to test
- * big endian 64-bit cleanliness.
- * To build 32-bit binaries using the old 32-bit mode, define
- * NoMipsN32Archtecture in your site.def or host.def file.
- * Otherwise the default is to use the "new 32" mode as requested by SGI.
- */
-#ifndef MipsN32Architecture
-#if !defined(Mips64Architecture) && !defined(NoMipsN32Architecture)
-#define MipsN32Architecture YES
-#endif
-#endif
-
-#ifdef Mips64Architecture
-# define BuildLibPathVar	_RLD_ROOT=/dev/null LD_LIBRARY64_PATH
-# define SystemBuildLibPath	/usr/lib64:/lib64
-# define LdCmd			ld -64
-#elif defined(MipsN32Architecture)
-# define BuildLibPathVar	_RLD_ROOT=/dev/null LD_LIBRARYN32_PATH
-# define SystemBuildLibPath	/usr/lib32:/lib32
-# define LdCmd			ld -n32
-#else
-# define BuildLibPathVar	_RLD_ROOT=/dev/null LD_LIBRARY_PATH
-# define SystemBuildLibPath	/usr/lib:/lib
-#endif
-#define HasCplusplus		YES
-#define Malloc0ReturnsNull	YES	/* IRIX [56].x -lmalloc needs this */
-#define HasPutenv		YES
-#define ExecableScripts		YES
-#define HasNdbm			YES
-#define HasPoll                 YES
-#define ExpandManNames          YES
-#ifndef BuildXInputExt
-#define BuildXInputExt		YES
-#endif
-
-#if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion > 2)
-#define NeedVarargsPrototypes	YES
-#define NeedConstPrototypes	YES
-#define NeedWidePrototypes	NO
-#endif
-
-#include <sgiLib.rules>
-
-#if OSMajorVersion < 5
-#define SymbolTables -Wf,-XNp16000,-XNd16000,-XNh2000
-#define PexSymbolTables -Wf,-XNp15000,-XNd15000,-XNh2000
-#define ServerSymbolTables -Wf,-XNp8000,-XNh2000,-XNd8000
-#else
-#define SymbolTables
-#define PexSymbolTables 
-#define ServerSymbolTables
-#endif
-
-/* this is for floating point, ANSI cpp */
-#if OSMajorVersion < 5
-/* Extra libraries provide : yp, sysV malloc, shared libc, and widechar */
-# define ExtraLibraries -lsun -lmalloc -lc_s -lw
-# define sgiCCOptions -xansi -D__STDC__=1 -float
-#else
-# if OSMajorVersion < 6
-#  define sgiCCOptions -xansi
-# else
-#  define CppCmd cc -E
-#  ifdef Mips64Architecture
-/* set Mips64Architecture in host.def. Usually don't need it but we
- * (the X Consortium) want a  64-bit big-endian machine to test on. */
-#   define sgiCCOptions -xansi -mips3 -64
-#   define DlLibrary /**/
-#  elif defined(MipsN32Architecture)
-/* Set MipsN32Architecture to build "new" 32-bit objs with a 32-bit kernel. */
-#   define sgiCCOptions -xansi -mips3 -n32
-#  else
-#   define sgiCCOptions -xansi
-#  endif
-#  if OSMinorVersion > 1
-/* if you haven't installed patch 1361, 1403, or 1645 on IRIX 6.2 then you
- * must add "#define HasPosixThreads NO" in your site.def or host.def file
- */
-#   ifndef HasPosixThreads
-#    define HasPosixThreads	YES
-#   endif
-#   define ThreadedX HasPosixThreads
-#   define ThreadsLibraries -lpthread
-/* 
- * Add "#define HasSgiThreadsPatch1403 NO" to your site.def or host.def if 
- * that's which patch you have.
- */
-#   ifndef HasSgiThreadsPatch1403
-#    define HasSgiThreadsPatch1403 YES
-#   endif
-#   if (HasSgiThreadsPatch1403) 
-#    define SystemMTDefines -D_POSIX_THREAD_SAFE_FUNCTIONS
-#   endif
-#  endif
-# endif
-/* SGI's -lsocket -lnsl is broken, at least in 5.2, so override here */
-# define ExtraLibraries /**/
-#endif
-
-#define DefaultCCOptions sgiCCOptions SymbolTables
-#define PexCCOptions sgiCCOptions PexSymbolTables
-#define ServerCCOptions sgiCCOptions ServerSymbolTables
-
-/* For SGI C++ compiler, need to search extra dirs in make depend */
-#ifndef CplusplusDependIncludes
-#define CplusplusDependIncludes -I/usr/include/CC
-#endif
-
-/* At SGI, we don't need this */
-#define ConstructMFLAGS		NO	/* build MFLAGS from MAKEFLAGS */
-
-/* Used only for compressed fonts */
-#define UNCOMPRESSPATH /usr/bsd/uncompress
-
-/* Normally used only to conditionally chose the default font path order */
-#define PrimaryScreenResolution 96
-
-/* Override Imake.tmpl's "-X" flag */
-#define LdCombineFlags -r
-
-/* Installation Build Parameters */
-#define InstKmemFlags -m 2711 -g sys
-
-#define ArCmd ar scq
-
-/* for xdm or anyone else to use */
-#define DefaultUserPath :/usr/sbin:/usr/bsd:/usr/bin:/bin:$(BINDIR):/etc:/usr/etc
-#define DefaultSystemPath /usr/sbin:/usr/bsd:/bin:/etc:/usr/bin:/usr/etc:$(BINDIR)
-
-#ifndef BuildServer
-#define BuildServer             NO
-#endif
-#define ServerOSDefines		-DDDXTIME 
-/* only need this for binary compatibility with their ddx */
-#ifndef Mips64Architecture
-#define ServerExtraDefines	-DNEED_LINEHELPER AllocateLocalDefines
-#else
-#define ServerExtraDefines	-D_XSERVER64 -DNEED_LINEHELPER AllocateLocalDefines
-#endif
-
-/* Changed to a single shell command for pmake/smake */
-#if OSMajorVersion < 5
-/*
- * NormalLibObjCompile - compile fragment for a library object file
- * 	do ld -x to remove line number symbols for libraries
- */
-#define NormalLibObjCompile(options) 	ClearmakeOSName			  \
-	$(RM) $@ $*.os \						@@\
-	&& $(CC) -c options $(CFLAGS) $*.c \				@@\
-	&& $(LD) $(LDSTRIPFLAGS) -r $@ -o $*.os \			@@\
-	&& $(MV) $*.os $@
-#endif
-
-#define LibObjCompile(dir,options) ClearmakeOSName			  \
-	$(RM) $@ dir/$@ \						@@\
-	&& $(CC) -c $(CCOPTIONS) $(ALLDEFINES) options $*.c \		@@\
-	&& $(MV) $@ dir/$@
-
-#ifndef HasMakefileSafeInclude
-#define HasMakefileSafeInclude YES
-#endif
-#ifndef IncludeMakefile
-#define IncludeMakefile(file) @@sinclude file
-#endif
-
-/* needs to find nroff on the system to work */
-#ifndef ManKeywordsTarget
-#define ManKeywordsTarget(manpath)					@@\
-man_keywords::								@@\
-	/usr/lib/makewhatis -M $(DESTDIR)manpath $(DESTDIR)manpath/whatis
-#endif
-
-#define MotifDefines		-DSYS_DIR -DPORT_NOVFORK -DNO_REGCOMP
-
-#ifndef CppFileTarget
-#define CppFileTarget(dst,src,defs,deplist)				@@\
-dst::  src deplist							@@\
-	RemoveFile($@)							@@\
-	ClearmakeOSName \
-	$(CPP) CppNoLineInfoOption defs src | CppSedMagic >$@; 		@@\
-									@@\
-clean::									@@\
-	RemoveFiles(dst)
-#endif /* CppFileTarget */
--- a/Xvnc/config/cf/sgiLib.rules
+++ /dev/null
@@ -1,166 +0,0 @@
-XCOMM $XConsortium: sgiLib.rules /main/16 1996/09/28 18:11:04 rws $
-
-#ifndef HasSharedLibraries
-#define HasSharedLibraries YES
-#endif
-#if OSMajorVersion < 5
-#ifndef SharedDataSeparation
-#define SharedDataSeparation YES
-#endif
-#define SharedCodeDef -DSHAREDCODE
-#define SharedLibraryDef -DATTSHAREDLIB
-#define PositionIndependentCFlags -G 0
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we don't hose people by having
- * the library gone for long periods.
- */
-#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
-AllTarget(Concat3(lib,libname,_s))					@@\
-									@@\
-Concat3(lib,libname,_s): sharedlib.o solist Concat(lib,libname.spec) $(EXTRALIBRARYDEPS)	@@\
-	$(RM) $@ $@.a \							@@\
-	&& cd down \							@@\
-	&& mkshlib -s Concat(up/lib,libname.spec) -t up/$@ -h up/$@.a \	@@\
-	&& ar rs up/$@.a sharedlib.o					@@\
-	LinkBuildLibrary($@)						@@\
-	LinkBuildLibrary($@.a)						@@\
-									@@\
-clean::									@@\
-	$(RM) Concat3(lib,libname,_s) Concat3(lib,libname,_s.a)
-
-#define SharedLibraryDataTarget(libname,rev,salist)
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- * NOTE: file must be executable, hence "INSTBINFLAGS"
- */
-#define	InstallSharedLibrary(libname,rev,dest)				@@\
-install:: Concat3(lib,libname,_s)					@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat3(lib,libname,_s.a) $(DESTDIR)dest @@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat3(lib,libname,_s) $(DESTDIR)dest
-
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#define	InstallSharedLibraryData(libname,rev,dest)			@@\
-InstallTarget(install,Concat3(lib,libname,_s.a),$(INSTLIBFLAGS),dest)
-
-#else /* OSMajorVersion >= 5 */
-
-#ifndef SharedDataSeparation
-#define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef /**/
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <sgiLib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-#if OSMajorVersion < 6
-#define SharedLibraryLoadFlags -shared
-#else
-#ifndef Mips64Architecture
-#define SharedLibraryLoadFlags -shared
-#else
-#define SharedLibraryLoadFlags -shared -mips3
-#endif
-#endif
-#endif
-/* -KPIC is redundant, PIC is always used unless you specify -non_shared */
-#ifndef PositionIndependentCFlags
-#define PositionIndependentCFlags -KPIC
-#endif
-#ifndef PositionIndependentCplusplusFlags
-#define PositionIndependentCplusplusFlags -KPIC
-#endif
-
-/*
- * SGI's cc passes an undocumented flag to ld that causes it to look for
- * -lX11 and force use of libX11.so.1.  And it can't be turned off.  Sigh.
- * So we install one of those, too, in the shared library install target.
- */
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-#define	InstallSharedLibrary(libname,rev,dest)				@@\
-install:: Concat(lib,libname.so.rev) 					@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
-	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
-	cd $(DESTDIR)dest; $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so) @@\
-	if [ "libname" = X11 ]; then \					@@\
-	    RemoveFile(Concat($(DESTDIR)dest/lib,libname.so.1)); \	@@\
-	    cd $(DESTDIR)dest; $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so.1);\ @@\
-	fi
-
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-#define	InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-
-/*
- * SGI's cc passes an undocumented flag to ld that causes it to look for
- * -lX11 and force use of libX11.so.1.  Sigh.  So we make one of those, too,
- * in the shared library build target.
- */
-
-#ifndef sgiX11soHack
-#ifdef UseInstalled
-#define sgiX11soHack(libname) /**/
-#else
-#define sgiX11soHack(libname) if [ "libname" = X11 ]; then \		@@\
-	    RemoveFile($(BUILDLIBDIR)/Concat(lib,libname.so.1)); \	@@\
-	    cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/$@ Concat(lib,libname.so.1); \ @@\
-	fi
-#endif
-#endif /* sgiX11soHack */
-
-#ifndef SharedLibraryTarget
-#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
-AllTarget(Concat(lib,libname.so.rev))					@@\
-									@@\
-Concat(lib,libname.so.rev):  solist $(EXTRALIBRARYDEPS)			@@\
-	$(RM) $@~ 							@@\
-	(cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -soname $@ solist $(REQUIREDLIBS))	@@\
-	$(RM) $@							@@\
-	$(MV) $@~ $@							@@\
-	$(RM) Concat(lib,libname.so)					@@\
-	$(LN) $@ Concat(lib,libname.so)					@@\
-	LinkBuildLibrary($@)						@@\
-	LinkBuildLibrary(Concat(lib,libname.so))			@@\
-	sgiX11soHack(libname)						@@\
-									@@\
-clean::									@@\
-	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) so_locations
-
-#endif /* SharedLibraryTarget */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryTarget */
-
-#endif /* OsMajorVersion < 5 else */
--- a/Xvnc/config/cf/sgiLib.tmpl
+++ /dev/null
@@ -1,14 +0,0 @@
-XCOMM $XConsortium: sgiLib.tmpl /main/2 1996/09/28 16:12:44 rws $
-
-/*
- * SGI shared library template
- */
-#define SharedXtReqs $(LDPRELIBS) $(XLIBONLY) -delay_load $(SMLIB) -delay_load $(ICELIB)
-#define SharedXmuReqs $(LDPRELIBS) $(XTOOLONLYLIB)
-#define SharedXawReqs -lw
-#define SharedXpReqs $(LDPRELIBS) $(XLIB)
-
-#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) -lgen
-#define SharedXmReqs $(LDPRELIBS) SharedXReqs
-#define SharedMrmReqs $(LDPRELIBS) $(XMLIB) SharedXReqs
-#define SharedUilReqs $(LDPRELIBS) $(MRESOURCELIB) $(XMLIB) SharedXReqs
--- a/Xvnc/config/cf/site.def
+++ /dev/null
@@ -1,167 +0,0 @@
-XCOMM site:  $XConsortium: site.def /main/revisionist/4 1996/12/31 08:02:07 kaleb $
-XCOMM site:  $XFree86: xc/config/cf/site.def,v 3.17.2.1 1997/06/22 10:32:21 dawes Exp $
-
-/***************************************************************************
- *                                                                         *
- *			   SITE-SPECIFIC DEFINITIONS                       *
- *                                                                         *
- * This file contains two halves, one included before the vendor-specific  *
- * configuration file (.cf file), and one included after the .cf file.     *
- * The before-half should be protected by #ifdef BeforeVendorCF, and the   *
- * after-half should be protected by #ifdef AfterVendorCF.                 *
- *                                                                         *
- * The before-half should only set things that the .cf file depends on.    *
- * For the .cf files shipped in this release, the main variables in this   *
- * category are HasGcc, HasGcc2, HasCplusplus, OSMajorVersion,             *
- * OSMinorVersion, and OSTeenyVersion.                                     *
- *                                                                         *
- * The after-half should contain all other definitions.  For example,      *
- * place your ProjectRoot definition here.                                 *
- *                                                                         *
- * OS Major and Minor version numbers should be changed directly in the    *
- * .cf file, not overridden in site.def.                                   *
- *                                                                         *
- ***************************************************************************/
-
-/* if you want host-specific customization, this is one way to do it */
-/*
-#ifndef SiteIConfigFiles
-#define SiteIConfigFiles $(IRULESRC)/host.def
-#define LocalConfigFiles host.def
-#endif
-*/
-
-
-#ifdef BeforeVendorCF
-
-/*
- * Include this for easy XFree86 customisations
- */
-
-/*================================================================
-   BEGIN ORL VNC modification
-   Use vnc.def instead of xf86site.def and host.def */
-
-/* REMOVE
-#ifndef SiteIConfigFiles
-#define SiteIConfigFiles $(IRULESRC)/xf86site.def $(IRULESRC)/host.def
-#endif
-
-#include <host.def>
-
-#include <xf86site.def>
-*/
-
-#define SiteIConfigFiles $(IRULESRC)/vnc.def
-#include <vnc.def>
-
-/* END ORL VNC modification
-================================================================*/
-
-/* On systems where cpp doesn't expand correctly macros in include directives
- * the two following macros need to be defined directly (where "X11" is
- * really whatever the TopLevelProject macro is defined to be).
- */
-# if defined(AIXArchitecture) || defined(SVR4Architecture) || \
-     defined(SCOArchitecture) || defined(Win32Architecture) || \
-     defined(UXPArchitecture) || defined(SunArchitecture) || \
-     defined(i386IscArchitecture)
-#  ifndef ProjectRulesFile
-#   define ProjectRulesFile	<X11.rules>
-#  endif
-#  ifndef ProjectTmplFile
-#   define ProjectTmplFile	<X11.tmpl>
-#  endif
-# endif
-
-/*
-#ifndef HasGcc2
-#define HasGcc2 YES
-#endif
-*/
-
-#endif /* BeforeVendorCF */
-
-#ifdef AfterVendorCF
-
-/*================================================================
-   BEGIN ORL VNC modification
-   Define ProjectRoot in vnc.def */
-
-/* REMOVE
-#ifndef ProjectRoot
-#define ProjectRoot /usr/X11R6
-#endif
-*/
-
-/* END ORL VNC modification
-================================================================*/
-
-/* Only set HasXdmAuth to YES if you have a Wraphelp.c file. */
-#define HasXdmAuth YES
-
-/* #define PreIncDir DefaultGccIncludeDir */
-
-/*
-#if defined(SunArchitecture) && defined(SparcArchitecture)
-#define HasCodeCenter	YES
-#ifndef SVR4Architecture
-#define HasTestCenter	YES
-#endif
-#endif
-*/
-
-/*
-#ifdef __hp9000s800
-#define HasCodeCenter	YES
-#endif
-*/
-
-/*
-#if defined(SunArchitecture) && defined(SparcArchitecture) && !defined(SVR4Architecture)
-#define HasPurify	YES
-#endif
-*/
-
-/*
-#define HasSentinel	YES
-*/
-
-/*
-#undef DefaultUserPath
-#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin
-*/
-
-
-/* You do NOT need SetUID if you only run the server under xdm */
-/* You MAY need SetUID if users run the server by hand or under xinit */
-/* Consult your system administrator before making the X server setuid */
-/*
-#if defined(SunArchitecture) && OSMajorVersion > 4
-#define InstallXserverSetUID YES
-#endif
-*/
-
-/* You do NOT need SetUID if you only run the server under xdm */
-/* You MAY need SetUID if users run the server by hand or under xinit */
-/* Consult your system administrator before making the X server setuid */
-/*
-#ifdef XFree86Version
-#define InstallXserverSetUID YES
-#endif
-*/
-
-/*================================================================
-   BEGIN ORL VNC modification
-   No host.def */
-
-/* REMOVE
-#include <host.def>
-*/
-
-/* END ORL VNC modification
-================================================================*/
-
-#include <vnc.def>
-
-#endif /* AfterVendorCF */
--- a/Xvnc/config/cf/sony.cf
+++ /dev/null
@@ -1,103 +0,0 @@
-XCOMM platform:  $XConsortium: sony.cf /main/69 1996/09/29 18:19:36 kaleb $
-
-#ifdef SonyBsdArchitecture
-
-#ifndef OSName
-#define OSName                  NEWS-OS 4.2.1C
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion          4
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion          2
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion          1
-#endif
-#define SetTtyGroup             YES
-#define HasVoidSignalReturn     NO
-#define HasNdbm                 YES
-#define DirFailPrefix -
-#define InstKmemFlags		-g kmem -m 2711
-#define DefaultUserPath :/bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/sony/bin:
-#define DefaultSystemPath /etc:/usr/etc:/bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/sony/bin:
-#ifdef MipsArchitecture
-#define ExtraLibraries		-lmld
-#define LintOpts		-ax
-#define LintLibFlag		-o
-#define DefaultCCOptions	-Wf,-XNh2000,-XNd6000,-XNp10000 -Olimit 2000
-#define PexCCOptions		-Wf,-XNh2000,-XNd15000,-XNp15000 -Olimit 2000
-#else
-#define HasFortran		YES
-#endif
-#if OSMajorVersion >= 4
-#define HasShm			YES
-#define HasPutenv		YES
-#define HasSecureRPC		YES
-#define XdmDir			/etc/xdm
-#if OSMinorVersion >= 1
-#define HasBsearch		YES
-#else
-#define HasBsearch		NO
-#endif
-#else
-#define StandardDefines		-DNOSTDHDRS
-#define HasBsearch		NO
-#endif
-
-#else
-
-#ifndef OSName
-#define OSName			DefaultOSName
-#endif
-#ifndef OSMajorVersion
-#define OSMajorVersion		DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-#define OSMinorVersion		DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-#define OSTeenyVersion		DefaultOSTeenyVersion
-#endif
-XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-
-#define BootstrapCFlags		-Dsony
-#define SystemV4		YES
-#define HasVFork		NO
-#define CcCmd			/usr/bin/cc
-#define LdCmd			/usr/bin/ld
-#if OSMajorVersion >= 6
-#define DefaultCCOptions	-Xa -Wf,-XNp9000,-XNd6000
-#define PexCCOptions		-Xa -Wf,-XNp15000,-XNd15000
-#define SharedLibraryLoadFlags -G -rpath $(USRLIBDIRPATH)
-#define PositionIndependentCFlags -K PIC -Wx,-G 0
-#define PositionIndependentCplusplusFlags -K PIC -Wx,-G 0
-#define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB)
-#define FixupLibReferences() /**/
-#include <sv4Lib.rules>
-#else
-#define DefaultCCOptions	-Wf,-XNp9000,-XNd6000
-#define PexCCOptions		-Wf,-XNp15000,-XNd15000
-#endif
-
-#endif
-
-/*
- * SONY C++ compiler is based on vanilla cfront, which means it
- * refuses to compile files unless their names end in ".C".  We
- * have to completely override .SUFFIXES to avoid using the builtin
- * .C to .o rule in cases where the link to foo.C is already there,
- * because the builtin rule doesn't use the right compilation flags.
- */
-
-.SUFFIXES:
-.SUFFIXES: .o .c .y .l .s .sh .h .f .Y .L .cxx
-
-#define NormalLibObjCplusplusCompile(options) test -r $*.C || $(LN) $*.CCsuf $*.C @@\
-	$(CXX) -c $(CXXFLAGS) options $*.C
-
-XCOMM operating system:  OSName
-
-#ifndef BuildServer
-#define BuildServer             NO
-#endif
--- a/Xvnc/config/cf/sun.cf
+++ /dev/null
@@ -1,389 +0,0 @@
-XCOMM platform:  $TOG: sun.cf /main/163 1997/06/08 20:08:23 kaleb $
-
-
-
-
-XCOMM platform:  $XFree86: xc/config/cf/sun.cf,v 3.31.2.7 1997/12/01 13:31:17 dawes Exp $
-
-#ifndef OSName
-# define OSName		DefaultOSName
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion	DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion	DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-# define OSTeenyVersion	DefaultOSTeenyVersion
-#endif
-XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-
-/*
- * Compiler setup.  This sun.cf file knows what options to use with 
- * certain compilers, including Sun C, CenterLine C, and gcc.  It 
- * also understands how to set some of the options for various C++
- * compilers, including Sun C++ and CenterLine C++.
- *
- * === C Compiler Setup ==========================================
- *
- * For SunPro C, define HasSunC to YES in site.def.  
- * For CenterLine C, define HasCenterLineC to YES in site.def
- * For gcc or gcc2, define HasGcc or HasGcc2 to YES in site.def
- * For other compilers, define HasSunC to NO in site.def, then 
- *    provide appropriate values for the various compiler related
- *    configuration varibles used here.
- * 
- * If you say you have the SunPro C compiler, we assume you have 
- * version 2.0.x of the compiler.  If you have version 3.0.x instead, 
- * define CCompilerMajorVersion as 3 in site.def
- *
- * If you don't tell us which C compiler you have, we assume you have 
- * the SunPro C compiler under Solaris 2.x, and the bundled /bin/cc 
- * under SunOS 4.1.x
- *
- * === C++ Compiler Setup ==========================================
- *
- * For SunPro C++, define HasSunCplusplus to YES in site.def
- * For CenterLine C++, define HasCenterLineCplusplus to YES in site.def
- * For Gnu g++ 2.6.x, define HasGcc2ForCplusplus to YES in site.def
- * For other compilers, define HasCplusplus to YES in site.def, and 
- *    check to see if you need to provide values for CplusplusOptions
- *    and/or DefaultCplusplusOptions.
- *
- * In any case, you may also need to set CplusplusDependIncludes.
- *
- * If you say you have the SunPro C++ compiler, we assume you have 
- * version 3.0.x of the compiler.  If you have version 4.0.x instead, 
- * define CplusplusCompilerMajorVersion as 4 in site.def.
- *
- */
-
-#ifndef HasGcc2
-#define HasGcc2 NO
-#endif
-#ifndef HasGcc
-#define HasGcc HasGcc2
-#endif
-
-#ifndef HasSunC
-# if (HasCenterLineC || HasGcc || HasGcc2 || OSMajorVersion < 5)
-#  define HasSunC NO
-# else
-#  define HasSunC YES
-# endif
-#endif
-
-#if HasSunC 
-# ifndef CCompilerMajorVersion
-#  define CCompilerMajorVersion 3
-#  define DefaultCDebugFlags	-xO3
-#  define OptimizedCDebugFlags	-xO3
-# endif
-#endif
-
-#if HasSunCplusplus
-# ifndef HasCplusplus
-#  define HasCplusplus YES
-#  define OptimizedCplusplusDebugFlags	-xO3
-# endif
-# ifndef CplusplusCompilerMajorVersion
-#  define CplusplusCompilerMajorVersion	4
-# endif
-#endif
-
-#if HasCenterLineC
-# ifndef CcCmd
-#  define CcCmd clcc
-# endif
-#endif
-
-#if HasCenterLineCplusplus
-# ifndef HasCplusplus
-#  define HasCplusplus YES
-# endif
-# ifndef DefaultCplusplusOptions
-#  define DefaultCplusplusOptions -Xa
-# endif
-# ifndef CplusplusOptions
-#  define CplusplusOptions -Xa
-# endif
-#endif
-
-
-#if OSMajorVersion < 4 || (OSMajorVersion == 4 && OSMinorVersion < 1)
-/* We do not guarantee this will work */
-# define BootstrapCFlags	-DNOSTDHDRS
-# define StandardDefines	-DNOSTDHDRS
-# define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-#endif
-
-#if OSMajorVersion == 4 
-# if OSMinorVersion == 1
-#  define HasPoll		YES
-# endif
-# if OSMinorVersion > 1 || (OSMinorVersion == 1 && OSTeenyVersion > 1)
-/* You ALSO need this if you have Sun ld patch 100170-06 or later to 4.1.1 */
-#  define SunPost411FCSLd	YES
-# endif
-#endif
-
-#ifdef i386Architecture
-# if OSMajorVersion > 4
-#  define ServerExtraDefines AllocateLocalDefines XFree86ServerDefines -D__EXTENSIONS__
-#  define ServerOSDefines    XFree86ServerOSDefines
-# else
-#  define ServerExtraDefines AllocateLocalDefines
-#  define ServerOSDefines   -DDDXOSINIT
-# endif
-#else
-# define ServerExtraDefines AllocateLocalDefines
-# define ServerOSDefines   -DDDXOSINIT
-#endif
-
-#define XkbServerDefines  -DXKB_ALWAYS_USES_SOFT_REPEAT
-
-#if OSMajorVersion > 4
-#if HasSunC
-/* 
- * Assume /opt/SUNWspro/bin/ contains symlinks to the appropriate tools
- */
-#ifndef  CcCmd
-# define CcCmd		/opt/SUNWspro/bin/cc
-#endif
-#ifndef  CplusplusCmd
-# define CplusplusCmd	/opt/SUNWspro/bin/CC
-#endif
-#ifndef  CplusplusFilt
-# define CplusplusFilt	/opt/SUNWspro/bin/c++filt
-#endif
-#ifndef  CplusplusDependIncludes
-# define CplusplusDependIncludes	-I/opt/SUNWspro/SC3.0/include/CC
-#endif
-#endif
-
-# if HasSunC && (CCompilerMajorVersion < 3)
-#  define BootstrapCFlags	-DSVR4
-# else
-#  define BootstrapCFlags	/* none needed */
-# endif
-# ifndef XawI18nDefines
-#  if OSMinorVersion < 4
-#   define XawI18nDefines    -DHAS_WCTYPE_H -DHAS_ISW_FUNCS
-#  else
-#   define XawI18nDefines    -DHAS_WCHAR_H -DHAS_ISW_FUNCS
-#  endif
-# endif
-# if OSMinorVersion > 3
-#  define InstallCmd	    /usr/ucb/install
-# endif
-# ifdef i386Architecture
-#  define StandardDefines	  -Dsun -Di386 -DSVR4 -D__i386
-#  define ToolkitStringsABIOptions	-intelabi
-# else
-#  define StandardDefines	  -Dsun -DSVR4
-#  define ToolkitStringsABIOptions	-sparcabi
-#  define HasPlugin         YES
-# endif
-# define ExtraLibraries    -lsocket -lnsl
-# if OSMinorVersion > 1
-#  define ThreadedX	  YES
-#  define MTSafeAPIDefines	-DXUSE_MTSAFE_API -DXUSE_NETDB_R_API
-#  if HasSunC && CCompilerMajorVersion > 2
-#   define ThreadsCompileFlags -mt
-#  else
-#   define SystemMTDefines -D_REENTRANT
-#   define ThreadsLibraries -lthread
-#  endif
-#  if HasSunCplusplus && CplusplusCompilerMajorVersion > 3
-#   define ThreadsCplusplusCompileFlags -mt
-#  else
-#   define CplusplusSystemMTDefines -D_REENTRANT
-#   define ThreadsCplusplusLibraries -lthread
-#  endif
-# endif 		/* OSMinorVersion > 1 */
-# ifndef UseExportLists
-#  if OSMinorVersion > 4
-#   define UseExportLists YES
-#  else
-#   define UseExportLists NO
-#  endif
-# endif
-# define HasVFork          NO
-# define InstKmemFlags	  -g sys -m 2711
-# define ShLibIncludeFile <sunLib.tmpl>
-/*
- * Set flags for position independent code before including sv4Lib.rules
- * if the compiler in use doesn't use standard SVR4 flags
- */
-# if HasSunC || HasCenterLineC
-#  define PositionIndependentCFlags -Kpic
-#  define LargePositionIndependentCFlags -KPIC
-# endif
-# if HasSunCplusplus || HasCenterLineCplusplus
-#  define PositionIndependentCplusplusFlags -pic
-#  define LargePositionIndependentCplusplusFlags -PIC
-# endif
-#else /* not OSMajorVersion > 4 */
-#define InstKmemFlags	  -g kmem -m 2711
-#include <sunLib.rules>
-#endif /* OSMajorVersion > 4 (else) */
-
-#define BuildLibPathVar	  LD_LIBRARY_PATH
-#define HasNdbm		  YES
-#define HasShm		  YES
-#define HasSecureRPC	  YES
-#define SetTtyGroup	  YES
-#define HasPutenv	  YES
-#ifndef i386Architecture
-# ifndef Xsun24Server
-#  define Xsun24Server	  NO		/* color, mono, multiple depths */
-# endif
-# ifndef XsunServer
-#  define XsunServer	  YES		/* color and mono, 8 bit only */
-# endif
-# ifndef XsunMonoServer
-#  define XsunMonoServer	  NO		/* monochrome only */
-# endif
-# ifndef BuildPexExt
-#  define BuildPexExt	  (XsunServer || Xsun24Server)
-# endif
-#endif /* not i386Architecture */
-
-#if (OSMajorVersion > 4) && defined(i386Architecture)
-#ifndef HasSolx86ApertureDriver
-#define HasSolx86ApertureDriver	YES
-#endif
-#endif
-
-#if HasGcc
-# if OSMajorVersion > 4 && defined(i386Architecture)
-#  ifndef DefaultCCOptions
-#   if UseInstalled
-#    define DefaultCCOptions -DNO_ASM
-#   else
-#    if OSMinorVersion > 3
-#     define DefaultCCOptions -ansi -pedantic -DNO_ASM
-#    else
-#     define DefaultCCOptions -DNO_ASM
-#    endif
-#   endif
-#  endif
-# endif
-# if HasGcc2
-#  ifndef OptimizedCDebugFlags
-#   ifdef i386Architecture
-#    define OptimizedCDebugFlags DefaultGcc2i386Opt
-#   else
-#    define OptimizedCDebugFlags -O2
-#   endif
-#  endif
-# else
-#  define SharedLibraryCcCmd cc
-#  define ExtraLoadFlags -B/usr/bin/
-#  define AllocateLocalDefines /**/
-
-.c.o:
-	ClearmakeOSName	$(CC) -c $(CFLAGS) $*.c
-
-# endif /* HasGcc2 (else) */
-
-#else /* not HasGcc */
-
-# define AllocateLocalDefines -DINCLUDE_ALLOCA_H
-
-/* Set up compiler-dependent options for Sun C */
-
-# if HasSunC
-#  ifdef Sun3Architecture
-#   ifndef DefaultCCOptions
-#    define DefaultCCOptions -f68881 -pipe
-#   endif
-#  else	/* not defined(Sun3Architecture) */
-#   if OSMajorVersion < 5
-#    ifndef DefaultCCOptions
-#     define DefaultCCOptions -pipe
-#    endif
-#   else /* OSMajorVersion >= 5*/
-#    ifndef DefaultCCOptions
-#     define DefaultCCOptions -Xa
-#    endif
-#   endif	
-#  endif	
-# endif
-
-/* Set compiler-dependent options for CenterLine C */
-
-# if HasCenterLineC
-#  ifndef DefaultCCOptions
-#   define DefaultCCOptions -Xt -w1 -DANSICPP -U__HIGHC__
-#  endif
-#  ifndef NeedConstPrototypes
-#   define NeedConstPrototypes YES
-#  endif
-#  ifndef NeedNestedPrototypes
-#   define NeedNestedPrototypes YES
-#  endif
-#  ifndef NeedVarargsPrototypes
-#   define NeedVarargsPrototypes YES
-#  endif
-# endif
-
-
-# define PexCCOptions DefaultCCOptions
-
-#endif /* HasGcc (else) */
-
-#if OSMajorVersion < 5
-# define SharedAllocateLocalDefines -DINCLUDE_ALLOCA_H
-# define LibraryCCOptions /* don't want special floating point */
-#endif /* OSMajorVersion < 5 */
-
-#if OSMajorVersion > 4
-# include <svr4.cf>
-#endif
-
-#ifndef ManKeywordsTarget
-# define ManKeywordsTarget(manpath)					@@\
-man_keywords::								@@\
-	catman -M $(DESTDIR)manpath -w
-#endif
-
-#if !defined(UsePamLibrary)
-# if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 4))
-#  define UsePamLibrary		YES
-# endif
-#endif
-
-#define MotifDefines			\
-	-DNO_ISDIR -DNO_REGCOMP -DNO_ALLOCA -DBOGUS_MB_MAX -DNO_CONST
-#define PamUnixDefines		-DPAM_NIS
-#define TtLargePICTable		YES
-#define DtSvcDefines		-DXK_MISCELLANY -DMULTIBYTE -DNO_REGCOMP
-#define DtSearchDefines		-DI18N_MSG DtSvcDefines
-#define DtWidgetDefines		DtSearchDefines
-#define DtPrintDefines		DtSearchDefines
-
-#define baseDtMailDefines	\
-	-DSunOS=OSMajorVersion\#\#OSMinorVersion -DMMAP_NORESERVE -DSPRO_V2
-#ifndef i386Architecture
-# define DtMailDefines		baseDtMailDefines
-#else
-# define DtMailDefines		-DBIG_ENDIAN baseDtMailDefines
-#endif
-
-#define ArchitectureDefines	-DSUN_ARCHITECTURE
-
-#define TtClientExtraLibs	ExtraLibraries -ldl -lintl
-
-#define ExportListGenSource	elistgen.sun
-#define ShlibExportListOpt(filename)	-M filename
-
-#define CdeProjectDefines \
-	-DMULTIBYTE -DNLS16 -DMESSAGE_CAT -D_XOPEN_VERSION=4 \
-	-D_XOPEN_SOURCE -D__EXTENSIONS__ \
-	-DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion
-
-#ifdef SparcArchitecture
-# define AsmDefines	/**/
-#endif
--- a/Xvnc/config/cf/sunLib.rules
+++ /dev/null
@@ -1,111 +0,0 @@
-XCOMM $XConsortium: sunLib.rules /main/15 1996/09/28 16:13:16 rws $
-
-/*
- * SunOS shared library rules
- */
-
-#ifndef HasSharedLibraries
-#define HasSharedLibraries YES
-#endif
-#ifndef SharedDataSeparation
-#define SharedDataSeparation YES
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef -DSHAREDCODE
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef -DSUNSHLIB
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <sunLib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags -assert pure-text
-#endif
-#ifndef PositionIndependentCFlags
-#if HasGcc2
-#define PositionIndependentCFlags -fpic
-#else
-#define PositionIndependentCFlags -pic
-#endif
-#endif
-#ifndef PositionIndependentCplusplusFlags
-#if HasGcc2ForCplusplus
-#define PositionIndependentCplusplusFlags -fpic
-#else
-#define PositionIndependentCplusplusFlags -pic
-#endif
-#endif
-
-/*
- * SharedDSLibDependencies - shared library dependencies with data separation
- */
-#ifndef SharedDSLibDependencies
-#define SharedDSLibDependencies(libname,libsource,revname) _UseCat($(USRLIBDIR)/lib,libsource/lib,libname.sa.$(revname))
-#endif
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-#define	InstallSharedLibrary(libname,rev,dest)				@@\
-InstallTarget(install,Concat(lib,libname.so.rev),$(INSTLIBFLAGS),dest)
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-#define	InstallSharedLibraryData(libname,rev,dest)			@@\
-install:: Concat(lib,libname.sa.rev)					@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.sa.rev) $(DESTDIR)dest @@\
-	RanLibrary($(RANLIBINSTFLAGS) Concat($(DESTDIR)dest/lib,libname.sa.rev))
-#endif /* InstallSharedLibraryData */
-
-#if HasPurify
-#define PureCleanSharedLibrary(libname,rev)				@@\
-clean clean.pure::							@@\
-	$(RM) Concat3(lib,libname,_pure_*.so.rev)
-#else
-#define PureCleanSharedLibrary(libname,rev) /**/
-#endif
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedLibraryTarget
-#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
-AllTarget(Concat(lib,libname.so.rev))					@@\
-									@@\
-Concat(lib,libname.so.rev):  solist $(EXTRALIBRARYDEPS)			@@\
-	$(RM) $@~							@@\
-	(cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
-	$(RM) $@ 							@@\
-	$(MV) $@~ $@							@@\
-	LinkBuildLibrary($@)						@@\
-									@@\
-clean::									@@\
-	$(RM) Concat(lib,libname.so.rev)				@@\
-									@@\
-PureCleanSharedLibrary(libname,rev)
-#endif /* SharedLibraryTarget */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)			@@\
-AllTarget(Concat(lib,libname.sa.rev))					@@\
-									@@\
-Concat(lib,libname.sa.rev):  salist					@@\
-	$(RM) $@							@@\
-	$(AR) $@ salist							@@\
-	RanLibrary($@)							@@\
-	LinkBuildLibrary($@)						@@\
-									@@\
-clean::									@@\
-	$(RM) Concat(lib,libname.sa.rev)
-#endif /* SharedLibraryDataTarget */
--- a/Xvnc/config/cf/sunLib.tmpl
+++ /dev/null
@@ -1,91 +0,0 @@
-XCOMM $TOG: sunLib.tmpl /main/45 1997/02/13 13:52:59 kaleb $
-
-
-
-
-XCOMM $XFree86: xc/config/cf/sunLib.tmpl,v 3.7.2.1 1997/05/03 09:43:09 dawes Exp $
-
-/*
- * SunOS shared library template
- */
-
-#if OSMajorVersion <= 4
-
-# if SunPost411FCSLd
-#  define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB)
-# endif
-
-#ifndef SharedX11Rev
-#define SharedX11Rev 4.30
-#endif
-#ifndef SharedOldXRev
-#define SharedOldXRev 4.20
-#endif
-#ifndef SharedXtRev
-#define SharedXtRev 4.20
-#endif
-#ifndef SharedXawRev
-#define SharedXawRev 6.10
-#endif
-#ifndef SharedXmuRev
-#define SharedXmuRev 4.20
-#endif
-#ifndef SharedXextRev
-#define SharedXextRev 4.40
-#endif
-#ifndef SharedXiRev
-#define SharedXiRev 4.20
-#endif
-#ifndef SharedXtstRev
-#define SharedXtstRev 1.20
-#endif
-#ifndef SharedPexRev
-#define SharedPexRev 1.10
-#endif
-
-#else				/* else it's Solaris */
-
-# if ThreadedX
-#  if OSMinorVersion > 3
-#   define SharedThreadReqs /**/
-#   define SharedX11Reqs /**/
-#  endif
-# endif
-# define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB)
-# define FixupLibReferences() /**/
-
-# define SharedPamReqs -ldl
-# define SharedPamUnixReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -lnsl -lmp -lcmd SharedThreadReqs
-# define SharedPamSampleReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) SharedThreadReqs
-# define SharedPamDialAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) SharedThreadReqs
-# define SharedPamRhostsAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -lsocket SharedThreadReqs
-# define SharedPamDceAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -ldce -lnsl -lsocket SharedThreadReqs
-# define SharedTtReqs -lnsl -lsocket -lintl -ldl -lc -lw
-# define SharedDtSvcReqs $(LDPRELIBS) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl -ldl
-# define SharedDtMmdbReqs $(LDPRELIBS) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl -ldl
-# define SharedDtSearchReqs -lm -lc
-# define SharedDtWidgetReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc
-# define SharedDtHelpReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lgen -lm -lc
-# define SharedDtPrintReqs $(LDPRELIBS) $(DTSVCLIB) $(DTHELPLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc
-# define SharedDtTermReqs SharedDtHelpReqs -ldl -lgen
-# define SharedDtMrmReqs $(LDPRELIBS) $(DTTERMLIB) $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lsocket -lnsl -lc
-# define SharedDtMailReqs $(LDPRELIBS) -lw $(CXXLIB) -lm -ldl
-# define SharedCsaReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXmReqs
-
-# define DtClientExtraLibs -lintl
-
-/* The inbuf paramter to iconv(3) is "const char**", not "char **" */
-ICONV_INBUF_DEFINE = -DICONV_INBUF_CONST=const
-
-# if HasCplusplus
-#  if HasGcc2ForCplusplus
-UNSHARED_CXXLIB = -static -lC
-#  else
-UNSHARED_CXXLIB = -Bstatic -lC -Bdynamic -lm -lc -Bstatic
-#  endif
-# endif
-
-# define IafSysLib	/**/
-# include <sv4Lib.tmpl>
-
-#endif
--- a/Xvnc/config/cf/sv3Lib.rules
+++ /dev/null
@@ -1,232 +0,0 @@
-XCOMM $XConsortium: sv3Lib.rules /main/1 1996/10/31 14:47:33 kaleb $
-
-
-
-XCOMM $XFree86: xc/config/cf/sv3Lib.rules,v 3.1 1996/12/27 06:50:27 dawes Exp $
-/*
- * SVR3 shared library rules
- * Copyright (c) 1992, 1993 by Thomas Wolfram, Berlin, Germany
- * Author: Thomas Wolfram, thomas@aeon.in-berlin.de, wolf@prz.tu-berlin.de
- * Conception derived partially from work of Thomas Roell
- */
-
-#ifndef HasSharedLibraries
-#define HasSharedLibraries NO		/* JUST FOR NOW */
-#endif
-#ifndef ForceNormalLib
-#define ForceNormalLib YES
-#endif
-
-#ifndef SharedLibSM
-#define SharedLibSM HasSharedLibraries
-#endif
-#ifndef SharedLibXau
-#define SharedLibXau HasSharedLibraries
-#endif
-#ifndef SharedLibXdmcp
-#define SharedLibXdmcp HasSharedLibraries
-#endif
-#ifndef SharedLibXi
-#define SharedLibXi HasSharedLibraries
-#endif
-#ifndef SharedLibXie
-#define SharedLibXie HasSharedLibraries
-#endif
-#ifndef SharedLibXtst
-#define SharedLibXtst HasSharedLibraries
-#endif
-#ifndef SharedLibPhigs
-#define SharedLibPhigs HasSharedLibraries
-#endif
-#ifndef SharedLibICE
-#define SharedLibICE HasSharedLibraries
-#endif
-#ifndef SharedLibFS
-#define SharedLibFS HasSharedLibraries
-#endif
-#ifndef SharedLibX11
-#define SharedLibX11 HasSharedLibraries
-#endif
-#ifndef SharedOldX
-#define SharedOldX NO		/* it's obsolete */
-#endif
-#ifndef SharedLibXt
-#define SharedLibXt HasSharedLibraries
-#endif
-#ifndef SharedLibXaw
-#define SharedLibXaw HasSharedLibraries
-#endif
-#ifndef SharedLibXmu
-#define SharedLibXmu HasSharedLibraries
-#endif
-#ifndef SharedLibXext
-#define SharedLibXext HasSharedLibraries
-#endif
-#ifndef SharedLibPex
-#define SharedLibPex NO
-#endif
-
-#ifndef SharedDataSeparation
-#define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-#define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-#define SharedLibraryDef -DSVR3SHLIB
-#endif
-#ifndef ShLibIncludeFile
-#define ShLibIncludeFile <sv3Lib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-#define SharedLibraryLoadFlags -q
-#endif
-
-#ifndef PositionIndependentCFlags
-# if HasGcc2
-#  define PositionIndependentCFlags -msvr3-shlib  
-# else
-#  define PositionIndependentCFlags /**/
-# endif
-#endif
-
-#ifndef PositionIndependentCplusplusFlags
-# if HasGcc2
-#  define PositionIndependentCplusplusFlags -msvr3-shlib  
-# else
-#  define PositionIndependentCplusplusFlags /**/
-# endif
-#endif
-
-#if 0
-/*
- * LibCleanDir - helper for cleaning library object subdirectories
- */
-#ifndef LibCleanDir
-#define LibCleanDir(dir) -@if [ -d dir ]; then \                           @@\
-                (set -x; cd dir; $(RM) *.o *.sd); else exit 0; fi
-#endif
-
-/*
- * SharedLibObjCompile - compile fragment for shared objects
- */
-#ifndef SharedLibObjCompile
-#define SharedLibObjCompile(options) $(RM) shared/$@ 	                   @@\
-	cat import.h $*.c >_$*.c                                           @@\
-        $(CC) -c $(ANSICCOPTIONS) $(CCOPTIONS) $(ALLDEFINES) options \     @@\
-$(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) $(CDEBUGFLAGS) _$*.c              @@\
-	$(MV) _$*.o shared/$@                                              @@\
-	$(RM) _$*.c
-#endif
-
-/*
- * NormalSharedLibObjCompile - compile fragment for shared object when
- * a normal library is not being built
- */
-#ifndef NormalSharedLibObjCompile
-#define NormalSharedLibObjCompile(options) $(RM) $@                        @@\
-	cat import.h $*.c >_$*.c                                           @@\
-        $(CC) -c $(CFLAGS) options $(SHLIBDEF) $(SHAREDCODEDEF) $(PICFLAGS) _$*.c @@\
-	$(MV) _$*.o $@                                                     @@\
-	$(RM) _$*.c
-#endif
-
-
-#ifndef LibraryObjectRule
-#define LibraryObjectRule()                                             @@\
-all::                                                                   @@\
-        _DebuggedLibMkdir()                                             @@\
-        _ProfiledLibMkdir()                                             @@\
-        _SharedLibMkdir()                                               @@\
-                                                                        @@\
-includes::                                                              @@\
-        _DebuggedLibMkdir()                                             @@\
-        _ProfiledLibMkdir()                                             @@\
-        _SharedLibMkdir()                                               @@\
-                                                                        @@\
-.c.o:                                                                   @@\
-        _DebuggedObjCompile($(_NOOP_))                                  @@\
-        _ProfiledObjCompile($(_NOOP_))                                  @@\
-        _SharedObjCompile($(_NOOP_))                                    @@\
-        _NormalObjCompile($(_NOOP_))                                    @@\
-                                                                        @@\
-.SUFFIXES: .sd                                                          @@\
-.c.sd:                                                                  @@\
-        _SharedDatCompile(-DSVR3SHDAT)                                  @@\
-                                                                        @@\
-clean::                                                                 @@\
-        _DebuggedCleanDir()                                             @@\
-        _ProfiledCleanDir()                                             @@\
-        _SharedCleanDir()                                               @@\
-
-#endif /* LibraryObjectRule */
-
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-#if StripInstalledPrograms
-#define	InstallSharedLibrary(libname,rev,dest)				@@\
-install:: Concat(lib,libname.rev) 					@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) -c $(INSTLIBFLAGS) Concat3(lib,libname,_s.a) $(DESTDIR)dest @@\
-	MakeDir($(DESTDIR)$(LIBDIR)/shlib)                              @@\
-        $(INSTALL) -c $(INSTPGMFLAGS) Concat(lib,libname.rev) \         @@\
-	$(DESTDIR)$(LIBDIR)/shlib                                       @@\
-	strip Concat($(DESTDIR)$(LIBDIR)/shlib/lib,libname.rev)         @@\
-	mcs -d Concat($(DESTDIR)$(LIBDIR)/shlib/lib,libname.rev)
-#else
-#define	InstallSharedLibrary(libname,rev,dest)				@@\
-install:: Concat(lib,libname.rev) 					@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) -c $(INSTLIBFLAGS) Concat3(lib,libname,_s.a) $(DESTDIR)dest @@\
-	MakeDir($(DESTDIR)$(LIBDIR)/shlib)                              @@\
-        $(INSTALL) -c $(INSTPGMFLAGS) Concat(lib,libname.rev) \         @@\
-	$(DESTDIR)$(LIBDIR)/shlib
-#endif
-
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-#define	InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedLibraryTarget
-#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
-AllTarget(Concat(lib,libname.rev))					@@\
-									@@\
-Concat(lib,libname.rev):  solist					@@\
-	$(RM) $@ Concat3(lib,libname,_s.a)				@@\
-        $(CPP) -DDOWN=down ConnectionFlags ShlibDefines Concat(lib,libname.def) | \ @@\
-        sed -e '/^#  *[0-9][0-9]*  *.*$$/d; /^$$/d' >spec.cpp           @@\
-        sed -e '1,/#libraries/d; /#externals/,$$d' spec.cpp | \         @@\
-        nawk '{ system("ar x " $$1 " " $$2 )}'                          @@\
-        echo "#target " Concat($(LIBDIR)/shlib/lib,libname.rev) >spec   @@\
-        sed -e '/#libraries/,$$d' spec.cpp >>spec                             @@\
-        mkshlib -s spec -t $@ -h Concat3(lib,libname,_s.a) $(SHLIBLDFLAGS)    @@\
-        ar rulv Concat3(lib,libname,_s.a) `sed -e '1,/#externals/d' spec.cpp` @@\
-        $(RM) spec.cpp spec                                             @@\
-									@@\
-clean::									@@\
-	$(RM) Concat(lib,libname.rev) Concat3(lib,libname,_s.a)
-
-#endif /* SharedLibraryTarget */
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-#define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryTarget */
-
-#endif
--- a/Xvnc/config/cf/sv3Lib.tmpl
+++ /dev/null
@@ -1,77 +0,0 @@
-XCOMM $XConsortium: sv3Lib.tmpl /main/1 1996/10/31 14:47:35 kaleb $
-
-
-
-XCOMM $XFree86: xc/config/cf/sv3Lib.tmpl,v 3.1 1996/12/27 06:50:28 dawes Exp $
-/*
- * SVR3 shared library template
- * Copyright (c) 1992, 1993 by Thomas Wolfram, Berlin, Germany
- * Author: Thomas Wolfram, thomas@aeon.in-berlin.de, wolf@prz.tu-berlin.de
- * Conception derived partially from work of Thomas Roell
- */
-
-#ifndef SharedXlibRev
-#define SharedXlibRev 6.0.0
-#endif
-#ifndef SharedOldXRev
-#define SharedOldXRev 6.0
-#endif
-#ifndef SharedXtRev
-#define SharedXtRev 6.0
-#endif
-#ifndef SharedXawRev
-#define SharedXawRev 6.0
-#endif
-#ifndef SharedXmuRev
-#define SharedXmuRev 6.0
-#endif
-#ifndef SharedXextRev
-#define SharedXextRev 6.0
-#endif
-#ifndef SharedXinputRev
-#define SharedXinputRev 6.0
-#endif
-#ifndef SharedPexRev
-#define SharedPexRev 1.0
-#endif
-
-     SHLIBLDFLAGS = SharedLibraryLoadFlags
-         PICFLAGS = PositionIndependentCFlags
-
-/*
- * and now a little bit of magic for using imake without source tree; if we
- * are using shared libraries, we really do not need to depend on anything
- */
-#if SharedLibXext
-  DEPEXTENSIONLIB = _UseCat($(USRLIBDIR),$(EXTENSIONSRC)/lib,/libXext_s.a)
-     EXTENSIONLIB = LoaderLibPrefix _Use(-lXext_s, $(DEPEXTENSIONLIB))
-#endif
-#if SharedLibX
-          DEPXLIB = $(DEPEXTENSIONLIB) _UseCat($(USRLIBDIR),$(XLIBSRC),/libX11_s.a)
-             XLIB = $(EXTENSIONLIB) LoaderLibPrefix _Use(-lX11_s,$(XLIBSRC)/libX11_s.a)
-#endif
-#if SharedLibXmu
-        DEPXMULIB = _UseCat($(USRLIBDIR),$(XMUSRC),/libXmu_s.a)
-           XMULIB = LoaderLibPrefix _Use(-lXmu_s,$(DEPXMULIB))
-#endif
-#if SharedOldLibX
-       DEPOLDXLIB = _UseCat($(USRLIBDIR),$(OLDXLIBSRC),/liboldX_s.a)
-          OLDXLIB = LoaderLibPrefix _Use(-loldX_s,$(DEPOLDXLIB))
-#endif
-#if SharedLibXt
-      DEPXTOOLLIB = _UseCat($(USRLIBDIR),$(TOOLKITSRC),/libXt_s.a)
-         XTOOLLIB = LoaderLibPrefix _Use(-lXt_s,$(DEPXTOOLLIB))
-#endif
-#if SharedLibXaw
-        DEPXAWLIB = _UseCat($(USRLIBDIR),$(AWIDGETSRC),/libXaw_s.a)
-           XAWLIB = LoaderLibPrefix _Use(-lXaw_s,$(DEPXAWLIB))
-#endif
-#if SharedLibXinput
-         DEPXILIB = _UseCat($(USRLIBDIR),$(XILIBSRC),/libXi_s.a)
-            XILIB = LoaderLibPrefix _Use(-lXi_s,$(DEPXILIB))
-#endif
-#if SharedLibPhigs
-      DEPPHIGSLIB = _UseCat($(USRLIBDIR),$(PHIGSLIBSRC),/libphigs_s.a)
-         PHIGSLIB = LoaderLibPrefix _Use(-lphigs_s,$(DEPPHIGSLIB))
-#endif
-
--- a/Xvnc/config/cf/sv4Lib.rules
+++ /dev/null
@@ -1,137 +0,0 @@
-XCOMM $XConsortium: sv4Lib.rules /main/18 1996/09/28 16:13:29 rws $
-XCOMM $XFree86: xc/config/cf/sv4Lib.rules,v 3.4 1996/12/23 05:50:34 dawes Exp $
-
-/*
- * SVR4 shared library rules
- */
-
-#ifndef HasSharedLibraries
-# define HasSharedLibraries YES
-#endif
-#ifndef SharedDataSeparation
-# define SharedDataSeparation NO
-#endif
-#ifndef SharedCodeDef
-# define SharedCodeDef /**/
-#endif
-#ifndef SharedLibraryDef
-# define SharedLibraryDef /**/
-#endif
-#ifndef ShLibIncludeFile
-# define ShLibIncludeFile <sv4Lib.tmpl>
-#endif
-#ifndef SharedLibraryLoadFlags
-# define SharedLibraryLoadFlags -G -z text
-#endif
-#ifndef PositionIndependentCFlags
-# if HasGcc2
-#  define PositionIndependentCFlags -fpic
-# else
-#  define PositionIndependentCFlags -K PIC
-# endif
-#endif
-#ifndef PositionIndependentCplusplusFlags
-# if HasGcc2ForCplusplus
-#  define PositionIndependentCplusplusFlags -fpic
-# else
-#  define PositionIndependentCplusplusFlags -K PIC
-# endif
-#endif
-#ifndef UseExportLists
-# define UseExportLists NO
-#endif
-
-/*
- * InstallSharedLibrary - generate rules to install the shared library.
- */
-#ifndef InstallSharedLibrary
-#if StripInstalledPrograms
-# define InstallSharedLibrary(libname,rev,dest)				@@\
-install:: Concat(lib,libname.so.rev) 					@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
-	mcs -d Concat($(DESTDIR)dest/lib,libname.so.rev)		@@\
-	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
-	cd $(DESTDIR)dest; $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-#else
-# define InstallSharedLibrary(libname,rev,dest)				@@\
-install:: Concat(lib,libname.so.rev) 					@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
-	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
-	cd $(DESTDIR)dest; $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-#endif
-
-#endif /* InstallSharedLibrary */
-
-/*
- * InstallSharedLibraryData - generate rules to install the shared library data
- */
-#ifndef InstallSharedLibraryData
-# define InstallSharedLibraryData(libname,rev,dest)
-#endif /* InstallSharedLibraryData */
-
-#ifndef LinkWithExports
-# if UseExportLists
-#  define LinkWithExports(libname,rev,solist,down,up) \
-	(cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS))	@@\
-	if [ -f Concat(lib,libname.elist) ]; then \			@@\
-	    $(RM) down/$@.exports $@.list; \				@@\
-	    $(CPP) $(ALLINCLUDES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) Concat(lib,libname.elist) | CppSedMagic >$@.list; \	@@\
-	    $(EXPORTLISTGEN) $@~ $@.list > down/$@.exports; \		@@\
-	    (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ ShlibExportListOpt($@.exports) solist $(REQUIREDLIBS)); \	@@\
-	    $(RM) down/$@.exports $@.list; \				@@\
-	fi;
-# else
-#  define LinkWithExports(libname,rev,solist,down,up) \
-	(cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS))
-# endif
-#endif
-
-/*
- * SharedLibraryTarget - generate rules to create a shared library;
- * build it into a different name so that we do not hose people by having
- * the library gone for long periods.
- */
-#ifndef SharedLibraryTarget
-# define SharedLibraryTarget(libname,rev,solist,down,up)		@@\
-AllTarget(Concat(lib,libname.so.rev))					@@\
-									@@\
-Concat(lib,libname.so.rev):  solist $(EXTRALIBRARYDEPS)			@@\
-	$(RM) $@~							@@\
-	LinkWithExports(libname,rev,solist,down,up)			@@\
-	$(RM) $@ 							@@\
-	$(MV) $@~ $@							@@\
-	$(RM) Concat(lib,libname.so)					@@\
-	$(LN) $@ Concat(lib,libname.so)					@@\
-	LinkBuildLibrary($@)						@@\
-	LinkBuildLibrary(Concat(lib,libname.so))			@@\
-									@@\
-clean::									@@\
-	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
-
-#endif /* SharedLibraryTarget */
-
-
-#ifndef SharedDepModuleTarget
-#define SharedDepModuleTarget(name,deps,solist)				@@\
-AllTarget(name)								@@\
-									@@\
-name: deps								@@\
-	$(RM) $@~							@@\
-	$(LD) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)		@@\
-	$(RM) $@							@@\
-	$(MV) $@~ $@							@@\
-									@@\
-clean::									@@\
-	$(RM) name
-
-#endif /* SharedDepModuleTarget */
-
-
-/*
- * SharedLibraryDataTarget - generate rules to create shlib data file;
- */
-#ifndef SharedLibraryDataTarget
-# define SharedLibraryDataTarget(libname,rev,salist)
-#endif /* SharedLibraryTarget */
--- a/Xvnc/config/cf/sv4Lib.tmpl
+++ /dev/null
@@ -1,77 +0,0 @@
-XCOMM $XConsortium: sv4Lib.tmpl /main/23 1996/12/04 10:11:01 swick $
-
-/*
- * SVR4 shared library template
- */
-
-XCOMM $XFree86: xc/config/cf/sv4Lib.tmpl,v 3.3 1996/12/30 13:57:39 dawes Exp $
-
-/* SVR4 shared libraries are deficient in link semantics */
-XMULIBONLY = -lXmu
-#ifndef FixupLibReferences
-# define FixupLibReferences()						@@\
-XMULIB = $(XMULIBONLY) -z nodefs
-#endif
-#ifndef XawClientLibs
-# define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
-#endif
-
-#if 0
-/* This causes problems on SVR4.0 */
-#ifndef SharedICEReqs
-# define SharedICEReqs -lsocket
-#endif
-#endif
-
-#if ThreadedX
-# ifndef SharedThreadReqs
-#  define SharedThreadReqs -lthread
-# endif
-# ifndef SharedX11Reqs
-#  define SharedX11Reqs -lthread
-# endif
-#else
-# ifndef SharedThreadReqs
-#  define SharedThreadReqs
-# endif
-#endif
-
-#ifndef SharedXReqs
-# define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) SharedThreadReqs $(LDPOSTLIBS)
-#endif
-
-#ifndef SharedXmReqs
-# define SharedXmReqs $(LDPRELIBS) SharedXReqs -lgen -lsocket -lnsl -lw -lc
-#endif
-
-#ifndef SharedMrmReqs
-# define SharedMrmReqs $(LDPRELIBS) $(XMLIB) SharedXReqs -lgen -lsocket -lnsl -lw -lc
-#endif
-
-#ifndef SharedUilReqs
-# define SharedUilReqs $(LDPRELIBS) $(MRESOURCELIB) $(XMLIB) SharedXReqs -lgen -lsocket -lnsl -lw -lc
-#endif
-
-#ifndef SharedDtSvcReqs
-# define SharedDtSvcReqs $(LDPRELIBS) $(TTLIB) $(XMLIB) SharedXReqs
-#endif
-
-#ifndef SharedDtMmdbReqs
-# define SharedDtMmdbReqs $(LDPRELIBS) $(DTSVCLIB) $(TTLIB) $(XMLIB) SharedXReqs
-#endif
-
-#ifndef SharedDtHelpReqs
-# define SharedDtHelpReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXReqs
-#endif
-
-#ifndef DtClientExtraLibs
-# define DtClientExtraLibs -lresolv
-#endif
-
-REGEXSYSLIB = -lgen
-DYNLIBSYSLIB = -ldl
-
-#ifndef IafSysLib
-# define IafSysLib	-liaf
-#endif
-IAFSYSLIB = IafSysLib
--- a/Xvnc/config/cf/svr3.cf
+++ /dev/null
@@ -1,335 +0,0 @@
-XCOMM $XConsortium: svr3.cf /main/1 1996/10/31 14:47:37 kaleb $
-
-
-
-XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.9.2.1 1997/05/24 13:38:09 dawes Exp $
-
-#ifndef HasGcc
-#define HasGcc      YES
-#endif
-#ifndef HasGcc2
-#define HasGcc2     YES
-#endif
-#ifndef GccUsesGas
-#define GccUsesGas  NO
-#endif
-#ifndef UseGas
-#define UseGas      NO
-#endif
-#ifndef GnuCpp
-#define GnuCpp      NO
-#endif
-
-#ifndef Gcc2MOption
-# if HasGcc2
-#  define Gcc2MOption /* */
-# else
-#  define Gcc2MOption /* */
-# endif
-#endif
-
-#ifndef HasShadowPasswd
-# define HasShadowPasswd	YES
-#endif
-
-#ifndef HasLibCrypt
-# define HasLibCrypt		NO
-#endif
-
-#ifndef HasSVR3mmapDrv
-# define HasSVR3mmapDrv		NO
-#endif
-
-#if HasSVR3mmapDrv
-# define SVR3mmapFlags		-DHAS_SVR3_MMAPDRV
-#else
-# define SVR3mmapFlags 		/**/
-#endif
-
-#ifndef HasSockets
-# define HasSockets		YES
-#endif
-
-#ifndef XmanSearchPath
-#define XmanSearchPath		/usr/man
-#endif
-
-/*
- *	Most SVR3 do not have symbolic links, only some of the newer ones
- */
-#ifndef HasSymLinks
-# define HasSymLinks NO
-#endif
-
-#ifndef StripInstalledPrograms
-# define StripInstalledPrograms	YES
-#endif
-
-#ifndef MotifBC
-# define MotifBC	       	YES
-#endif
-
-#ifndef CompressAllFonts
-# define CompressAllFonts	YES
-#endif
-
-/*
- * A default OS name
- */
-#ifndef OSName
-#ifdef i386Architecture
-#define	OSName	UNIX System V/386 Release 3
-#else
-#define	OSName	UNIX System V Release 3
-#endif
-#endif
-#ifndef OSVendor
-#define OSVendor /**/
-#endif
-
-/*
- * The default version will be 3.0.0 which should be
- * the least common denominator of all SVR3
- */
-
-#ifndef OSMajorVersion
-#define	OSMajorVersion	3
-#endif
-#ifndef OSMinorVersion
-#define	OSMinorVersion	0
-#endif
-#ifndef OSTeenyVersion
-#define	OSTeenyVersion	0
-#endif
-#ifndef BootstrapCFlags
-#ifdef SYSV386
-#define BootstrapCFlags         -DSYSV -DSYSV386
-#else
-#define BootstrapCFlags         -DSYSV
-#endif
-#endif
-
-/* Some stuff that all SYSV's should have */
-
-#define SystemV	YES
-
-#ifndef NeedBerklib
-#define NeedBerklib	YES
-#endif
-#ifndef HasPoll
-#define HasPoll		YES
-#endif
-#ifndef SVR3Architecture
-#define SVR3Architecture
-#endif
-#ifndef PatheticCpp
-#define PatheticCpp	YES
-#endif
-
-#ifndef StandardDefines
-#ifdef i386Architecture
-#define StandardDefines		-DSYSV OSDefines -Di386
-#else
-#define StandardDefines		-DSYSV OSDefines
-#endif
-#endif
-
-#ifndef ServerOSDefines
-# ifdef i386Architecture
-#  define ServerOSDefines -DDDXTIME XFree86ServerOSDefines -DPART_NET
-# else
-#  define ServerOSDefines -DDDXTIME
-# endif
-#endif
-
-#ifndef XawI18nDefines
-# define XawI18nDefines          -DUSE_XWCHAR_STRING
-#endif
-
-#ifndef DefaultCDebugFlags
-# if HasGcc2
-#  if defined(i386Architecture)
-#   define DefaultCDebugFlags DefaultGcc2i386Opt
-#  else
-#   define DefaultCDebugFlags -O2
-#  endif
-# else
-#  define DefaultCDebugFlags -O
-# endif
-#endif
-
-#ifndef LdCombineFlags
-#define LdCombineFlags	-r
-#endif
-
-#if HasGcc
-# if HasGcc2
-#  define DefaultCCOptions Gcc2MOption -DNO_ASM -fpcc-struct-return \
-			   -fwritable-strings
-#  define LibraryCCOptions Gcc2MOption -DNO_ASM -fpcc-struct-return
-#  if defined(i386Architecture)
-#   define OptimizedCDebugFlags DefaultGcc2i386Opt
-#  else
-#   define OptimizedCDebugFlags -O2
-#  endif
-# else
-#  define DefaultCCOptions -DNO_ASM -fpcc-struct-return -fwritable-strings
-#  define LibraryCCOptions -DNO_ASM -fpcc-struct-return
-#  define OptimizedCDebugFlags -O -fstrength-reduce
-# endif
-# define ShlibDefines -D__GNUC__ $(XDMAUTHDEFS)
-#else
-# define ShlibDefines $(XDMAUTHDEFS)
-#endif
-
-#ifndef Malloc0ReturnsNull
-#define Malloc0ReturnsNull	YES
-#endif
-
-#ifndef SocketLibraries
-# define SocketLibraries /**/
-#endif
-#ifndef LocalLibraries
-# define LocalLibraries /**/
-#endif
-#ifndef ExtraLibraries
-# if HasSockets
-#  define ExtraLibraries SocketLibraries LocalLibraries
-# else
-#  define ExtraLibraries LocalLibraries
-# endif
-#endif
-
-#if RemoveDSDENroffMacros
-# define RemoveDSDENroffMacrosCmd sed -e '/^\.D[S|E]$$/d' 
-#else
-# define RemoveDSDENroffMacrosCmd cat
-#endif
-
-#ifndef ConnectionFlags
-# define ConnectionFlags	-DLOCALCONN -DTCPCONN
-#endif
-
-#ifndef FormattedManPages
-# define FormattedManPages	YES
-#endif
-
-#ifndef ManSuffix
-# define ManSuffix               1x
-# define ManDir			$(MANSOURCEPATH)1
-#endif
-#ifndef LibManSuffix
-# define LibManSuffix            3x
-# define LibmanDir		$(MANSOURCEPATH)3
-#endif
-#ifndef FileManSuffix
-# define FileManSuffix           4
-#endif
-
-/*
- * Compress manual pages, default on ISC and SCO
- */
-#ifndef CompressManPages
-# define CompressManPages        YES
-#endif
-
-/*
- * The .DS and .DE macros used in some manual pages are obsolete
- * in the often used ISC's Textprocessing Workbench 2.1.0 and break it,
- * so it's better to remove these previously
- */
-#ifndef RemoveDSDENroffMacros
-# define RemoveDSDENroffMacros   NO
-#endif
-
-#if RemoveDSDENroffMacros
-# define RemoveDSDENroffMacrosCmd sed -e '/^\.D[S|E]$$/d' 
-#else
-# define RemoveDSDENroffMacrosCmd cat
-#endif
-
-#ifndef CompressManCmd
-# define CompressManCmd @true
-#endif
-
-     RMDSDEMACCMD = RemoveDSDENroffMacrosCmd
-   COMPRESSMANCMD = CompressManCmd
-
-#if FormattedManPages
-
-#ifndef InstallManPageLong
-#define InstallManPageLong(file,destdir,dest)                           @@\
-install.man:: file.man                                                  @@\
-        MakeDir($(DESTDIR)destdir)                                      @@\
-        $(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)*                      @@\
-        $(RMDSDEMACCMD) file.man | neqn | nroff -man >/tmp/file.man     @@\
-        $(INSTALL) -c $(INSTMANFLAGS) /tmp/file.man $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\
-        -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.$(MANSUFFIX)          @@\
-        $(RM) /tmp/file.man
-#endif
-
-#ifndef InstallGenManPageLong
-#define InstallGenManPageLong(file,destdir,dest,suffix)                 @@\
-install.man:: file.man                                                  @@\
-        MakeDir($(DESTDIR)destdir)                                      @@\
-        $(RM) $(DESTDIR)destdir/dest.suffix*                            @@\
-        $(RMDSDEMACCMD) file.man | neqn | nroff -man >/tmp/file.man     @@\
-        $(INSTALL) -c $(INSTMANFLAGS) /tmp/file.man $(DESTDIR)destdir/dest.suffix @@\
-        -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.suffix                @@\
-        $(RM) /tmp/file.man
-#endif
-
-#ifndef InstallMultipleMan
-#define InstallMultipleMan(list,dest)                                   @@\
-install.man:: list                                                      @@\
-	MakeDir($(DESTDIR)dest)						@@\
-        @case '${MFLAGS}' in *[i]*) set +e;; esac; \                    @@\
-        for i in list; do \                                             @@\
-                (set -x; \                                              @@\
-                MNAME=`echo $$i | cut -f1 -d.`; \			@@\
-                $(RM) $(DESTDIR)dest/$${MNAME}*; \                      @@\
-                $(RMDSDEMACCMD) $$i | neqn | nroff -man >/tmp/$$i; \    @@\
-                $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$i $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \      @@\
-                $(COMPRESSMANCMD) $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \  @@\
-                $(RM) /tmp/$$i); \                                      @@\
-        done
-#endif
-
-/*
- * InstallManPageAliases - generate rules to install manual page aliases.
- * (Make hard links on SVR3.)
- */
-#ifndef InstallManPageAliases
-#define InstallManPageAliases(file,destdir,aliases)                     @@\
-install.man::                                                           @@\
-        @(SUFFIX=`echo $(DESTDIR)destdir/file.* | cut -f2,3 -d.`; \     @@\
-        for i in aliases; do (set -x; \                                 @@\
-        $(RM) $(DESTDIR)destdir/$$i.*; \                                @@\
-        (cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \                  @@\
-        $$i.$${SUFFIX})); \                                             @@\
-        done)
-#endif
-
-#ifndef InstallGenManPageAliases
-#define InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
-	InstallManPageAliases(file,destdir,aliases)
-#endif
-
-#endif /* FormattedManPages */
-
-/* If you have trouble with make bombing out in Xlib, try uncommenting this. */
-/* You will not get dependencies as a result, but better than nothing. */
-#ifndef MakeHashTableBug
-#define MakeHashTableBug        NO
-#endif
-
-#if MakeHashTableBug
-#define DependTarget3(srcs1,srcs2,srcs3)
-#endif
-
-#include <sv3Lib.rules>
-
-#ifdef i386Architecture
-#include <xfree86.cf>
-#endif
-
--- a/Xvnc/config/cf/svr4.cf
+++ /dev/null
@@ -1,217 +0,0 @@
-XCOMM $TOG: svr4.cf /main/17 1997/06/08 20:08:31 kaleb $
-XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.25.2.2 1997/07/05 15:55:30 dawes Exp $
-/*
- * A default OS name
- */
-#ifndef OSName
-#ifdef i386Architecture
-#define	OSName	UNIX System V/386 Release 4
-#else
-#define	OSName	UNIX System V Release 4
-#endif
-#endif
-#ifndef OSVendor
-#define OSVendor /**/
-#endif
-
-/*
- * The default version will be 4.0.0 which should be
- * the least common denominator of all SVR4
- */
-
-#ifndef OSMajorVersion
-#define	OSMajorVersion	4
-#endif
-#ifndef OSMinorVersion
-#define	OSMinorVersion	0
-#endif
-#ifndef OSTeenyVersion
-#define	OSTeenyVersion	0
-#endif
-#ifndef BootstrapCFlags
-#ifdef i386Architecture
-#define BootstrapCFlags		-DSVR4 -Di386
-#else
-#ifdef SYSV386
-#define BootstrapCFlags		-DSVR4 -Di386
-#else
-#define BootstrapCFlags		-DSVR4
-#endif
-#endif
-#endif
-
-/* Some stuff that all SVR4s should have */
-
-#define SystemV4		YES
-#ifndef HasLdRunPath
-#define HasLdRunPath		YES
-#endif
-#define HasPoll			YES
-#ifndef SVR4Architecture
-#define SVR4Architecture
-#endif
-#ifndef PatheticCpp
-#define PatheticCpp		YES
-#endif
-#define Malloc0ReturnsNull	YES		/* in case -lmalloc used */
-
-/*
- * Here are the default paths to use to pick up tools for building.
- */
-#ifndef ArCmdBase
-#define	ArCmdBase	/usr/ccs/bin/ar
-#endif
-#ifndef AsCmd
-#define	AsCmd	/usr/ccs/bin/as
-#endif
-#ifndef CppCmd
-#define	CppCmd	/usr/ccs/lib/cpp
-#endif
-#ifndef LdCmd
-#define	LdCmd	/usr/ccs/bin/ld
-#endif
-#ifndef LexCmd
-#define	LexCmd	/usr/ccs/bin/lex
-#endif
-#ifndef MakeCmd
-#define	MakeCmd	/usr/ccs/bin/make
-#endif
-#ifndef YaccCmd
-#define	YaccCmd	/usr/ccs/bin/yacc
-#endif
-#ifndef MkdirHierCmd
-#define MkdirHierCmd mkdir -p
-#endif
-
-#ifndef SunArchitecture
-/*
- * These come from usl.cf, and at least some are required by other
- * SVR4 versions
- */
-#ifndef UseLocalRegex
-#define UseLocalRegex		YES
-#endif
-#ifndef XmDefines
-#define XmDefines		\
-	-DNO_REGCOMP -DNEED_STRCASECMP \
-	-DSUPPORT_ZERO_WIDTH -DHAS_WIDECHAR_FUNCTIONS
-#endif
-#ifndef DtSvcDefines
-#define DtSvcDefines		-DXK_MISCELLANY -DMULTIBYTE -DNO_REGCOMP
-#endif
-#ifndef DtSearchDefines
-#define DtSearchDefines		-DI18N_MSG DtSvcDefines
-#endif
-#ifndef DtWidgetDefines
-#define DtWidgetDefines		DtSearchDefines
-#endif
-#ifndef DtPrintDefines
-#define DtPrintDefines		DtSearchDefines
-#endif
-#ifndef HasStrcasecmp
-#define HasStrcasecmp		NO
-#endif
-#endif
-
-#ifndef SunArchitecture
-#if (OSMinorVersion == 0)
-#ifndef XawI18nDefines
-#define XawI18nDefines		-DUSE_XWCHAR_STRING
-#endif
-#endif
-#endif
-
-#ifndef HasGcc2
-#define HasGcc2 NO
-#endif
-#ifndef HasGcc
-#define HasGcc HasGcc2
-#endif
-
-#ifdef i386Architecture
-#ifndef SunArchitecture
-#if (OSMinorVersion > 2) || ((OSMinorVersion == 2) && (OSTeenyVersion >= 2))
-#ifndef StandardDefines
-#define StandardDefines		-DSVR4 -DSVR42MP -Di386
-#endif
-#ifndef HasParallelMake
-#define HasParallelMake		YES
-#endif
-#if HasParallelMake
-#define ParallelDefines		-P -B
-#define MutexDirective		.MUTEX
-#endif
-#else /* SVR4 < 4.2.2 */
-#ifndef StandardDefines
-#define StandardDefines		-DSVR4 -Di386
-#endif
-#endif
-#endif
-#ifndef ToolkitStringsABIOptions
-#define ToolkitStringsABIOptions -intelabi -earlyR6bc
-#endif
-#ifndef DefaultCCOptions
-#if !HasGcc
-#define DefaultCCOptions -Xa -Dasm=__asm
-#else
-#ifdef UseInstalled
-#define DefaultCCOptions /**/
-#else
-#define DefaultCCOptions -ansi -pedantic
-#endif
-#endif
-#endif
-#ifndef DefaultCDebugFlags
-#if HasGcc
-#if HasGcc2
-#define DefaultCDebugFlags DefaultGcc2i386Opt
-#else
-#define DefaultCDebugFlags -O2
-#endif
-#else
-#define DefaultCDebugFlags -O
-#endif
-#endif
-#ifndef ServerOSDefines
-#define ServerOSDefines -DDDXTIME XFree86ServerOSDefines
-#endif
-#ifndef BuildDynamicLoading
-#define BuildDynamicLoading NO
-#endif
-#if BuildDynamicLoading
-#define ServerExtraSysLibs -ldl
-#endif
-#endif
-
-/*
- * The TLI interface is more robust on most SVR4s, so it will be the default.
- */
-#if !defined(SunArchitecture)
-#ifndef ConnectionFlags
-#define ConnectionFlags	-DSTREAMSCONN -DUNIXCONN -DLOCALCONN
-#endif
-#endif
-
-#ifndef ManSuffix
-#define ManSuffix               1x
-#define ManDir			$(MANSOURCEPATH)1
-#endif
-#ifndef LibManSuffix
-#define LibManSuffix            3x
-#define LibmanDir		$(MANSOURCEPATH)3
-#endif
-#ifndef FileManSuffix
-#define FileManSuffix           4
-#endif
-
-#ifndef StaticLibrary
-#if !HasGcc
-#define StaticLibrary(libpath,libname) -B static Concat(-L,libpath) Concat(-l,libname) -B dynamic
-#endif
-#endif
-
-#ifdef i386Architecture
-#include <xfree86.cf>
-#endif
-
-#include <sv4Lib.rules>
--- a/Xvnc/config/cf/ultrix.cf
+++ /dev/null
@@ -1,77 +0,0 @@
-XCOMM platform:  $XConsortium: ultrix.cf /main/68 1996/09/28 16:13:46 rws $
-
-#ifndef OSName
-# define OSName		DefaultOSName
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion	DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion DefaultOSMinorVersion
-#endif
-XCOMM operating system: OSName (OSMajorVersion.OSMinorVersion)
-
-#define HasNdbm YES
-#define HasPutenv YES
-#define HasShm YES
-#define LintLibFlag -o
-#define LintOpts -ax
-
-#if HasDECnet
-#define ExtraLibraries -ldnet
-#endif
-
-#if ThreadedX
-/* if you want to experiment, turn this on, but no guarantees */
-#define HasThreadSafeAPI	NO
-#define HasPosixThreads		YES
-#define ThreadPreStdAPIDefines	-DXPRE_STANDARD_API
-#define ExtraLibraries		-lpthreads -li
-#endif
-
-#ifdef VaxArchitecture
-#define PexNativeFPFormat PEXDEC_F_Floating
-#define NativeFPFormat DEC_F_Float
-#define UnalignedReferencesAllowed YES	       /* if arbitrary deref is okay */
-#define BuildServer NO
-#endif
-
-#ifdef MipsArchitecture
-#if OSMajorVersion > 4 || (OSMajorVersion == 4 && OSMinorVersion >= 2)
-/*#define XdecServer YES
-#define ServerOSDefines -DDDXTIME*/
-/* Even under ultrix 4.2, the compiler miscompiles some alloca calls */
-#define AllocateLocalDefines /* -DINCLUDE_ALLOCA_H */
-#else
-#define BuildServer NO
-#define AllocateLocalDefines /**/
-#endif
-#if !HasGcc
-#define NeedFunctionPrototypes YES
-#define PexCCOptions -Wf,-XNp15000,-XNd15000
-/*
- * NormalLibObjCompile - compile fragment for a library object file
- * 	do ld -x to remove line number symbols for libraries
- */
-#define NormalLibObjCompile(options) $(RM) $@ $*.os \			@@\
-	&& $(CC) -c options $(CFLAGS) $*.c \				@@\
-	&& $(LD) $(LDSTRIPFLAGS) -r $@ -o $*.os \			@@\
-	&& $(MV) $*.os $@
-#endif
-#endif
-
-#if HasGcc
-#ifdef VaxArchitecture
-#define CcCmd gcc -ansi -Dvax -Dultrix -fpcc-struct-return
-#endif
-#ifdef MipsArchitecture
-#define CcCmd gcc -ansi -Dmips -Dultrix -fpcc-struct-return
-#endif
-#define ServerCCOptions /* */
-#define AllocateLocalDefines /* */
-#endif
-
-#define ServerExtraDefines AllocateLocalDefines
-#define HasWChar32 YES
-
-#define MotifDefines		-DNO_REGEX -DNO_REGCOMP -DNO_CONST
--- a/Xvnc/config/cf/usl.cf
+++ /dev/null
@@ -1,112 +0,0 @@
-XCOMM platform:  $TOG: usl.cf /main/50 1997/04/17 14:11:39 barstow $
-
-
-
-
-XCOMM platform:  $XFree86: xc/config/cf/usl.cf,v 3.13.2.1 1997/05/03 09:43:10 dawes Exp $
-
-#ifndef OSName
-# define OSName		DefaultOSName
-#endif
-#ifndef OSMajorVersion
-# define OSMajorVersion	DefaultOSMajorVersion
-#endif
-#ifndef OSMinorVersion
-# define OSMinorVersion	DefaultOSMinorVersion
-#endif
-#ifndef OSTeenyVersion
-# define OSTeenyVersion	DefaultOSTeenyVersion
-#endif
-XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
-
-#ifndef  CcCmd
-# define CcCmd			/usr/ccs/bin/cc
-#endif
-#ifndef  CplusplusCmd
-# define CplusplusCmd		/usr/ccs/bin/CC
-#endif
-#ifndef  CplusplusFilt
-# define CplusplusFilt		/usr/ccs/bin/c++filt
-#endif
-#ifndef  CplusplusDependIncludes
-# define CplusplusDependIncludes	-I/usr/include/CC
-#endif
-
-#define BootstrapCFlags		/* none needed */
-#define StandardDefines		-DUSL -DSVR4 -Di386
-#define NeedWidePrototypes	NO	/* experimental */
-#define ServerExtraDefines	-D__USLC__ XFree86ServerDefines
-#define ServerOSDefines		-DDDXTIME XFree86ServerOSDefines
-#define ToolkitStringsABIOptions -intelabi
-#if OSMajorVersion < 2
-#define XawI18nDefines		-DHAS_WCTYPE_H -DHAS_ISW_FUNCS
-#else
-#define XawI18nDefines		-DHAS_WCHAR_H -DHAS_ISW_FUNCS
-#endif
-#if OSTeenyVersion > 1
-# define ExtraLibraries		-lsocket -lnsl -lgen -lw
-# define ThreadedX		YES
-# define HasThreadSafeAPI	NO
-/* UnixWare does not have MT-safe pwd routines. */
-# define MTSafeAPIDefines	\
--DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI -DXNO_MTSAFE_GRPAPI
-# define SystemMTDefines	-D_REENTRANT
-# define ThreadsLibraries	-lthread
-# define ThreadsCplusplusLibraries	-lthread
-# define DefaultCCOptions	-W0,-2A -Xa -Dasm=__asm
-#endif
-#define BuildLibPathVar	  LD_LIBRARY_PATH
-
-#ifndef UseExportLists
-# define UseExportLists YES
-#endif
-
-#define GencatFlags		-m
-
-#include <svr4.cf>
-
-/*
- * When generating templates the UnixWare 2.02 C++ compiler leaves
- * protected .i files behind.  Remove them so other people can
- * compile too.
- */
-#ifndef ObjectCplusplusCompile
-#define ObjectCplusplusCompile(options) RemoveFiles($@ $*.i)		@@\
-	ClearmakeOSName \
-	$(CXX) -c $(CXXFLAGS) options $*.CCsuf
-#endif
-
-/* USL does not have a shared regex library. */
-#define UseLocalRegex		YES
-
-#define XmDefines		\
-	-DNO_REGCOMP -DNEED_STRCASECMP \
-	-DSUPPORT_ZERO_WIDTH -DHAS_WIDECHAR_FUNCTIONS
-#define DtSvcDefines		-DXK_MISCELLANY -DMULTIBYTE -DNO_REGCOMP
-#define DtSearchDefines		-DI18N_MSG DtSvcDefines
-#define DtWidgetDefines		DtSearchDefines
-#define DtPrintDefines		DtSearchDefines
-
-#define HasStrcasecmp		NO
-
-/* For DtHelp's TIFF processing routines. */
-#define LSBBitOrder		YES
-
-#define ArchitectureDefines	-DUSL_ARCHITECTURE
-
-#define ExportListGenSource	elistgen.usl
-#define ShlibExportListOpt(filename)	Concat(-Bexport:,filename)
-
-/* Remove -lc because select.o is not relocatable. */
-/* Remove -lgen (and set UseLocalRegex) because no shared library exists. */
-#define SharedXmReqs $(LDPRELIBS) SharedXReqs -lsocket -lnsl -lw
-#define SharedMrmReqs $(LDPRELIBS) $(XMLIB) SharedXReqs -lsocket -lnsl -lw
-#define SharedUilReqs $(LDPRELIBS) $(MRESOURCELIB) $(XMLIB) SharedXReqs -lsocket -lnsl -lw
-  
-/* <X11/Xos_r.h> requires process locking for missing _r functions */
-#define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
-#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
-
-#define CdeProjectDefines \
-	-DANSICPP -DMULTIBYTE -DNLS16 -DNEED_STRCASECMP \
-	-DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion
--- a/Xvnc/config/cf/vnc.def
+++ /dev/null
@@ -1,156 +0,0 @@
-/*****************************************************************************/
-/*
- * vnc.def
- *
- * Some imake configuration defines for building Xvnc.  If you build Xvnc
- * on a new platform you may need to change things in here.  If possible
- * try and make changes here rather than in the vendor .cf file to make it
- * easier to upgrade to later versions of the XFree86 distribution.
- */
-
-#ifdef BeforeVendorCF
-
-#include "platform.def"
-
-/*****************************************************************************/
-/*
- * First try to switch off all the extras that we don't want.  This includes
- * all sorts of extensions, and any X servers for particular hardware.  You
- * should be able to put back any extensions you want by getting the code from
- * the XFree86 distribution and changing the #define here to YES.
- */
-
-#define BuildFontServer		NO
-#define BuildFonts		NO
-#define BuildXInputExt		NO
-#define BuildScreenSaverExt	NO
-#define BuildPexExt		NO
-#define BuildXIE		NO
-#define BuildXIElib		NO
-#define BuildGlxExt             NO
-#define BuildXKB		NO
-#define BuildXKBlib		NO
-#define BuildLBX		NO
-#define BuildXprint		NO
-#define BuildDBE		NO
-#define BuildDBElib		NO
-#define BuildRECORD		NO
-#define BuildRECORDlib		NO
-#define BuildScreenSaverLibrary	NO
-#define BuildXF86MiscLibrary	NO
-#define BuildXF86DGALibrary	NO
-#define BuildXF86VidModeLibrary	NO
-#define BuildDPMSLibrary	NO
-#define BuildXKBuilib		NO
-#define BuildXF86DGA		NO
-#define BuildDPMSExt		NO
-#define BuildXF86VidModeExt	NO
-#define BuildXF86MiscExt	NO
-#define BuildXF86Setup		NO
-#define BuildAppgroup		NO
-#define BuildXCSecurity		NO
-#define BuildPC98Servers	NO
-
-#define X386Server              NO
-#define XF68FBDevServer         NO
-#define XF86AGXServer           NO
-#define XF86I128Server          NO
-#define XF86I8514Server         NO
-#define XF86Mach32Server        NO
-#define XF86Mach64Server        NO
-#define XF86Mach8Server         NO
-#define XF86MonoDualServer      NO
-#define XF86MonoServer          NO
-#define XF86P9000Server         NO
-#define XF86S3Server            NO
-#define XF86S3VServer           NO
-#define XF86SVGAServer          NO
-#define XF86TGAServer           NO
-#define XF86VGA16DualServer     NO
-#define XF86VGA16Server         NO
-#define XF86W32Server           NO
-#define XF98EGCServer           NO
-#define XF98GA968Server         NO
-#define XF98GANBWAPServer       NO
-#define XF98MGAServer           NO
-#define XF98NEC480Server        NO
-#define XF98NECS3Server         NO
-#define XF98NKVNECServer        NO
-#define XF98PWLBServer          NO
-#define XF98PWSKBServer         NO
-#define XF98SVGAServer          NO
-#define XF98TGUIServer          NO
-#define XF98WABEPServer         NO
-#define XF98WABSServer          NO
-#define XF98WSNAServer          NO
-#define XVirtualFramebufferServer	NO
-#define XdecServer              NO
-#define XhpServer               NO
-#define XmacIIServer            NO
-#define XmipsServer             NO
-#define XnestServer             NO
-#define XprtServer              NO
-#define Xsun24Server            NO
-#define XsunAmoebaMonoServer    NO
-#define XsunAmoebaServer        NO
-#define XsunMonoServer          NO
-#define XsunServer              NO
-
-
-/*****************************************************************************/
-/*
- * All we want to build is the Xvnc server
- */
-
-#define XvncServer		YES
-#define BuildServersOnly	YES
-#define BuildServer		YES
-
-#define XVendorString		\"AT&T Laboratories Cambridge\"
-#define XVendorRelease		3332
-#define XvncRelease		\"TightVNC-1.3.10\"
-
-
-/*****************************************************************************/
-/*
- * Try to work out the default X installation place for various platforms.
- * You may need to change this.
- */
-
-#ifdef SunArchitecture
-#define ProjectRoot /usr/openwin
-#else
-#ifdef LinuxArchitecture
-#define ProjectRoot /usr/X11R6
-#endif
-#endif
-
-#endif /* BeforeVendorCF */
-
-#ifdef AfterVendorCF
-
-#ifdef AIXArchitecture
-#ifdef XibmServer
-# undef XibmServer
-#endif
-#define XibmServer NO
-
-#ifdef ExtensionOSDefines
-# undef ExtensionOSDefines
-#endif 
-#define ExtensionOSDefines 
-#endif
-
-#ifdef HPArchitecture
-#ifdef XhpServer
-# undef XhpServer
-#endif
-#define XhpServer NO
-
-#ifdef ExtensionOSDefines
-# undef ExtensionOSDefines
-#endif 
-#define ExtensionOSDefines 
-#endif
-
-#endif /* AfterVendorCF */
--- a/Xvnc/config/cf/vnclibs.def
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * vnclibs.def - tells Xvnc where to pick up VNC libraries (i.e. libvncauth)
- *
- * Don't forget you need to remake the Makefiles in programs/Xserver
- * and programs/Xserver/hw/vnc whenever you change this file.
- */
-
-VNCLIBS = $(TOP)/../libvncauth/libvncauth.a
-
-#ifdef OSF1Architecture
-/* Avoid linking with different libjpeg in /usr/shlib under Tru64. */
-VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a -lcrypt
-#else
-VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz -lcrypt
-#endif
-
-VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include
--- a/Xvnc/config/cf/x386.cf
+++ /dev/null
@@ -1,149 +0,0 @@
-XCOMM platform:  $XConsortium: x386.cf /main/15 1996/09/28 16:14:00 rws $
-
-/*****************************************************************************
- *			  Site-specfic parameters                            *
- *****************************************************************************/
-
-/*
- * there are some switches to set appropriate...
- */
-
-#define HasGcc			YES	/* doesn't work for SVR4 */
-#define HasNdbm			YES	/* correct for GNU dbm & SVR4 */
-#define StripInstalledPrograms	YES
-#define X386Server		YES
-#define ExtensionOSDefines	-DXTESTEXT1
-#define MotifBC	        	YES
-
-/*****************************************************************************
- *                        Do not change anything below                       *
- *****************************************************************************/
-
-/* You must manually compute BootstrapCFlags for initial build */
-#define BootstrapCFlags		OSDefines OSRelease
-
-#define StandardDefines		OSDefines OSRelease
-#define LdCombineFlags		-r
-
-#if defined(i386SVR3Architecture)
-
-#define SystemV			YES
-
-#define NeedBerklib		YES
-#define HasSymLinks		NO
-
-/*
- * V/386 Release 3.2
- */
-#ifdef ISC
-/* INTERACTIVE UNIX Version 2.2.1 */
-# define OSVendor		"Interactive System Corp."
-# define OSDefines		-DISC
-# define LocalLibraries		-lpt
-# define PosixLibraries		-lcposix
-# define SocketLibraries        -linet
-#endif
-
-#ifdef ESIX
-#define OSVendor		"ESIX System Inc."
-#define OSDefines		-DESIX
-#define LocalLibraries		-lpt
-#define SocketLibraries		-lnet -lnsl_s
-#define PosixLibraries		/**/
-#endif
-
-#ifdef ATT
-#define OSDefines		-DATT
-#define OSVendor		"AT&T"
-#define LocalLibraries		-lpt
-#define SocketLibraries		-lnet -lnsl_s    /* just a guess */
-#define PosixLibraries		/**/
-#endif
-
-#define OSName			Unix System V/386 Release 3.2
-#define OSMajorVersion		3
-#define OSMinorVersion		2
-#define OSRelease		-DSYSV -DSYSV386
-
-#if HasGcc
-# define CcCmd gcc -DNO_ASM -fstrength-reduce -fpcc-struct-return -fwritable-strings
-# define LibraryCcCmd gcc -DNO_ASM -fstrength-reduce -fpcc-struct-return
-# define ShlibDefines -D__GNUC__ -DGNULIB=/usr/local/lib/gcc-gnulib
-#else
-# define ShlibDefines /**/
-#endif
-
-#if HasSockets
-/* # define ConnectionFlags -DLOCALCONN -DTCPCONN */
-# define ConnectionFlags -DTCPCONN
-# define ExtraLibraries SocketLibraries LocalLibraries -lc_s PosixLibraries
-#else
-# define ConnectionFlags -DLOCALCONN
-# define ExtraLibraries $(LIBDIR)/etc/inetemul.o LocalLibraries -lc_s PosixLibraries
-#endif
-
-/* #include <sv3Lib.rules> */  /* not working yet */
-
-/*
- * Man pages need to be formatted when installed, so override the default
- * imake rules.
- */
-#define InstallManPageLong(file,destdir,dest)                           @@\
-install.man:: file.man                                                  @@\
-	$(RM) destdir/dest.$(MANSUFFIX)					@@\
-	cat file.man | $(NEQN) | $(NROFF) $(MANMACROS) >/tmp/file.man	@@\
-	$(INSTALL) -c $(INSTMANFLAGS) /tmp/file.man destdir/dest.$(MANSUFFIX) @@\
-	$(RM) /tmp/file.man
-
-#define InstallMultipleMan(list,dest)                                   @@\
-install.man:: list                                                      @@\
-	@MakeFlagsToShellFlags(i,set +e); \				@@\
-	for i in list; do \                                             @@\
-		(set -x; \						@@\
-		$(RM) dest/$$i; \					@@\
-		cat $$i | $(NEQN) | $(NROFF) $(MANMACROS) >/tmp/$$i; \	@@\
-		$(INSTALL) -c $(INSTMANFLAGS) /tmp/$$i dest/$$i; \	@@\
-		$(RM) /tmp/$$i); \					@@\
-	done
-
-/* If you have trouble with make bombing out in Xlib, try uncommenting this. */
-/* You will not get dependencies as a result, but better than nothing. */
-/* #define DependTarget3(srcs1,srcs2,srcs3) */
-
-#endif /* i386SVR3Architecture */
-
-
-/*
- * V/386 Release 4.0
- */
-#if defined(i386SVR4Architecture)
-
-#define SystemV4		YES
-
-/* this is now just for Dell's one */
-
-#ifdef DELL
-#define OSDefines		-DDELL
-#define OSVendor		"DELL Computer Corp."
-#endif
-
-#define OSName			Unix System V/386 Release 4.0
-#define OSMajorVersion		4
-#define OSMinorVersion		0
-#define OSRelease		-DSVR4 -DSYSV386
-
-#if HasGcc
-# define CcCmd 		gcc -ansi -fstrength-reduce -fpcc-struct-return -Di386
-# if HasSharedLibraries
-#  define LibraryCcCmd	cc -Xa -Di386 -Dasm=__asm
-# endif
-#else
-# define CcCmd		cc -Xa -Di386 -Dasm=__asm
-#endif
-
-#include <sv4Lib.rules>
-
-#endif /* i386SVR4Architecture */
-
-
-XCOMM operating system:  OSName OSVendor
--- a/Xvnc/config/cf/xf86.rules
+++ /dev/null
@@ -1,186 +0,0 @@
-XCOMM $XConsortium: xf86.rules /main/9 1996/10/31 14:54:26 kaleb $
-XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.16.2.1 1997/05/18 12:00:01 dawes Exp $
-
-/*
- * These rules are needed to build the Xfree86 X Servers
- */
-
-#ifndef CPPOnlyAsm
-#define CPPOnlyAsm(basename,options) RemoveFile(basename.i)		@@\
-	$(CPP) AsmDefines $(DEFINES) $(INCLUDES) options basename.s | \	@@\
-		grep -v '^\#' > basename.i
-#endif
-
-#ifndef AssembleObject
-#define AssembleObject(flags) CPPOnlyAsm($*,flags)			@@\
-	RemoveFile($*.o)						@@\
-	$(AS) -o $*.o $*.i						@@\
-	RemoveFile($*.i)
-#endif
-
-#ifndef NormalAsmObjectRule
-#define NormalAsmObjectRule()						@@\
-.s.o:									@@\
-	AssembleObject($(_NOOP_))					@@\
-									@@\
-.s.i:									@@\
-	CPPOnlyAsm($*,$(_NOOP_))
-#endif
-
-#ifndef ObjectFromSpecialAsmSource
-#define ObjectFromSpecialAsmSource(dst,src,flags)			@@\
-dst.s:  src.s								@@\
-	RemoveFile($@)							@@\
-	$(LN) $? $@							@@\
-									@@\
-dst.o:  dst.s								@@\
-	AssembleObject(flags)						@@\
-									@@\
-dst.i:  dst.s								@@\
-	CPPOnlyAsm(dst,flags)						@@\
-									@@\
-depend:: dst.s								@@\
-									@@\
-clean::									@@\
-	RemoveFile(dst.s)
-#endif
-
-#ifndef ObjectFromAsmSource
-#define ObjectFromAsmSource(src,flags)					@@\
-									@@\
-src.o:  src.s								@@\
-	AssembleObject(flags)						@@\
-									@@\
-src.i:  src.s								@@\
-	CPPOnlyAsm(dst,flags)						@@\
-									@@\
-depend:: src.s
-#endif
-
-#ifndef ObjectMapIncludeFromSpecialSource
-#define ObjectMapIncludeFromSpecialSource(dst,src,flags)		@@\
-dst.c:	src.c								@@\
-	RemoveFile($@)							@@\
-	echo "#include \"mfbmap.h\"" > $@				@@\
-	echo "#include \"$?\"" >> $@					@@\
-									@@\
-SpecialCObjectRule(dst,NullParameter,flags)				@@\
-									@@\
-depend::	dst.c							@@\
-									@@\
-clean::									@@\
-	RemoveFile(dst.c)
-#endif
-
-
-/*
- * Rules for building config files from scripts
- */
-
-#ifndef Depend
-# define Depend depend
-#endif
- 
-#ifndef ConfigTargetLong
-#define ConfigTargetLong(target,dep,script,args,extra)			@@\
-all:: Configure								@@\
-									@@\
-Configure:: target.o							@@\
-									@@\
-target.c: script dep							@@\
-	$(MAKE) $(MFLAGS) Makefile					@@\
-	$(MAKE) $(MFLAGS) extra Concat(Build,target)			@@\
-									@@\
-Concat(Build,target):							@@\
-	$(RM) target.c							@@\
-	$(SHELL) script args						@@\
-									@@\
-clean::									@@\
-	$(RM) target.c
-#endif
-
-#define ConfigTarget(target,dep,script,args) ConfigTargetLong(target,dep,script,args,Depend)
-
-#define ConfigTargetNoDepend(target,dep,script,args) ConfigTargetLong(target,dep,script,args,)
-
-#if !XF86LinkKit
-
-/*
- * Rules for installing LinkKit parts (target is install.linkkit)
- */
-
-#ifndef InstallLinkKitNonExecFile
-#define InstallLinkKitNonExecFile(file,dest)				@@\
-install.linkkit:: file							@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) -c $(INSTDATFLAGS) file $(DESTDIR)dest
-#endif
-
-#ifndef InstallLinkKitLibrary
-#define InstallLinkKitLibrary(libname,dest)				@@\
-install.linkkit:: Concat(lib,libname.a)					@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.a) $(DESTDIR)dest @@\
-	RanLibrary($(RANLIBINSTFLAGS) Concat($(DESTDIR)dest/lib,libname.a))
-#endif
-
-#ifndef InstallLinkKitNamedLibrary
-#define InstallLinkKitNamedLibrary(libname,dlibname,dest)		@@\
-install.linkkit:: Concat(lib,libname.a)					@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.a) \		@@\
-	  Concat($(DESTDIR)dest/lib,dlibname.a)				@@\
-	RanLibrary($(RANLIBINSTFLAGS) Concat($(DESTDIR)dest/lib,dlibname.a))
-#endif
-
-#ifndef InstallLinkKitNamedNonExec
-#define InstallLinkKitNamedNonExec(srcname,dstname,dest)		@@\
-install.linkkit:: srcname						@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) -c $(INSTDATFLAGS) srcname $(DESTDIR)dest/dstname
-#endif
-
-#ifndef InstallLinkKitNamedProg
-#define InstallLinkKitNamedProg(srcname,dstname,dest)			@@\
-install.linkkit:: srcname						@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) -c $(INSTBINFLAGS) srcname $(DESTDIR)dest/dstname
-#endif
-
-#ifndef InstallLinkKitSubdirs
-#define InstallLinkKitSubdirs(dirs) \
-NamedTargetSubdirs(install.linkkit,dirs,"installing link kit",DESTDIR='$(DESTDIR)',install.linkkit)
-#endif
-
-#ifndef InstallLinkKitMultipleDestFlags
-#define InstallLinkKitMultipleDestFlags(list,dest,flags) \
-InstallMultipleDestFlags(install.linkkit,list,dest,flags)
-#endif
-
-#endif /* !XF86LinkKit */
-
-/*
- * DynamicModuleTarget - build a module to be dynamically loaded
- */
-#ifndef DynamicModuleTarget
-#define DynamicModuleTarget(module,modlist)				@@\
-AllTarget(module)							@@\
-									@@\
-module: modlist								@@\
-	RemoveFile($@)							@@\
-	$(LD) -o $@ $(SHLIBLDFLAGS) modlist				@@\
-									@@\
-clean::									@@\
-	RemoveFile(module)
-#endif /* DynamicModuleTarget */
-
-/*
- * InstallDynamicModule - install a dynamic module
- */
-#ifndef InstallDynamicModule
-#define InstallDynamicModule(module,dest)				@@\
-install:: module							@@\
-	MakeDir($(DESTDIR)dest)						@@\
-	$(INSTALL) -c module $(DESTDIR)dest
-#endif
-
--- a/Xvnc/config/cf/xf86.tmpl
+++ /dev/null
@@ -1,65 +0,0 @@
-XCOMM $XConsortium: xf86.tmpl /main/2 1996/10/31 15:01:41 kaleb $
-
-
-
-XCOMM $XFree86: xc/config/cf/xf86.tmpl,v 3.11 1996/12/27 06:50:30 dawes Exp $
-
-#if XF86LinkKit
-    TOP_INCLUDES = TopIncludes
-   IMAKE_DEFINES = -DXF86LinkKit=1
-#ifdef UseInstalled
-       IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(TOP) -I$(IRULESRC) \
-		   $(IMAKE_DEFINES)
-#else
-       IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) $(IMAKE_DEFINES)
-#endif
-
-#undef ImakeSubCmdHelper
-#ifdef UseInstalled
-#define ImakeSubCmdHelper $(IMAKE) -DUseInstalled -I$(IMAKETOP) \
-			  -I$(IRULESRC) $(IMAKE_DEFINES)
-#else
-#define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKETOP) \
-			  -I$(IMAKEPREFIX)$(IRULESRC) $(IMAKE_DEFINES)
-#endif
-#endif
-
-#ifndef JoystickSupport
-#define JoystickSupport		NO
-#endif
-#ifndef WacomSupport
-#define WacomSupport		NO
-#endif
-#ifndef ElographicsSupport
-#define ElographicsSupport	NO
-#endif
-#ifndef SummaSketchSupport
-#define SummaSketchSupport	NO
-#endif
-
-#if BuildDynamicLoading
-       MODULEDIR = $(USRLIBDIR)/modules
-#endif
-
-#if !BuildDynamicLoading && BuildXInputExt
-# if JoystickSupport
-#  define JoystickDefines -DJOYSTICK_SUPPORT
-# else
-#  define JoystickDefines
-# endif
-# if WacomSupport
-#  define WacomDefines -DWACOM_SUPPORT
-# else
-#  define WacomDefines
-# endif
-# if ElographicsSupport
-#  define ElographicsDefines -DELOGRAPHICS_SUPPORT
-# else
-#  define ElographicsDefines
-# endif
-# if SummaSketchSupport
-#  define SummaSketchDefines -DSUMMASKETCH_SUPPORT
-# else
-#  define SummaSketchDefines
-# endif
-#endif
--- a/Xvnc/config/cf/xf86site.def
+++ /dev/null
@@ -1,577 +0,0 @@
-XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.101.2.15 1998/02/24 19:05:42 hohndel Exp $
-/******************************************************************************/
-/*
- * This file is to provide a quick method for most people to change the
- * behaviour of their XFree86 installation without having to fully
- * understand the workings of site.def and all the various '.cf' files.
- *
- * These are the most common settings you would choose for compiling and
- * installing XFree86 on the systems supported by it.
- *
- * A good way to use this file is to copy it to host.def, and make the
- * changes there.  That way, future patches to this file won't fail.
- * The host.def file will never be patched.
- *
- * The distributed version of this file should contain no uncommented
- * definitions.  Such default definitions belong in xfree86.cf.
- */
-/******************************************************************************/
-
-/*
- * If you have build-specific modifications in your host.def file, but
- * want an empty host.def file installed when doing 'make install',
- * uncomment the following
- *
-#define InstallEmptyHostDef
- */
-
-/*
- * If using GCC 2.x on a system where it isn't the default, uncomment
- * the following
- *
-#define HasGcc2		YES
-#define HasGcc		YES
- */
-
-/*
- * If using GCC 2.x with C++ on a system where it isn't the default, uncomment
- * the following.
- *
-#define HasGcc2ForCplusplus	YES
- */
-
-/*
- * The default optimisation flags for GCC 2.x.  -fno-strength-reduce is
- * here to work around a bug in -O2 for GCC 2.x on i386 platforms.
- * If you are using a version that doesn't have this bug, you can
- * uncomment the following line, and remove '-fno-strength-reduce'
- * If you are building binaries for a 486, it may be beneficial to add
- * -m486
- *
-#define DefaultGcc2i386Opt	-O2 -fno-strength-reduce
- */
-
-/*
- * For Linux, this should match the Binutils version you have.  This example
- * is for 2.6.0.7.  See linux.cf for the default setting.
- *
- * This should automatically get set correctly by imake.
- *
-#define LinuxBinUtilsMajorVersion	26
- */
-
-/*
- * For Linux, these should match the libc version you have.  This example
- * is for libc.5.4.x.  See linux.cf for the default setting.
- *
- * This should automatically get set correctly by imake.
- *
-#define LinuxCLibMajorVersion	5
-#define LinuxClibMinorVersion	4
- */
-
-/*
- * If you want to use the GNU malloc library, uncomment this
- *
-#define UseGnuMalloc		YES
- */
-
-/*
- * Set this to whatever is required to access the GNU malloc library.
- * The default is '-lgmalloc' unless is specified in the OS's .cf file.
- *
-#define GnuMallocLibrary	-L/usr/local/lib -lgmalloc
- */
-
-/*
- * To disable the internal Xserver malloc, set this to NO
- *
-#define UseInternalMalloc	YES
- */
-
-/*
- * Some Linux releases don't have a libtermcap.  In this case you may need
- * to uncomment the following
- *
-#define TermcapLibrary		-lncurses
- */
-
-/*
- * If you have Tk (which is required to build XF86Setup), uncomment this
- * Note: version 4.0 or 4.1 is required, and XF86Setup links it statically by
- * default.
- *
-#define HasTk			YES
- */
-
-/*
- * Set the paths and names for your Tk library if they don't match the
- * defaults (check your OS .cf file or Imake.tmpl for the defaults).
- *
- * Common values for TkLibName are tk4.0, tk4.1, etc.
- *
- * Some Linux releases need TkIncDir set to /usr/include/tcl, and some
- * need it set to /usr/X11R6/include.
- *
- * Some Linux releases need TkLibDir set to /usr/X11R6/lib
- *
-#define TkLibDir		/usr/local/lib
-#define TkIncDir		/usr/local/include
-#define TkLibName		tk
- */
-
-/*
- * By default, XF86Setup is linked with a static Tk library.  To change
- * that, uncomment the following line.
- *
-#define XF86SetupUsesStaticTk	NO
- */
-
-/*
- * If you have Tcl (which is required to build XF86Setup), uncomment this
- * Note: version 7.4 or 7.5 is required, and XF86Setup links it statically by
- * default.
- *
-#define HasTcl			YES
- */
-
-/*
- * Set the paths and names for your Tcl library if they don't match the
- * defaults (check your OS .cf file or Imake.tmpl for the defaults).
- *
- * Common values for TclLibName are tcl7.4, tcl7.5, etc.
- *
- * Some Linux releases need TclIncDir set to /usr/include/tcl.
- *
-#define TclLibDir		/usr/local/lib
-#define TclIncDir		/usr/local/include
-#define TclLibName		tcl
- */
-
-/*
- * By default, XF86Setup is linked with a static Tcl library.  To change
- * that, uncomment the following line.
- *
-#define XF86SetupUsesStaticTcl	NO
- */
-
-/*
- * Which servers do you wish to build, you can save a lot of disk space
- * by only compiling the server you will be using.  It will also save you
- * considerable compile time.
- *
- * The following servers are supported in Intel x86 platforms
- *
-#define XF86SVGAServer          NO
-#define XF86VGA16Server         NO
-#define XF86VGA16DualServer	NO
-#define XF86MonoServer          NO
-#define XF86MonoDualServer	NO
-#define XF86S3Server            NO
-#define XF86S3VServer           NO
-#define XF86I8514Server         NO
-#define XF86Mach8Server         NO
-#define XF86Mach32Server        NO
-#define XF86Mach64Server        NO
-#define XF86P9000Server		NO
-#define XF86AGXServer		NO
-#define XF86W32Server		NO
-#define XF86I128Server		NO
- */
-
-/*
- * Which servers do you wish to build, you can save a lot of disk space
- * by only compiling the server you will be using.  It will also save you
- * considerable compile time.
- *
- * The following servers are supported on Digital Alpha platforms:
- *
-#define XF86SVGAServer          NO
-#define XF86MonoServer          NO
-#define XF86S3Server            NO
-#define XF86S3VServer           NO
-#define XF86P9000Server		NO
-#define XF86TGAServer		NO
- */
-
-/*
- * Which servers do you wish to build, you can save a lot of disk space
- * by only compiling the server you will be using.  It will also save you
- * considerable compile time.
- *
- * The following server is supported on Mips/Arc platforms:
- *
-#define XF86S3Server            NO
- */
-
-/*
- * PC98 X servers
- *
- * Uncommenting the following automatically enables all PC98 servers
- *
-#define BuildPC98Servers	YES
- */
-
-/*
- * To enable/disable individual PC98 servers, use these
- *
-#define XF98EGCServer		YES
-#define XF98GANBWAPServer	YES
-#define XF98NEC480Server	YES
-#define XF98NKVNECServer	YES
-#define XF98WABSServer		YES
-#define XF98WABEPServer		YES
-#define XF98WSNAServer		YES
-#define XF98TGUIServer		YES
-#define XF98MGAServer		YES
-#define XF98SVGAServer		YES
-#define XF98NECS3Server		YES
-#define XF98PWSKBServer		YES
-#define XF98PWLBServer		YES
-#define XF98GA968Server		YES
- */
-
-/*
- * The following server is supported on Motorola 68k platforms:
- *
-#define XF68FBDevServer		NO
- */
-
-/*
- * To disable building the Xnest server, uncomment this.
- *
-#define XnestServer		NO
- */
-
-/*
- * To disable building Xvfb, uncomment this.
- *
-#define XVirtualFramebufferServer	NO
- */
-
-/*
- * Set the default server (ie the one that gets the sym-link to "X")
- *
-#define ServerToInstall		XF86_S3
- */
-
-
-/*
- * Server configuration parameters.  The defaults are shown here:
- */
-
-/*
- * SVGA server:
- *
-#define XF86SvgaDrivers		nv et4000 et3000 pvga1 gvga ati sis tvga8900 \
-				cirrus ncr77c22 compaq mga oak al2101 ali \
-				cl64xx video7 ark mx realtek apm \
-				s3v s3_svga chips generic
- */
-
-/*
- * VGA16 server:
- *
-#define XF86Vga16Drivers	et4000 et3000 ncr77c22 ati sis tvga8900 oak \
-				cl64xx generic 
- */
-
-/*
- * VGA2 driver in Mono server:
- *
-#define XF86Vga2Drivers		et4000 et3000 pvga1 gvga ati sis tvga8900 \
-				cirrus ncr77c22 oak cl64xx generic
- */
-
-/*
- * Mono driver in Mono or VGA16 server:
- *
-#define XF86MonoDrivers		hgc1280 sigma apollo hercules
- */
-
-/*
- * ET4000/W32 server:
- *
-#define XF86W32Drivers		et4000w32
- */
-
-/*
- * BSD Console driver support (for FreeBSD and NetBSD).
- *
- * By default, support is included for pccons and pcvt for NetBSD, and
- * pccons, syscons and pcvt for FreeBSD.
- *
- * To change the list of supported drivers, set the following parameter.
- * Possible values are -DPCCONS_SUPPORT, -DSYSCONS_SUPPORT, -DPCVT_SUPPORT,
- * -DCODRV_SUPPORT.  The following example includes support for syscons and
- * pcvt only.
- *
-#define XFree86ConsoleDefines	-DSYSCONS_SUPPORT -DPCVT_SUPPORT
- */
-
-/*
- * The X servers need to run as root on most OSs.  We're now using a
- * wrapper in that case, but we still need to make it known that the
- * servers need SetUID.  When only using xdm, this (and the wrapper)
- * are not required.  Disabling this automatically disables use of the
- * wrapper.
- *
- * If you're only starting the Xservers with xdm set this to NO
- *
-#define XserverNeedsSetUID	NO
- */
-
-/*
- * To disable building the font server, uncomment this.
- *
-#define BuildFontServer		NO
- */
-
-/*
- * Do you want to Build Fonts (Usually you only want to build and install
- * fonts once, if this is a first time install you will want to build the
- * fonts)
- *
-#define BuildFonts		NO
- */
-
-/*
- * To not build/install the 75dpi fonts, uncomment the following
- *
-#define Build75DpiFonts		NO
- */
-
-/*
- * To not build/install the 100dpi fonts, uncomment the following
- *
-#define Build100DpiFonts	NO
- */
-
-/*
- * To not build/install the Speedo fonts, uncomment the following
- *
-#define BuildSpeedoFonts	NO
- */
-
-/*
- * To not build/install the Type1 fonts, uncomment the following
- *
-#define BuildType1Fonts		NO
- */
-
-/*
- * To not build/install the Cyrillic fonts, uncomment the following
- *
-#define BuildCyrillicFonts	NO
- */
-
-/*
- * To build only the servers with a cut-down source tree, uncomment
- * this.
- *
-#define BuildServersOnly	YES
- */
-
-/*
- * To disable building XInput support, uncomment this
- *
-#define BuildXInputExt		NO
- */
-
-/*
- * Select the XInput devices you want by setting them to YES.       
- *
- * Note: Joystick support is only included for Linux and FreeBSD at the
- * moment.  For Linux it requires the Joystick module to be installed (it
- * isn't part of the standard kernel distribution).  For FreeBSD, a kernel
- * will need to be built with the Joystick driver in order to be able to
- * use this.
- *
-#define JoystickSupport		NO
-#define WacomSupport		YES
-#define ElographicsSupport	YES 
-#define SummaSketchSupport	YES
- */
-
-/*
- * if your system supports dynamic loading of modules using
- * dlopen set this to YES.
- *
-#define BuildDynamicLoading	YES
- */
-
-/*
- * To disable the ScreenSaver Extension, uncomment this line.
- *
-#define BuildScreenSaverExt	NO
- */
-
-/*
- * If you don't want to build PEX, uncomment this.
- *
-#define BuildPexExt		NO
- */
-
-/*
- * If you don't want to build XIE, uncomment this.
- *
-#define BuildXIE		NO
- */
-
-/*
- * If you don't want to build support for an external GLX server module or
- * library, uncomment this.
- *
- * NOTE: XFree86 3.3 does not include GLX server source, module, or
- *       functional libraries. Building in support does not require
- *       availability of a GLX package, but will allow it to be used
- *       when released (by dynamic load or relinking).  
- *
-#define BuildGlxExt             NO
- */
-
-/*
- * If you aren't building with support for loadable modules and wish
- * to statically link external GLX server libs instead of the default
- * non-functional stub library, uncomment the following define and
- * specify the space-seperated pathnames of those libraries here.
- *
-#define GlxStaticServerLib	/full/path/name/to/glx/servGL/libServerGlx.a \
-				/full/path/name/to/glx/servGL/libMesaGlx.a
- */ 
-
-/*
- * If you want to build only the DIS (Document Imaging Subset of XIE)
- * uncomment this line.  This option is only relevant when XIE is built.
- *
-#define BuildDIS		YES
- */
-
-/*
- * By default, the sample config files for xinit, xdm and xfs are installed
- * only when there is no pre-existing version installed.  Uncommenting the
- * following lines will force the sample versions to be installed even if
- * it means over-writing existing versions.
- *
-#define InstallXinitConfig	YES
-#define InstallXdmConfig	YES
-#define InstallFSConfig		YES
- */
-
-/*
- * By default the application defaults files are always installed.
- * Uncommenting the the following will prevent exising application
- * defaults files from being over-written.
- *
-#define InstallAppDefFiles	NO
- */
-
-/*
- * If you are running Solaris x86, and want to disable building support
- * for the aperture driver, uncomment this.
- *
-#define HasSolx86ApertureDriver	NO
- */
-
-/*
- * If you are running NetBSD 0.9C or later, or OpenBSD and want to disable
- * building support for the NetBSD aperture driver, uncomment this.
- *
-#define HasNetBSDApertureDriver NO
- */
-
-/*
- * If you are running SVR3 and have the mmap driver installed (for linear
- * framebuffer access) uncomment this.
- *
-#define HasSVR3mmapDrv	YES
- */
-
-/*
- * If you are using an SVR3 (like ISC 4.x) which supports long file names,
- * you can * uncomment this to have manual pages installed under their
- * full names
- *
-#define ExpandManNames		YES
- */
-
-/*
- * For a POSIXized build on Interactive uncomment this
- * Could be used with gcc 'till Version 2.6.3
- * Should be used with gcc 2.7.2. 
- *
-#define UsePosix		YES
- */
-
-/*
- * If you want XDMAUTH support (if you have Wraphelp.c), uncomment this.
- *
-#define HasXdmAuth		YES
- */
-
-/*
- * To forceably build static libraries in addition to shared libraries,
- * uncomment this.
- *
-#define ForceNormalLib		YES
- */
-
-/*
- * Uncomment this if your default tools (eg, gcc, ld, as, etc) are
- * not the Linux ELF versions.
- *
-#define LinuxElfDefault		NO
- */
-
-/*
- * To use ELF format shared libraries for Linux, uncomment this.
- * Note: gcc-2.6.0-941008 and gas-941008 (or later) is required for this.
- * Check linux.cf if you have problems regarding the location of elf-aware
- * gcc and gas binaries.
- *
- * The default setting of this is the same as the setting of LinuxElfDefault
- *
-#define UseElfFormat		YES
- */
-
-/*
- * If you have trouble with make bombing out in Xlib, try uncommenting this.
- * You will not get dependencies as a result, but better than nothing.
- *
-#define MakeHashTableBug        YES
- */
-
-/*
- * If you do not want your man pages compress under SVR3 systems that
- * support it, uncomment this.
- *
-#define CompressManPages        NO
- */
-
-/*
- * LinuxDoc stuff.  Uncomment those of these you want.  Check in
- * lnxdoc.tmpl for other things you might need to define/change here.
- *
-#define HasLinuxDoc		YES
-#define HasLatex		YES
-#define HasDvips		YES
-#define BuildLinuxDocHtml	YES
-#define BuildAllDocs		YES
- */
-
-/*
- * To install Japanese versions of the documentation uncomment this.
- * Note: The Japanese documentation consists of a subset of the
- * XFree86 3.1 docs.
- *
-#define InstallJapaneseDocs	YES
- */
-
-/*
- * By default, XF86Contrib is defined so build only those parts of
- * of the contrib distribution supported by XFree86.  To prevent this
- * from being defined, uncomment the following.
- *
-#define DontDefineXF86Contrib
- */
-
--- a/Xvnc/config/cf/xfree86.cf
+++ /dev/null
@@ -1,1228 +0,0 @@
-XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.129.2.22 1998/02/24 19:05:43 hohndel Exp $
-/*
- * This configuration file contains all of the configuration
- * information for the XFree86 based X Servers.
- *
- * Most of these settings can be overridden in a vendor.cf or the
- * BeforeVendor part of the site.def file.
- */
-XCOMM $XConsortium: xfree86.cf /main/34 1996/12/06 11:45:18 rws $
-
-/*
- * The LinkKit needs to inherit some settings (from the xc build that
- * generated it) before we go too much further...
- */
-#ifndef XF86LinkKit
-#define XF86LinkKit	NO
-#endif
-#if XF86LinkKit
-#include <LinkKit.tmpl>
-#endif
-
-/*
- * Default settings for which X Servers to build.
- */
-
-/*
- * For Intel x86 platforms, the default is to build all X servers which
- * are supported on this platform.
- */
-#ifdef i386Architecture
-#ifndef XF86SVGAServer
-#define XF86SVGAServer          YES
-#endif
-#ifndef XF86VGA16Server
-#define XF86VGA16Server         YES
-#endif
-#ifndef XF86VGA16DualServer
-#define XF86VGA16DualServer	YES
-#endif
-#ifndef XF86MonoServer
-#define XF86MonoServer          YES
-#endif
-#ifndef XF86MonoDualServer
-#define XF86MonoDualServer	YES
-#endif
-#ifndef XF86S3Server
-#define XF86S3Server            YES
-#endif
-#ifndef XF86S3VServer
-#define XF86S3VServer		YES
-#endif
-#ifndef XF86I8514Server
-#define XF86I8514Server         YES
-#endif
-#ifndef XF86Mach8Server
-#define XF86Mach8Server         YES
-#endif
-#ifndef XF86Mach32Server
-#define XF86Mach32Server        YES
-#endif
-#ifndef XF86Mach64Server
-#define XF86Mach64Server        YES
-#endif
-#ifndef XF86P9000Server
-#define XF86P9000Server		YES
-#endif
-#ifndef XF86AGXServer
-#define XF86AGXServer		YES
-#endif
-#ifndef XF86W32Server
-#define XF86W32Server		YES
-#endif
-#ifndef XF86I128Server
-#define XF86I128Server		YES
-#endif
-#ifndef XF86GLINTServer
-#define XF86GLINTServer		YES
-#endif
-#if defined(LinuxArchitecture)
-#ifndef XF86FBDevServer
-#define XF86FBDevServer		YES
-#endif
-#endif
-#endif
-
-/*
- * For Digital Alpha platforms, the default is to build all X servers which
- * are supported on this platform.
- */
-#ifdef AlphaArchitecture
-#ifndef XF86S3Server
-#define XF86S3Server		YES
-#endif
-#ifndef XF86S3VServer
-#define XF86S3VServer		YES
-#endif
-#ifndef XF86Mach64Server
-#define XF86Mach64Server	YES
-#endif
-#ifndef XF86P9000Server
-#define XF86P9000Server		YES
-#endif
-#ifndef XF86I128Server
-#define XF86I128Server		YES
-#endif
-#ifndef XF86TGAServer
-#define XF86TGAServer		YES
-#endif
-#ifndef XF86SVGAServer
-#define XF86SVGAServer		YES
-#endif
-#ifndef XF86VGA16Server
-#define XF86VGA16Server		YES
-#endif
-#ifndef XF86MonoServer
-#define XF86MonoServer		YES
-#endif
-#ifndef XF86GLINTServer
-#define XF86GLINTServer		YES
-#endif
-#if defined(LinuxArchitecture)
-#ifndef XF86FBDevServer
-#define XF86FBDevServer		YES
-#endif
-#endif
-#ifndef XF86SvgaDrivers
-#define XF86SvgaDrivers		mga s3v
-#endif
-#ifndef XF86Vga16Drivers
-#define XF86Vga16Drivers	generic
-#endif
-#ifndef XF86Vga2Drivers
-#define XF86Vga2Drivers		generic
-#endif
-#endif
-
-/*
- * For Motorola 68k platforms, the default is to build all X servers which
- * are supported on this platform.
- */
-#ifdef Mc68020Architecture
-#ifndef XF68FBDevServer
-#define XF68FBDevServer		YES
-#define XF68FBDev77C32		NO
-#define XF68FBDevIMSTT		NO
-#define XF68FBDevMach64		NO
-#define XF68FBDevPermedia2	NO
-#endif
-#ifndef BuildXF86Setup
-#define BuildXF86Setup		NO
-#endif
-#endif
-
-/*
- * For ARM platforms, the default is to build all X servers which
- * are supported on this platform.
- */
-#ifdef ArmArchitecture
-#ifndef XF68FBDevServer
-#define XF68FBDevServer		YES
-#define XF68FBDevCFB8		YES
-#define XF68FBDevCFB16		YES
-#define XF68FBDevCFB24		YES
-#define XF68FBDevCFB32		YES
-#define XF68FBDevIPLAN2p2	NO
-#define XF68FBDevIPLAN2p4	NO
-#define XF68FBDevIPLAN2p8	NO
-#define XF68FBDevILBM		NO
-#define XF68FBDevAFB		NO
-#define XF68FBDev77C32		NO
-#define XF68FBDevMach64		NO
-#define XF68FBDevIMSTT		NO
-#define XF68FBDevPermedia2	NO
-#endif
-#ifndef BuildXF86Setup
-#define BuildXF86Setup		NO
-#endif
-#endif
-
-/*
- * For Mips/Arc platforms, the default is to build all X servers which
- * are supported on this platform.
- */
-#ifdef ArcArchitecture
-#ifndef XF86S3Server
-#define XF86S3Server		YES
-#endif
-#if defined(LinuxArchitecture)
-#ifndef XF86FBDevServer
-#define XF86FBDevServer		YES
-#endif
-#endif
-#ifndef BuildXF86Setup
-#define BuildXF86Setup		NO
-#endif
-#endif
-
-/*
- * For PowerPC platforms, the default is to build all X servers which
- * are supported on this platform.
- */
-#ifdef PowerPCArchitecture
-#ifndef XF86SVGAServer
-#define XF86SVGAServer		NO
-#endif
-#ifndef XF86VGA16Server
-#define XF86VGA16Server		NO
-#endif
-#ifndef XF86S3Server
-#define XF86S3Server		NO
-#endif
-#ifndef XF68FBDevServer
-#define XF68FBDevServer		YES
-#define XF68FBDevCFB8		YES
-#define XF68FBDevCFB16		YES
-#define XF68FBDevCFB24		NO
-#define XF68FBDevCFB32		YES
-#define XF68FBDevIPLAN2p2	NO
-#define XF68FBDevIPLAN2p4	NO
-#define XF68FBDevIPLAN2p8	NO
-#define XF68FBDevILBM		NO
-#define XF68FBDevAFB		YES
-#define XF68FBDev77C32		YES
-#define XF68FBDevIMSTT		YES
-#define XF68FBDevMach64		YES
-#define XF68FBDevPermedia2	YES
-#endif
-#ifndef BuildXF86Setup
-#define BuildXF86Setup		NO
-#endif
-#endif
-
-/* For SPARC PCI platforms, the default is to build all X servers which are
- * supported on this platform.
- */
-#ifdef SparcArchitecture
-#ifndef XF86Mach64Server
-#define XF86Mach64Server	YES
-#endif
-#ifndef BuildXF86Setup
-#define BuildXF86Setup		NO
-#endif
-#endif
-
-/*
- * The following disables all X servers not already enabled above
- */
-#ifndef XF86VGA16Server
-# define XF86VGA16Server	NO
-# ifndef XF86VGA16DualServer
-#  define XF86VGA16DualServer	NO
-# endif
-#endif
-
-#ifndef XF86MonoServer
-# define XF86MonoServer		NO
-# ifndef XF86MonoDualServer
-#  define XF86MonoDualServer	NO
-# endif
-#endif
-
-#ifndef XF86S3Server
-# define XF86S3Server		NO
-#endif
-
-#ifndef XF86S3VServer
-# define XF86S3VServer		NO
-#endif
-
-#ifndef XF86I8514Server
-# define XF86I8514Server	NO
-#endif
-
-#ifndef XF86Mach8Server
-# define XF86Mach8Server	NO
-#endif
-
-#ifndef XF86Mach32Server
-# define XF86Mach32Server	NO
-#endif
-
-#ifndef XF86Mach64Server
-# define XF86Mach64Server	NO
-#endif
-
-#ifndef XF86AGXServer
-# define XF86AGXServer		NO
-#endif
-
-#ifndef XF86P9000Server
-# define XF86P9000Server	NO
-#endif
-
-#ifndef XF86W32Server
-# define XF86W32Server		NO
-#endif
-
-#ifndef XF86I128Server
-# define XF86I128Server		NO
-#endif
-
-#ifndef XF86GLINTServer
-# define XF86GLINTServer	NO
-#endif
-
-#ifndef XF86TGAServer
-# define XF86TGAServer		NO
-#endif
-
-#if XF86S3Server
-# define XF86S3Dir		s3
-#else
-# define XF86S3Dir		/**/
-#endif
-
-#if XF86S3VServer
-# define XF86S3VDir		s3_virge
-#else
-# define XF86S3VDir		/**/
-#endif
-
-#if XF86I8514Server
-# define XF86I8514Dir		ibm8514
-#else
-# define XF86I8514Dir		/**/
-#endif
-
-#if XF86Mach8Server
-# define XF86Mach8Dir		mach8
-#else
-# define XF86Mach8Dir		/**/
-#endif
-
-#if XF86Mach32Server
-# define XF86Mach32Dir		mach32
-#else
-# define XF86Mach32Dir		/**/
-#endif
-
-#if XF86Mach64Server
-# define XF86Mach64Dir		mach64
-#else
-# define XF86Mach64Dir		/**/
-#endif
-
-#if XF86P9000Server
-# define XF86P9000Dir		p9000
-#else
-# define XF86P9000Dir		/**/
-#endif
-
-#if XF86AGXServer
-# define XF86AGXDir		agx
-#else
-# define XF86AGXDir		/**/
-#endif
-
-#if XF86W32Server
-# define XF86W32Dir		et4000w32
-#else
-# define XF86W32Dir		/**/
-#endif
-
-#if XF86I128Server
-# define XF86I128Dir		i128
-#else
-# define XF86I128Dir		/**/
-#endif
-
-#if XF86GLINTServer
-# define XF86GLINTDir		glint
-#else
-# define XF86GLINTDir		/**/
-#endif
-
-#if XF86TGAServer
-# define XF86TGADir		tga
-#else
-# define XF86TGADir		/**/
-#endif
-
-#ifndef BuildPC98Servers
-#define BuildPC98Servers	NO
-#endif
-
-#ifndef XF98GANBWAPServer
-# define XF98GANBWAPServer	BuildPC98Servers
-#endif
-
-#ifndef XF98NEC480Server
-# define XF98NEC480Server	BuildPC98Servers
-#endif
-
-#ifndef XF98NKVNECServer
-# define XF98NKVNECServer	BuildPC98Servers
-#endif
-
-#ifndef XF98WABSServer
-# define XF98WABSServer		BuildPC98Servers
-#endif
-
-#ifndef XF98WABEPServer
-# define XF98WABEPServer	BuildPC98Servers
-#endif
-
-#ifndef XF98WSNAServer
-# define XF98WSNAServer		BuildPC98Servers
-#endif
-
-#ifndef XF98TGUIServer
-# define XF98TGUIServer		BuildPC98Servers
-#endif
-
-#ifndef XF98MGAServer
-# define XF98MGAServer		BuildPC98Servers
-#endif
-
-#ifndef XF98SVGAServer
-# define XF98SVGAServer		BuildPC98Servers
-#endif
-
-#ifndef XF98EGCServer
-# define XF98EGCServer		BuildPC98Servers
-#endif
-
-#ifndef XF98NECS3Server
-# define XF98NECS3Server	BuildPC98Servers
-#endif
-
-#ifndef XF98PWSKBServer
-# define XF98PWSKBServer	BuildPC98Servers
-#endif
-
-#ifndef XF98PWLBServer
-#define XF98PWLBServer		BuildPC98Servers
-#endif
-
-#ifndef XF98GA968Server
-#define XF98GA968Server		BuildPC98Servers
-#endif
-
-#if XF98NECS3Server
-# define XF98NECS3Dir		s3nec
-#else
-# define XF98NECS3Dir		/**/
-#endif
-
-#if XF98PWSKBServer
-# define XF98PWSKBDir		s3pwskb
-#else
-# define XF98PWSKBDir		/**/
-#endif
-
-#if XF98PWLBServer
-# define XF98PWLBDir		s3pwlb
-#else
-# define XF98PWLBDir		/**/
-#endif
-
-#if XF98GA968Server
-# define XF98GA968Dir		s3ga968
-#else
-# define XF98GA968Dir		/**/
-#endif
-
-#undef XF86AccelServerDirs
-#define XF86AccelServerDirs	XF86S3Dir XF86S3VDir XF86I8514Dir \
-				XF86Mach8Dir XF86Mach32Dir XF86Mach64Dir \
-				XF86P9000Dir XF86AGXDir XF86W32Dir \
-				XF86I128Dir XF86GLINTDir XF86TGADir
-
-#undef XF86AccelServer
-#if XF86S3Server || XF86S3VServer || XF86I8514Server || XF86Mach8Server || \
-    XF86Mach32Server || XF86Mach64Server || XF86P9000Server || \
-    XF86AGXServer || XF86W32Server || XF86I128Server || XF86TGAServer || \
-    XF86GLINTServer
-# define XF86AccelServer	YES
-#else
-# define XF86AccelServer	NO
-#endif
-
-#undef XF98AccelServerDirs
-#define XF98AccelServerDirs   XF98NECS3Dir XF98PWSKBDir XF98PWLBDir XF98GA968Dir
-
-#undef XF98AccelServer
-#if XF98NECS3Server || XF98PWSKBServer || XF98PWLBServer || XF98GA968Server
-# define XF98AccelServer	YES
-#else
-# define XF98AccelServer	NO
-#endif
-
-/*
- * Driver list for several of the X Servers.
- */
-#ifndef XF86SvgaDrivers
-# ifdef AlphaArchitecture
-#  define XF86SvgaDrivers	mga tvga8900 s3v nv
-# else
-#  if defined(LinuxArchitecture)
-#   define XF86SvgaDrivers	nv et4000 et3000 pvga1 gvga r128 ati sis tvga8900 \
-				cirrus ncr77c22 compaq mga oak al2101 \
-				ali cl64xx video7 ark mx realtek s3_savage s3v apm \
-				s3_svga neo chips cyrix rendition p9x00 \
-				spc8110 i740 i810 tdfx smi generic
-#  else
-#   define XF86SvgaDrivers	nv et4000 et3000 pvga1 gvga r128 ati sis tvga8900 \
-				cirrus ncr77c22 compaq mga oak al2101 \
-				ali cl64xx video7 ark mx realtek s3v apm \
-				s3_svga neo chips cyrix rendition p9x00 \
-				spc8110 i740 i810 tdfx smi generic
-#  endif
-# endif
-#endif
-
-#ifndef XF98SvgaDrivers
-# define XF98SvgaDrivers	generic
-#endif
-
-#ifndef XF86Vga16Drivers
-# define XF86Vga16Drivers	et4000 et3000 ncr77c22 ati sis tvga8900 \
-				oak cl64xx generic
-#endif
-
-#ifndef XF98Vga16Drivers
-# define XF98Vga16Drivers	generic
-#endif
-
-#ifndef XF86Vga2Drivers
-# ifdef AlphaArchitecture
-#  define XF86Vga2Drivers	generic
-# else
-#  define XF86Vga2Drivers	et4000 et3000 pvga1 gvga ati sis tvga8900 \
-				cirrus ncr77c22 /*compaq*/ oak cl64xx generic
-# endif
-#endif
-
-#ifndef XF86Vga2Banked
-# define XF86Vga2Banked		YES
-#endif
-
-#ifndef XF86MonoDrivers
-# define XF86MonoDrivers	hgc1280 sigma apollo hercules
-#endif
-
-/* This doesn't do everything (yet) */
-#ifndef XF86S3Drivers
-# if !defined(AlphaArchitecture)
-#  define XF86S3Drivers		newmmio mmio_928 s3_generic
-# else
-#  define XF86S3Drivers		newmmio mmio_928 s3_generic
-# endif
-#endif
-
-#ifndef XF86S3VDrivers
-# define XF86S3VDrivers		s3_virge
-#endif
-
-#ifndef XF86W32Drivers
-# define XF86W32Drivers		et4000w32
-#endif
-
-#if XF68FBDevServer || XF86FBDevServer
-# ifndef XF68FBDevIPLAN2p2
-#  define XF68FBDevIPLAN2p2	YES
-# endif
-# ifndef XF68FBDevIPLAN2p4
-#  define XF68FBDevIPLAN2p4	YES
-# endif
-# ifndef XF68FBDevIPLAN2p8
-#  define XF68FBDevIPLAN2p8	YES
-# endif
-# ifndef XF68FBDevILBM
-#  define XF68FBDevILBM		YES
-# endif
-# ifndef XF68FBDevAFB
-#  define XF68FBDevAFB		YES
-# endif
-# ifndef XF68FBDevCFB8
-#  define XF68FBDevCFB8		YES
-# endif
-# ifndef XF68FBDevCFB16
-#  define XF68FBDevCFB16	YES
-# endif
-# ifndef XF68FBDevCFB24
-#  if defined(i386Architecture) || defined(AlphaArchitecture)
-#   define XF68FBDevCFB24	YES
-#  else
-#   define XF68FBDevCFB24	NO
-#  endif
-# endif
-# ifndef XF68FBDevCFB32
-#  define XF68FBDevCFB32	YES
-# endif
-/* Accelerated stuff */
-# ifndef XF68FBDev77C32
-#  define XF68FBDev77C32	YES
-# endif
-# ifndef XF68FBDevIMSTT
-#  define XF68FBDevIMSTT	YES
-# endif
-# ifndef XF68FBDevMach64
-#  define XF68FBDevMach64	YES
-# endif
-# ifndef XF68FBDevPermedia2
-#  define XF68FBDevPermedia2	YES
-# endif
-#else
-# ifndef XF68FBDevIPLAN2p2
-#  define XF68FBDevIPLAN2p2	NO
-# endif
-# ifndef XF68FBDevIPLAN2p4
-#  define XF68FBDevIPLAN2p4	NO
-# endif
-# ifndef XF68FBDevIPLAN2p8
-#  define XF68FBDevIPLAN2p8	NO
-# endif
-# ifndef XF68FBDevILBM
-#  define XF68FBDevILBM		NO
-# endif
-# ifndef XF68FBDevAFB
-#  define XF68FBDevAFB		NO
-# endif
-# ifndef XF68FBDevCFB8
-#  define XF68FBDevCFB8		NO
-# endif
-# ifndef XF68FBDevCFB16
-#  define XF68FBDevCFB16	NO
-# endif
-# ifndef XF68FBDevCFB24
-#  define XF68FBDevCFB24	NO
-# endif
-# ifndef XF68FBDevCFB32
-#  define XF68FBDevCFB32	NO
-# endif
-# ifndef XF68FBDev77C32
-#  define XF68FBDev77C32	NO
-# endif
-# ifndef XF68FBDevIMSTT
-#  define XF68FBDevIMSTT	NO
-# endif
-# ifndef XF68FBDevMach64
-#  define XF68FBDevMach64	NO
-# endif
-# ifndef XF68FBDevPermedia2
-#  define XF68FBDevPermedia2	NO
-# endif
-#endif
-
-#ifndef XnestServer
-#define XnestServer		YES
-#endif
-
-#ifndef XVirtualFramebufferServer
-#define XVirtualFramebufferServer YES
-#endif
-
-/*
- * The X servers need to run as root on most OSs.  We're now using a
- * wrapper in that case, but we still need to make it known that the
- * servers need SetUID.  When only using xdm, this (and the wrapper)
- * are not required.  Disabling this automatically disables use of the
- * wrapper.
- */
-#if !defined(i386MachArchitecture) && !defined(OS2Architecture)
-#ifndef XserverNeedsSetUID
-#define XserverNeedsSetUID	YES
-#endif
-#endif
-
-/*
- * The server-side of PEX is not 64-bit clean.
- */
-#ifndef BuildPextExt
-#ifdef AlphaArchitecture
-#define BuildPexExt		NO
-#endif
-#endif
-
-/*
- * PEX doesn't work for 1-bit and 4-bit servers
- */
-#if !defined(BuildPexExt) || BuildPexExt
-#undef BuildPexExt
-#if XF86AccelServer || XF86SVGAServer || XF98AccelServer || \
-    XF98GANBWAPServer || XF98NEC480Server || XF98NKVNECServer || \
-    XF98WABSServer || XF98WABEPServer || XF98WSNAServer || XF98TGUIServer || \
-    XF98MGAServer || XF98SVGAServer || XF68FBDevServer || XF86FBDevServer
-#define BuildPexExt		YES
-#else
-#define BuildPexExt		NO
-#endif
-#endif
-
-/*
- * Build GLX server interface
- *   --- Does't work for 1-bit and 4-bit servers
- */
-#if !defined(BuildGlxExt) || BuildGlxExt
-#  undef BuildGlxExt
-#  if XF86AccelServer || XF86SVGAServer || XF98AccelServer || \
-      XF98GANBWAPServer || XF98NEC480Server || XF98NKVNECServer || \
-      XF98WABSServer || XF98WABEPServer || XF98WSNAServer || XF98TGUIServer || \
-      XF98MGAServer || XF98SVGAServer || XF68FBDevServer || XF86FBDevServer
-#    define BuildGlxExt             YES
-#  else
-#    define BuildGlxExt             NO
-#  endif
-#endif
-
-/*
- * XIE doesn't work for our 1-bit and 4-bit servers
- */
-#if !defined(BuildXIE) || BuildXIE
-#undef BuildXIE
-#if XF86AccelServer || XF86SVGAServer || XF98AccelServer || \
-    XF98GANBWAPServer || XF98NEC480Server || XF98NKVNECServer || \
-    XF98WABSServer || XF98WABEPServer || XF98WSNAServer || XF98TGUIServer || \
-    XF98MGAServer || XF98SVGAServer || XF68FBDevServer || XF86FBDevServer
-#define BuildXIE		YES
-#else
-#define BuildXIE		NO
-#endif
-#endif
-
-#ifndef BuildXIElib
-#define BuildXIElib	YES
-#endif
-
-#ifndef BuildDBElib
-#define BuildDBElib	YES
-#endif
-
-#ifndef BuildRECORDlib
-#define BuildRECORDlib	YES
-#endif
-
-#ifndef BuildXKBlib
-#define BuildXKBlib	YES
-#endif
-
-#ifndef BuildScreenSaverExt
-#define BuildScreenSaverExt	YES
-#endif
-
-/*
- * Build XInput support
- */
-#ifndef BuildXInputExt
-#define BuildXInputExt		YES
-#endif
-
-/*
- * Include support for these XInput devices
- */
-#ifndef WacomSupport
-#define WacomSupport		YES
-#endif
-#ifndef ElographicsSupport
-#define ElographicsSupport	YES
-#endif
-#ifndef DynaproSupport
-#define DynaproSupport		YES
-#endif
-#ifndef MicroTouchSupport
-#define MicroTouchSupport	YES
-#endif
-#ifndef SummaSketchSupport
-#define SummaSketchSupport	YES
-#endif
-#ifndef AceCadSupport
-#define AceCadSupport		YES
-#endif
-#ifndef DialBoxSupport
-#if SystemV || SystemV4
-#define DialBoxSupport		NO
-#else
-#define DialBoxSupport		YES
-#endif
-#endif
-#ifndef JoystickSupport
-#define JoystickSupport		NO
-#endif
-#ifndef CalcompSupport
-#define CalcompSupport		YES
-#endif
-
-/*
- * Build the extra extension libs even when not including the extra extensions
- * in the servers
- */
-#ifndef BuildScreenSaverLibrary
-#define BuildScreenSaverLibrary	YES
-#endif
-#ifndef BuildXF86MiscLibrary
-#define BuildXF86MiscLibrary	YES
-#endif
-#ifndef BuildXF86DGALibrary
-#define BuildXF86DGALibrary	YES
-#endif
-#ifndef BuildXF86VidModeLibrary
-#define BuildXF86VidModeLibrary	YES
-#endif
-#ifndef BuildDPMSLibrary
-#define BuildDPMSLibrary	YES
-#endif
-
-/*
- * Build the XFree86-VidMode extension
- */
-#ifndef BuildXF86VidModeExt
-#define BuildXF86VidModeExt		YES
-#endif
-
-/*
- * Build the XFree86-Misc extension
- */
-#ifndef BuildXF86MiscExt
-#define BuildXF86MiscExt		YES
-#endif
-
-/*
- * Build XF86Setup -- needs Tk and Tcl
- */
-#ifndef BuildXF86Setup
-#if HasTk && HasTcl && BuildXF86VidModeLibrary && BuildXF86MiscLibrary && BuildXKBlib
-#define BuildXF86Setup			YES
-#else
-#define BuildXF86Setup			NO
-#endif
-#endif
-
-/*
- * Build Japanese versions of XF86Setup -- needs Japanised Tk and Tcl
- */
-#ifndef BuildJpXF86Setup
-#if HasJpTk && HasJpTcl && BuildXF86VidModeLibrary && BuildXF86MiscLibrary && BuildXKBlib
-#define BuildJpXF86Setup		YES
-#else
-#define BuildJpXF86Setup		NO
-#endif
-#endif
-
-#ifndef XF86SetupUsesStaticTk
-#define XF86SetupUsesStaticTk		YES
-#endif
-#ifndef XF86SetupUsesStaticTcl
-#define XF86SetupUsesStaticTcl		YES
-#endif
-
-/*
- * Build the XFree86 DGA support
- */
-#ifndef BuildXF86DGA
-#define BuildXF86DGA			YES
-#endif
-
-/*
- * Build the DPMS extension support
- */
-#ifndef BuildDPMSExt
-#define BuildDPMSExt			YES
-#endif
-
-#if Malloc0ReturnsNull
-#ifndef XtMalloc0ReturnsNullDefines
-#define XtMalloc0ReturnsNullDefines	Malloc0ReturnsNullDefines -DXTMALLOC_BC
-#endif
-#endif
-
-#ifndef UseInternalMalloc
-#define UseInternalMalloc	YES
-#endif
-
-#ifndef HasDlsymBug
-#define HasDlsymBug		NO
-#endif
-
-/*
- * The expiry date for beta versions
- *
- * 853286400 is Wed Jan 15 00:00:00 1997 GMT
- * 855964800 is Sat Feb 15 00:00:00 1997 GMT
- * 866332800 is Sun Jun 15 00:00:00 1997 GMT
- */
-#ifndef XF86ServerExpiry
-#define XF86ServerExpiry 866332800
-#endif
-
-/*
- * Build the font server
- */
-#ifndef BuildFontServer
-#define BuildFontServer		YES
-#endif
-
-/*
- * By default, build all of the fonts.
- */
-#ifndef Build75DpiFonts
-#define Build75DpiFonts		YES
-#endif
-#ifndef Build100DpiFonts
-#define Build100DpiFonts	YES
-#endif
-#ifndef BuildSpeedoFonts
-#define BuildSpeedoFonts	YES
-#endif
-#ifndef BuildType1Fonts
-#define BuildType1Fonts		YES
-#endif
-#ifndef BuildCyrillicFonts
-#define BuildCyrillicFonts	YES
-#endif
-#ifndef UseKoi8RForCyrillic
-#define UseKoi8RForCyrillic	YES
-#endif
-
-/*
- * By default, create the local font directory
- */
-#ifndef MakeLocalFontDir
-#define MakeLocalFontDir	YES
-#endif
-
-/*
- * Build scanpci?
- */
-#ifndef BuildScanpci
-#if SystemV || SystemV4 || (defined(LinuxArchitecture) && !defined(Mc68020Architecture) && !defined(PowerPCArchitecture) && !defined(ArmArchitecture)) || defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || defined(OS2Architecture)
-#define BuildScanpci		YES
-#else
-#define BuildScanpci		NO
-#endif
-#endif
-
-#ifndef CompressAllFonts
-#define CompressAllFonts	YES
-#endif
-
-#ifndef GzipFontCompression
-#define GzipFontCompression	YES
-#endif
-
-#ifndef StripInstalledPrograms
-#define StripInstalledPrograms	YES
-#endif
-
-#ifndef HasLinuxDoc
-#define HasLinuxDoc		NO
-#endif
-
-#ifndef InstallJapaneseDocs
-#define InstallJapaneseDocs	NO
-#endif
-
-#if BuildXF86DGA
-#define XFree86DGADefines	-DXFreeXDGA
-#else
-#define XFree86DGADefines	/**/
-#endif
-
-#ifndef MakeHasPosixVariableSubstitutions
-#if !HasBsdMake
-#define MakeHasPosixVariableSubstitutions	NO
-#else
-#define MakeHasPosixVariableSubstitutions	YES
-#endif
-#endif
-
-/* Server defines required for all OSs */
-#ifndef XFree86ServerDefines
-#define XFree86ServerDefines	-DSTATIC_COLOR -DAVOID_GLYPHBLT -DPIXPRIV LinkKitDefines XFree86DGADefines
-#endif
-
-#ifndef XFree86ServerOSDefines
-#define XFree86ServerOSDefines	-DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR
-#endif
-
-#ifndef XFree86ConsoleDefines
-#ifdef i386BsdArchitecture
-#define XFree86ConsoleDefines	-DPCCONS_SUPPORT -DSYSCONS_SUPPORT -DPCVT_SUPPORT
-#else
-#define XFree86ConsoleDefines	/**/
-#endif
-#endif
-
-/* Support for USB mouse */
-#ifndef UsbMouseSupport
-#define UsbMouseSupport	NO
-#endif
-/* Does this OS has libusb ? */
-#ifndef HasLibUsb
-#define HasLibUsb	NO
-#endif
-
-#ifndef UseServerLock
-#define UseServerLock	YES
-#endif
-
-#if XF86LinkKit
-/*
- * Definitions for LinkKit self-containment.  This should work whether or not
- * UseInstalled is defined.
- */
-# ifndef HasLdRunPath
-#  define HasLdRunPath	NO
-# endif
-
-# ifndef TopIncludes
-#  ifdef IncRoot
-#   define TopIncludes	-I$(INCROOT)
-#  else
-#   define TopIncludes	/**/
-#  endif
-# endif
-# ifndef ClientLibDir
-#  if defined(UsrLibDir) || HasLdRunPath
-#   define ClientLibDir	/**/
-#  else
-#   define ClientLibDir	-L$(USRLIBDIR)
-#  endif
-# endif
-# ifndef LdPreLib
-#  if defined(LdPostLib) && defined(UsrLibDir) && !HasLdRunPath
-#   define LdPreLib	-L$(USRLIBDIR)
-#  else
-#   define LdPreLib	/**/
-#  endif
-# endif
-# ifndef LdPostLib
-#  if defined(UsrLibDir) && !HasLdRunPath
-#   define LdPostLib	-L$(USRLIBDIR)
-#  else
-#   define LdPostLib	/**/
-#  endif
-# endif
-
-#endif
-
-#ifndef LinkKitDefines
-#if XF86LinkKit
-#define LinkKitDefines	-DLINKKIT
-#else
-#define LinkKitDefines	/**/
-#endif
-#endif
-
-#ifndef ServerExtraDefines
-#define ServerExtraDefines	XFree86ServerDefines
-#endif
-
-#ifndef ServerOSDefines
-#define ServerOSDefines		XFree86ServerOSDefines
-#endif
-
-#ifndef LinkKitDir
-#define LinkKitDir	$(USRLIBDIR)/Server
-#endif
-
-LINKKITDIR = LinkKitDir
-XF98LINKKITDIR = LinkKitDir
-
-/*
- * Some commonly refered to directories are defined here.
- */
-
-#if XF86LinkKit
-       XF86SRC = $(TOP)
-  XF86ACCELSRC = $(XF86SRC)/lib86
-    XF86COMSRC = $(XF86SRC)/lib86
- XF86CONFIGSRC = $(XF86SRC)
-     XF86HWSRC = $(XF86SRC)/lib86
-     XF86OSSRC = $(XF86SRC)/lib86
-     DRIVERSRC = $(XF86SRC)/drivers
-  VGADRIVERSRC = $(XF86SRC)/drivers/vga256
-VGA16DRIVERSRC = $(XF86SRC)/drivers/vga16
- VGA2DRIVERSRC = $(XF86SRC)/drivers/vga2
- MONODRIVERSRC = $(XF86SRC)/drivers/mono
-   S3DRIVERSRC = $(XF86SRC)/drivers/s3
-  S3VDRIVERSRC = $(XF86SRC)/drivers/s3_virge
-
-           XF98SRC = $(TOP)
-      XF98ACCELSRC = $(XF98SRC)/lib98
-        XF98COMSRC = $(XF98SRC)/lib98
-     XF98CONFIGSRC = $(XF98SRC)
-         XF98HWSRC = $(XF98SRC)/lib98
-      XF98HWNECSRC = $(XF98SRC)/lib98
-    XF98HWPWSKBSRC = $(XF98SRC)/lib98
-     XF98HWPWLBSRC = $(XF98SRC)/lib98
-    XF98HWGA968SRC = $(XF98SRC)/lib98
-         XF98OSSRC = $(XF98SRC)/lib98
-     XF98DRIVERSRC = $(XF98SRC)/drivers98
-  XF98VGADRIVERSRC = $(XF98SRC)/drivers98/vga256
-XF98VGA16DRIVERSRC = $(XF98SRC)/drivers98/vga16
- XF98VGA2DRIVERSRC = $(XF98SRC)/drivers98/vga2
- XF98MONODRIVERSRC = $(XF98SRC)/drivers98/mono
-XF98NECS3DRIVERSRC = $(XF98SRC)/drivers98/s3nec
-XF98PWSKBDRIVERSRC = $(XF98SRC)/drivers98/s3pwskb
- XF98PWLBDRIVERSRC = $(XF98SRC)/drivers98/s3pwlb
-XF98GA968DRIVERSRC = $(XF98SRC)/drivers98/s3ga968
-
-#ifdef SiteIConfigFiles
-#undef SiteIConfigFiles
-#endif
-#define SiteIConfigFiles $(TOP)/xf86site.def $(TOP)/Imakefile $(IRULESRC)/host.def
-#else
-       XF86SRC = $(SERVERSRC)/hw/xfree86
-  XF86ACCELSRC = $(XF86SRC)/accel
-    XF86COMSRC = $(XF86SRC)/common
- XF86CONFIGSRC = $(XF86COMSRC)
-     XF86HWSRC = $(XF86SRC)/common_hw
-     XF86OSSRC = $(XF86SRC)/os-support
-  VGADRIVERSRC = $(XF86SRC)/vga256/drivers
-VGA16DRIVERSRC = $(XF86SRC)/vga16/drivers
- VGA2DRIVERSRC = $(XF86SRC)/vga2/drivers
- MONODRIVERSRC = $(XF86SRC)/mono/drivers
-   S3DRIVERSRC = $(XF86SRC)/accel/s3/drivers
-  S3VDRIVERSRC = $(XF86SRC)/accel/s3_virge/drivers
-
-       XF68SRC = $(SERVERSRC)/hw/xfree68
-    XF68COMSRC = $(XF68SRC)/common
- XF68CONFIGSRC = $(XF68COMSRC)
-     XF68OSSRC = $(XF68SRC)/os-support
-
-           XF98SRC = $(SERVERSRC)/hw/xfree98
-      XF98ACCELSRC = $(XF98SRC)/accel
-        XF98COMSRC = $(XF98SRC)/common
-     XF98CONFIGSRC = $(XF98COMSRC)
-         XF98HWSRC = $(XF98SRC)/common_hw/generic
-      XF98HWNECSRC = $(XF98SRC)/common_hw/nec
-    XF98HWPWSKBSRC = $(XF98SRC)/common_hw/pwskb
-     XF98HWPWLBSRC = $(XF98SRC)/common_hw/pwlb
-    XF98HWGA968SRC = $(XF98SRC)/common_hw/ga968
-         XF98OSSRC = $(XF98SRC)/os-support
-  XF98VGADRIVERSRC = $(XF98SRC)/vga256/drivers
-XF98VGA16DRIVERSRC = $(XF98SRC)/vga16/drivers
- XF98VGA2DRIVERSRC = $(XF98SRC)/vga2/drivers
- XF98MONODRIVERSRC = $(XF98SRC)/mono/drivers
-XF98NECS3DRIVERSRC = $(XF98SRC)/accel/s3nec/drivers
-XF98PWSKBDRIVERSRC = $(XF98SRC)/accel/s3pwskb/drivers
- XF98PWLBDRIVERSRC = $(XF98SRC)/accel/s3pwlb/drivers
-XF98GA968DRIVERSRC = $(XF98SRC)/accel/s3ga968/drivers
-#endif
-
-/*
- * Installed location of the XFree86 documentation
- */
-
-        XFREE86DOCDIR = $(LIBDIR)/doc
-      XFREE86PSDOCDIR = $(XFREE86DOCDIR)/PostScript
-    XFREE86HTMLDOCDIR = $(XFREE86DOCDIR)/html
-XFREE86JAPANESEDOCDIR = $(XFREE86DOCDIR)/Japanese
-
-/*
- * Other stuff used in the X Server source.
- */
-
-#ifndef AsmDefines
-#define AsmDefines /**/
-#endif
-
-#ifndef OtherIConfigFiles
-#define OtherIConfigFiles $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules
-#endif
-
-#ifndef XFree86Version
-#define XFree86Version	3320
-#endif
-
-#ifndef XVendorString
-#define XVendorString	"The XFree86 Project, Inc"
-#endif
-
-#ifndef XVendorRelease
-#define XVendorRelease	XFree86Version
-#endif
-
-#ifndef UseRgbTxt
-#define UseRgbTxt	YES
-#endif
-
-#ifndef ManSuffix
-#define ManSuffix	1
-#endif
-
-/*
- * GNU Compiler stuff
- */
-#ifndef HasGcc2
-#define HasGcc2 NO
-#endif
-#ifndef HasGcc
-#define HasGcc HasGcc2
-#endif
-#ifndef HasGcc2ForCplusplus
-#define HasGcc2ForCplusplus HasGcc2
-#endif
-
-#if HasGcc
-#ifndef DefaultCCOptions
-#ifdef UseInstalled
-#define DefaultCCOptions /* -ansi */
-#else
-#define DefaultCCOptions -ansi -pedantic
-#endif
-#endif
-#if defined(UseInstalled) || XF86LinkKit
-#ifndef UseGccMakeDepend
-#define UseGccMakeDepend YES
-#endif
-#endif
-#endif
-
-#if HasGcc2 && defined(i386Architecture)
-#ifndef DefaultGcc2i386Opt
-#define DefaultGcc2i386Opt -O2 -fno-strength-reduce
-#endif
-#endif
-
-#ifndef DontDefineXF86Contrib
-#define XF86Contrib
-#endif
-
-#ifndef HasMktemp
-#define HasMktemp	YES
-#endif
-
-#include <xf86.rules>
--- a/Xvnc/config/imake/Imakefile
+++ /dev/null
@@ -1,54 +0,0 @@
-XCOMM $TOG: Imakefile /main/10 1997/04/30 15:39:17 kaleb $
-XCOMM
-XCOMM
-XCOMM
-XCOMM
-XCOMM $XFree86: xc/config/imake/Imakefile,v 3.6.2.1 1997/06/11 12:08:33 dawes Exp $
-
-XCOMM Some compilers generate fatal errors if an -L directory does
-XCOMM not exist.  Since BUILDLIBDIR may not exist yet suppress its use.
-         LDPRELIB =
-        LDPRELIBS =
-
-DEPLIBS = 
-
-INCLUDES = -I$(TOP)/include $(TOP_X_INCLUDES)/X11
-CPP_PROGRAM = CppCmd
-CPP_DEFINES = -DCPP_PROGRAM="\"$(CPP_PROGRAM)\""
-DEFINES = $(SIGNAL_DEFINES) $(BOOTSTRAPCFLAGS) $(CPP_DEFINES)
-
-#if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture)
-XBSDLIB = /**/
-#endif
-
-#if !defined(OS2Architecture)
-#undef ImakeDependency
-#define ImakeDependency(dummy) @@\
-Makefile::  ProgramTargetName(imake)
-
-#if CrossCompiling
-SimpleHostProgramTarget(imake)
-#else
-SimpleProgramTarget(imake)
-#endif
-InstallLinkKitNamedProg(imake,imake,$(LINKKITDIR)/config/imake)
-#else /* OS2Architecture */
-all::
-
-CCOPTIONS = -Zsysv-signals
-EXTRA_LIBRARIES = /*nothing*/
-SimpleProgramTarget(imake)
-InstallLinkKitNamedProg(imake,imake,$(LINKKITDIR)/config/imake)
-InstallNamedProg(imakesvc.cmd,imakesvc.cmd,$(BINDIR))
-InstallLinkKitNamedProg(imakesvc.cmd,imakesvc.cmd,$(LINKKITDIR)/config/imake)
-#endif
-
-#if HasClearmake
-bootstrapdepend: depend
-#else
-bootstrapdepend:
-#endif
-
-clean::
-	RemoveFile(ProgramTargetName(ccimake))
-	$(RM) -r bootstrap
--- a/Xvnc/config/imake/Makefile.ini
+++ /dev/null
@@ -1,73 +0,0 @@
-# $TOG: Makefile.ini /main/25 1997/02/19 18:00:59 mgreess $
-#
-#   WARNING    WARNING    WARNING    WARNING    WARNING    WARNING    WARNING
-#
-# This is NOT an automatically generated Makefile!  It is hand-crafted as a 
-# bootstrap, may need editing for your system.  The BOOTSTRAPCFLAGS variable
-# may be given at the top of the build tree for systems that do not define
-# any machine-specific preprocessor symbols.
-#
-# $XFree86: xc/config/imake/Makefile.ini,v 3.4.2.1 1997/06/11 12:08:33 dawes Exp $
-
-BOOTSTRAPCFLAGS = 
-CC = cc
-CDEBUGFLAGS = -O
-INCLUDES = -I../../include -I../../imports/x11/include/X11
-CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES)
-SHELL = /bin/sh
-RM = rm -f
-MV = mv
-MAKE = make
-RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a \
-	 tags TAGS make.log
-NPROC = 1
-
-imake::
-	@echo "making imake with BOOTSTRAPCFLAGS=$(BOOTSTRAPCFLAGS) in config/imake"
-
-imake:: imake.o
-	$(CC) -o imake $(CFLAGS) imake.o
-
-imake.o: ccimake imake.c
-	$(CC) -c $(CFLAGS) `./ccimake` imake.c
-
-ccimake: ccimake.c
-	$(CC) -o ccimake $(CFLAGS) ccimake.c
-
-# a derived object erroneously would get shared across platforms by clearmake
-.NO_CONFIG_REC: ccimake
-
-bootstrap:
-	-@if [ -d bootstrap ]; then exit 0; else set -x; mkdir bootstrap; fi
-	$(MV) *.o imake bootstrap
-
-relink:
-	$(RM) imake
-	$(MAKE) $(MFLAGS) imake
-
-clean:
-	$(RM) ccimake imake.o imake
-	$(RM_CMD) \#*
-	$(RM) -r Makefile.proto Makefile Makefile.dep bootstrap
-
-depend:
-
-imake.exe::
-	@echo making imake with BOOTSTRAPCFLAGS=-DWIN32
-
-imake.exe:: imake.obj
-	cl -nologo imake.obj libc.lib kernel32.lib
-
-imake.obj: imake.c
-	cl -nologo -W2 -D__STDC__ -c -DWIN32 $(CFLAGS) imake.c
-
-clean.Win32:
-	if exist imake.exe del imake.exe
-	if exist imake.obj del imake.obj
-
-clean.os2:
-	imakesvc 4 imake imake.exe imake.o /imake.exe
-
-imake.os2: imake.c
-	$(CC) -DBSD43 $(CFLAGS) -o imake.exe imake.c
-	copy imake.exe \\ 
--- a/Xvnc/config/imake/ccimake.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $XConsortium: ccimake.c /main/15 1996/09/28 16:14:25 rws $ */
-/*
-
-Copyright (c) 1993, 1994  X Consortium
-
-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, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-
-/* 
- * Warning:  This file must be kept as simple as posible so that it can 
- * compile without any special flags on all systems.  Do not touch it unless
- * you *really* know what you're doing.  Make changes in imakemdep.h, not here.
- */
-
-#define CCIMAKE			/* only get imake_ccflags definitions */
-#include "imakemdep.h"		/* things to set when porting imake */
-
-#ifndef imake_ccflags
-#define imake_ccflags "-O"
-#endif
-
-main()
-{
-	write(1, imake_ccflags, sizeof(imake_ccflags) - 1);
-	exit(0);
-}
-
--- a/Xvnc/config/imake/imake.c
+++ /dev/null
@@ -1,1509 +0,0 @@
-/* $TOG: imake.c /main/97 1997/06/20 20:23:51 kaleb $ */
-
-/***************************************************************************
- *                                                                         *
- *                                Porting Note                             *
- *                                                                         *
- * Add the value of BOOTSTRAPCFLAGS to the cpp_argv table so that it will  *
- * be passed to the template file.                                         *
- *                                                                         *
- ***************************************************************************/
-/* $XFree86: xc/config/imake/imake.c,v 3.13.2.16 1998/03/01 00:34:54 dawes Exp $ */
-
-/*
- * 
-Copyright (c) 1985, 1986, 1987  X Consortium
-
-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, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
- * 
- * Original Author:
- *	Todd Brunhoff
- *	Tektronix, inc.
- *	While a guest engineer at Project Athena, MIT
- *
- * imake: the include-make program.
- *
- * Usage: imake [-Idir] [-Ddefine] [-T template] [-f imakefile ] [-C Imakefile.c ] [-s] [-e] [-v] [make flags]
- *
- * Imake takes a template file (Imake.tmpl) and a prototype (Imakefile)
- * and runs cpp on them producing a Makefile.  It then optionally runs make
- * on the Makefile.
- * Options:
- *		-D	define.  Same as cpp -D argument.
- *		-I	Include directory.  Same as cpp -I argument.
- *		-T	template.  Designate a template other
- *			than Imake.tmpl
- *		-f	specify the Imakefile file
- *		-C	specify the name to use instead of Imakefile.c
- *		-s[F]	show.  Show the produced makefile on the standard
- *			output.  Make is not run is this case.  If a file
- *			argument is provided, the output is placed there.
- *              -e[F]   execute instead of show; optionally name Makefile F
- *		-v	verbose.  Show the make command line executed.
- *
- * Environment variables:
- *		
- *		IMAKEINCLUDE	Include directory to use in addition to "."
- *		IMAKECPP	Cpp to use instead of /lib/cpp
- *		IMAKEMAKE	make program to use other than what is
- *				found by searching the $PATH variable.
- * Other features:
- *	imake reads the entire cpp output into memory and then scans it
- *	for occurences of "@@".  If it encounters them, it replaces it with
- *	a newline.  It also trims any trailing white space on output lines
- *	(because make gets upset at them).  This helps when cpp expands
- *	multi-line macros but you want them to appear on multiple lines.
- *	It also changes occurences of "XCOMM" to "#", to avoid problems
- *	with treating commands as invalid preprocessor commands.
- *
- *	The macros MAKEFILE and MAKE are provided as macros
- *	to make.  MAKEFILE is set to imake's makefile (not the constructed,
- *	preprocessed one) and MAKE is set to argv[0], i.e. the name of
- *	the imake program.
- *
- * Theory of operation:
- *   1. Determine the name of the imakefile from the command line (-f)
- *	or from the content of the current directory (Imakefile or imakefile).
- *	Call this <imakefile>.  This gets added to the arguments for
- *	make as MAKEFILE=<imakefile>.
- *   2. Determine the name of the template from the command line (-T)
- *	or the default, Imake.tmpl.  Call this <template>
- *   3. Determine the name of the imakeCfile from the command line (-C)
- *	or the default, Imakefile.c.  Call this <imakeCfile>
- *   4. Store lines of input into <imakeCfile>:
- *	- A c-style comment header (see ImakefileCHeader below), used
- *	  to recognize temporary files generated by imake.
- *	- If DEFAULT_OS_NAME is defined, format the utsname struct and
- *	  call the result <defaultOsName>.  Add:
- *		#define DefaultOSName <defaultOsName>
- *	- If DEFAULT_OS_MAJOR_REV is defined, format the utsname struct
- *	  and call the result <defaultOsMajorVersion>.  Add:
- *		#define DefaultOSMajorVersion <defaultOsMajorVersion>
- *	- If DEFAULT_OS_MINOR_REV is defined, format the utsname struct
- *	  and call the result <defaultOsMinorVersion>.  Add:
- *		#define DefaultOSMinorVersion <defaultOsMinorVersion>
- *	- If DEFAULT_OS_TEENY_REV is defined, format the utsname struct
- *	  and call the result <defaultOsTeenyVersion>.  Add:
- *		#define DefaultOSTeenyVersion <defaultOsTeenyVersion>
- *      - If DEFAULT_MACHINE_ARCITECTURE is defined, format the utsname struct
- *        and define the corresponding macro. (For example on the amiga,
- *        this will define amiga in addition to m68k).    
- *	- If the file "localdefines" is readable in the current
- *	  directory, print a warning message to stderr and add: 
- *		#define IMAKE_LOCAL_DEFINES	"localdefines"
- *		#include IMAKE_LOCAL_DEFINES
- *	- If the file "admindefines" is readable in the current
- *	  directory, print a warning message to stderr and add: 
- *		#define IMAKE_ADMIN_DEFINES	"admindefines"
- *		#include IMAKE_ADMIN_DEFINES
- *	- The following lines:
- *		#define INCLUDE_IMAKEFILE	< <imakefile> >
- *		#define IMAKE_TEMPLATE		" <template> "
- *		#include IMAKE_TEMPLATE
- *	- If the file "adminmacros" is readable in the current
- *	  directory, print a warning message to stderr and add: 
- *		#define IMAKE_ADMIN_MACROS	"adminmacros"
- *		#include IMAKE_ADMIN_MACROS
- *	- If the file "localmacros" is readable in the current
- *	  directory, print a warning message to stderr and add: 
- *		#define IMAKE_LOCAL_MACROS	"localmacros"
- *		#include IMAKE_LOCAL_MACROS
- *   5. Start up cpp and provide it with this file.
- *	Note that the define for INCLUDE_IMAKEFILE is intended for
- *	use in the template file.  This implies that the imake is
- *	useless unless the template file contains at least the line
- *		#include INCLUDE_IMAKEFILE
- *   6. Gather the output from cpp, and clean it up, expanding @@ to
- *	newlines, stripping trailing white space, cpp control lines,
- *	and extra blank lines, and changing XCOMM to #.  This cleaned
- *	output is placed in a new file, default "Makefile", but can
- *	be specified with -s or -e options.
- *   7. Optionally start up make on the resulting file.
- *
- * The design of the template makefile should therefore be:
- *	<set global macros like CFLAGS, etc.>
- *	<include machine dependent additions>
- *	#include INCLUDE_IMAKEFILE
- *	<add any global targets like 'clean' and long dependencies>
- */
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-/* This needs to be before _POSIX_SOURCE gets defined */
-# include <sys/param.h>
-# include <sys/types.h>
-# include <sys/sysctl.h>
-#endif
-#include <stdio.h>
-#include "Xosdefs.h"
-#ifndef X_NOT_STDC_ENV
-#include <string.h>
-#endif
-#include <ctype.h>
-#ifdef WIN32
-# include "Xw32defs.h"
-#endif
-#ifndef X_NOT_POSIX
-# ifndef _POSIX_SOURCE
-#  define _POSIX_SOURCE
-# endif
-#endif
-#include <sys/types.h>
-#include <fcntl.h>
-#ifdef X_NOT_POSIX
-# ifndef WIN32
-#  include <sys/file.h>
-# endif
-#else
-# include <unistd.h>
-#endif
-#ifdef ISC
-# include <unistd.h>
-#endif
-#if defined(X_NOT_POSIX) || defined(_POSIX_SOURCE)
-# include <signal.h>
-#else
-# define _POSIX_SOURCE
-# include <signal.h>
-# undef _POSIX_SOURCE
-#endif
-#if !defined(SIGCHLD) && defined(SIGCLD)
-# define SIGCHLD		SIGCLD
-#endif
-#include <sys/stat.h>
-#ifndef X_NOT_POSIX
-# ifdef _POSIX_SOURCE
-#  ifdef SCO325
-#   include <sys/procset.h>
-#   include <sys/siginfo.h>
-#  endif
-#  include <sys/wait.h>
-# else
-#  define _POSIX_SOURCE
-#  include <sys/wait.h>
-#  undef _POSIX_SOURCE
-# endif
-# define waitCode(w)	WEXITSTATUS(w)
-# define waitSig(w)	WTERMSIG(w)
-typedef int		waitType;
-#else /* X_NOT_POSIX */
-# ifdef SYSV
-#  define waitCode(w)	(((w) >> 8) & 0x7f)
-#  define waitSig(w)	((w) & 0xff)
-typedef int		waitType;
-# else /* SYSV */
-#  ifdef WIN32
-#   include <process.h>
-typedef int		waitType;
-#  else
-#   include <sys/wait.h>
-#   define waitCode(w)	((w).w_T.w_Retcode)
-#   define waitSig(w)	((w).w_T.w_Termsig)
-typedef union wait	waitType;
-#  endif
-# endif
-# ifndef WIFSIGNALED
-#  define WIFSIGNALED(w) waitSig(w)
-# endif
-# ifndef WIFEXITED
-#  define WIFEXITED(w) waitCode(w)
-# endif
-#endif /* X_NOT_POSIX */
-#ifndef X_NOT_STDC_ENV
-# include <stdlib.h>
-#else
-char *malloc(), *realloc();
-void exit();
-#endif
-#if defined(macII) && !defined(__STDC__)  /* stdlib.h fails to define these */
-char *malloc(), *realloc();
-#endif /* macII */
-#ifdef X_NOT_STDC_ENV
-extern char	*getenv();
-#endif
-#include <errno.h>
-#ifdef X_NOT_STDC_ENV
-extern int	errno;
-#endif
-#ifdef __minix_vmd
-#define USE_FREOPEN		1
-#endif
-
-#if !(defined(X_NOT_STDC_ENV) || (defined(sun) && !defined(SVR4)) || defined(macII))
-#define USE_STRERROR		1
-#endif
-#ifdef __EMX__
-#define USE_STRERROR		1
-#endif
-#ifndef WIN32
-#include <sys/utsname.h>
-#endif
-#ifndef SYS_NMLN
-# ifdef _SYS_NMLN
-#  define SYS_NMLN _SYS_NMLN
-# else
-#  define SYS_NMLN 257
-# endif
-#endif
-#ifdef linux
-#include <limits.h>
-#endif
-/* 
- * is strstr() in <strings.h> on X_NOT_STDC_ENV? 
- * are there any X_NOT_STDC_ENV machines left in the world?
- */
-#include <string.h>
-#include "imakemdep.h"
-
-/*
- * This define of strerror is copied from (and should be identical to)
- * Xos.h, which we don't want to include here for bootstrapping reasons.
- */
-#ifndef USE_STRERROR
-# ifndef strerror
-extern char *sys_errlist[];
-extern int sys_nerr;
-#  define strerror(n) \
-    (((n) >= 0 && (n) < sys_nerr) ? sys_errlist[n] : "unknown error")
-# endif
-#endif
-
-#define	TRUE		1
-#define	FALSE		0
-
-#ifdef FIXUP_CPP_WHITESPACE
-int	InRule = FALSE;
-# ifdef INLINE_SYNTAX
-int	InInline = 0;
-# endif
-#endif
-#ifdef MAGIC_MAKE_VARS
-int xvariable = 0;
-int xvariables[10];
-#endif
-
-/*
- * Some versions of cpp reduce all tabs in macro expansion to a single
- * space.  In addition, the escaped newline may be replaced with a
- * space instead of being deleted.  Blech.
- */
-#ifdef FIXUP_CPP_WHITESPACE
-void KludgeOutputLine(), KludgeResetRule();
-#else
-# define KludgeOutputLine(arg)
-# define KludgeResetRule()
-#endif
-
-typedef	unsigned char	boolean;
-
-#ifdef USE_CC_E
-# ifndef DEFAULT_CC
-#  define DEFAULT_CC "cc"
-# endif
-#else
-# ifndef DEFAULT_CPP
-#  ifdef CPP_PROGRAM
-#   define DEFAULT_CPP CPP_PROGRAM
-#  else
-#   define DEFAULT_CPP "/lib/cpp"
-#  endif
-# endif
-#endif
-
-char *cpp = NULL;
-
-char	*tmpMakefile    = "/tmp/Imf.XXXXXX";
-char	*tmpImakefile    = "/tmp/IIf.XXXXXX";
-char	*make_argv[ ARGUMENTS ] = {
-#ifdef WIN32
-    "nmake"
-#else
-    "make"
-#endif
-};
-
-int	make_argindex;
-int	cpp_argindex;
-char	*Imakefile = NULL;
-char	*Makefile = "Makefile";
-char	*Template = "Imake.tmpl";
-char	*ImakefileC = "Imakefile.c";
-boolean haveImakefileC = FALSE;
-char	*cleanedImakefile = NULL;
-char	*program;
-char	*FindImakefile();
-char	*ReadLine();
-char	*CleanCppInput();
-char	*Strdup();
-char	*Emalloc();
-void	LogFatalI(), LogFatal(), LogMsg();
-
-void	showit();
-void	wrapup();
-void	init();
-void	AddMakeArg();
-void	AddCppArg();
-void	SetOpts();
-void	CheckImakefileC();
-void	cppit();
-void	makeit();
-void	CleanCppOutput();
-boolean	isempty();
-void	writetmpfile();
-
-boolean	verbose = FALSE;
-boolean	show = TRUE;
-
-int
-main(argc, argv)
-	int	argc;
-	char	**argv;
-{
-	FILE	*tmpfd;
-	char	makeMacro[ BUFSIZ ];
-	char	makefileMacro[ BUFSIZ ];
-
-	program = argv[0];
-	init();
-	SetOpts(argc, argv);
-
-	Imakefile = FindImakefile(Imakefile);
-	CheckImakefileC(ImakefileC);
-	if (Makefile)
-		tmpMakefile = Makefile;
-	else {
-		tmpMakefile = Strdup(tmpMakefile);
-		(void) mktemp(tmpMakefile);
-	}
-	AddMakeArg("-f");
-	AddMakeArg( tmpMakefile );
-	sprintf(makeMacro, "MAKE=%s", program);
-	AddMakeArg( makeMacro );
-	sprintf(makefileMacro, "MAKEFILE=%s", Imakefile);
-	AddMakeArg( makefileMacro );
-
-	if ((tmpfd = fopen(tmpMakefile, "w+")) == NULL)
-		LogFatal("Cannot create temporary file %s.", tmpMakefile);
-
-	cleanedImakefile = CleanCppInput(Imakefile);
-	cppit(cleanedImakefile, Template, ImakefileC, tmpfd, tmpMakefile);
-
-	if (show) {
-		if (Makefile == NULL)
-			showit(tmpfd);
-	} else
-		makeit();
-	wrapup();
-	exit(0);
-}
-
-void
-showit(fd)
-	FILE	*fd;
-{
-	char	buf[ BUFSIZ ];
-	int	red;
-
-	fseek(fd, 0, 0);
-	while ((red = fread(buf, 1, BUFSIZ, fd)) > 0)
-		writetmpfile(stdout, buf, red, "stdout");
-	if (red < 0)
-	    LogFatal("Cannot read %s.", tmpMakefile);
-}
-
-void
-wrapup()
-{
-	if (tmpMakefile != Makefile)
-		unlink(tmpMakefile);
-	if (cleanedImakefile && cleanedImakefile != Imakefile)
-		unlink(cleanedImakefile);
-	if (haveImakefileC)
-		unlink(ImakefileC);
-}
-
-#ifdef SIGNALRETURNSINT
-int
-#else
-void
-#endif
-catch(sig)
-	int	sig;
-{
-	errno = 0;
-	LogFatalI("Signal %d.", sig);
-}
-
-/*
- * Initialize some variables.
- */
-void
-init()
-{
-	register char	*p;
-
-	make_argindex=0;
-	while (make_argv[ make_argindex ] != NULL)
-		make_argindex++;
-	cpp_argindex = 0;
-	while (cpp_argv[ cpp_argindex ] != NULL)
-		cpp_argindex++;
-
-	/*
-	 * See if the standard include directory is different than
-	 * the default.  Or if cpp is not the default.  Or if the make
-	 * found by the PATH variable is not the default.
-	 */
-	if (p = getenv("IMAKEINCLUDE")) {
-		if (*p != '-' || *(p+1) != 'I')
-			LogFatal("Environment var IMAKEINCLUDE %s",
-				"must begin with -I");
-		AddCppArg(p);
-		for (; *p; p++)
-			if (*p == ' ') {
-				*p++ = '\0';
-				AddCppArg(p);
-			}
-	}
-	if (p = getenv("IMAKECPP"))
-		cpp = p;
-	if (p = getenv("IMAKEMAKE"))
-		make_argv[0] = p;
-
-	if (signal(SIGINT, SIG_IGN) != SIG_IGN)
-		signal(SIGINT, catch);
-#ifdef SIGCHLD
-	signal(SIGCHLD, SIG_DFL);
-#endif
-}
-
-void
-AddMakeArg(arg)
-	char	*arg;
-{
-	errno = 0;
-	if (make_argindex >= ARGUMENTS-1)
-		LogFatal("Out of internal storage.", "");
-	make_argv[ make_argindex++ ] = arg;
-	make_argv[ make_argindex ] = NULL;
-}
-
-void
-AddCppArg(arg)
-	char	*arg;
-{
-	errno = 0;
-	if (cpp_argindex >= ARGUMENTS-1)
-		LogFatal("Out of internal storage.", "");
-	cpp_argv[ cpp_argindex++ ] = arg;
-	cpp_argv[ cpp_argindex ] = NULL;
-}
-
-void
-SetOpts(argc, argv)
-	int	argc;
-	char	**argv;
-{
-	errno = 0;
-	/*
-	 * Now gather the arguments for make
-	 */
-	for(argc--, argv++; argc; argc--, argv++) {
-	    /*
-	     * We intercept these flags.
-	     */
-	    if (argv[0][0] == '-') {
-		if (argv[0][1] == 'D') {
-		    AddCppArg(argv[0]);
-		} else if (argv[0][1] == 'I') {
-		    AddCppArg(argv[0]);
-		} else if (argv[0][1] == 'f') {
-		    if (argv[0][2])
-			Imakefile = argv[0]+2;
-		    else {
-			argc--, argv++;
-			if (! argc)
-			    LogFatal("No description arg after -f flag", "");
-			Imakefile = argv[0];
-		    }
-		} else if (argv[0][1] == 's') {
-		    if (argv[0][2])
-			Makefile = ((argv[0][2] == '-') && !argv[0][3]) ?
-			    NULL : argv[0]+2;
-		    else {
-			argc--, argv++;
-			if (!argc)
-			    LogFatal("No description arg after -s flag", "");
-			Makefile = ((argv[0][0] == '-') && !argv[0][1]) ?
-			    NULL : argv[0];
-		    }
-		    show = TRUE;
-		} else if (argv[0][1] == 'e') {
-		   Makefile = (argv[0][2] ? argv[0]+2 : NULL);
-		   show = FALSE;
-		} else if (argv[0][1] == 'T') {
-		    if (argv[0][2])
-			Template = argv[0]+2;
-		    else {
-			argc--, argv++;
-			if (! argc)
-			    LogFatal("No description arg after -T flag", "");
-			Template = argv[0];
-		    }
-		} else if (argv[0][1] == 'C') {
-		    if (argv[0][2])
-			ImakefileC = argv[0]+2;
-		    else {
-			argc--, argv++;
-			if (! argc)
-			    LogFatal("No imakeCfile arg after -C flag", "");
-			ImakefileC = argv[0];
-		    }
-		} else if (argv[0][1] == 'v') {
-		    verbose = TRUE;
-		} else
-		    AddMakeArg(argv[0]);
-	    } else
-		AddMakeArg(argv[0]);
-	}
-#ifdef USE_CC_E
-	if (!cpp)
-	{
-		AddCppArg("-E");
-		cpp = DEFAULT_CC;
-	}
-#else
-	if (!cpp)
-		cpp = DEFAULT_CPP;
-#endif
-	cpp_argv[0] = cpp;
-	AddCppArg(ImakefileC);
-}
-
-char *
-FindImakefile(Imakefile)
-	char	*Imakefile;
-{
-	if (Imakefile) {
-		if (access(Imakefile, R_OK) < 0)
-			LogFatal("Cannot find %s.", Imakefile);
-	} else {
-		if (access("Imakefile", R_OK) < 0)
-			if (access("imakefile", R_OK) < 0)
-				LogFatal("No description file.", "");
-			else
-				Imakefile = "imakefile";
-		else
-			Imakefile = "Imakefile";
-	}
-	return(Imakefile);
-}
-
-void
-LogFatalI(s, i)
-	char *s;
-	int i;
-{
-	/*NOSTRICT*/
-	LogFatal(s, (char *)(long)i);
-}
-
-void
-LogFatal(x0,x1)
-	char *x0, *x1;
-{
-	static boolean	entered = FALSE;
-
-	if (entered)
-		return;
-	entered = TRUE;
-
-	LogMsg(x0, x1);
-	fprintf(stderr, "  Stop.\n");
-	wrapup();
-	exit(1);
-}
-
-void
-LogMsg(x0,x1)
-	char *x0, *x1;
-{
-	int error_number = errno;
-
-	if (error_number) {
-		fprintf(stderr, "%s: ", program);
-		fprintf(stderr, "%s\n", strerror(error_number));
-	}
-	fprintf(stderr, "%s: ", program);
-	fprintf(stderr, x0, x1);
-	fprintf(stderr, "\n");
-}
-
-void
-showargs(argv)
-	char	**argv;
-{
-	for (; *argv; argv++)
-		fprintf(stderr, "%s ", *argv);
-	fprintf(stderr, "\n");
-}
-
-#define ImakefileCHeader "/* imake - temporary file */"
-
-void
-CheckImakefileC(masterc)
-	char *masterc;
-{
-	char mkcbuf[1024];
-	FILE *inFile;
-
-	if (access(masterc, F_OK) == 0) {
-		inFile = fopen(masterc, "r");
-		if (inFile == NULL)
-			LogFatal("Refuse to overwrite: %s", masterc);
-		if ((fgets(mkcbuf, sizeof(mkcbuf), inFile) &&
-		     strncmp(mkcbuf, ImakefileCHeader, 
-			     sizeof(ImakefileCHeader)-1)))
-		{
-			fclose(inFile);
-			LogFatal("Refuse to overwrite: %s", masterc);
-		}
-		fclose(inFile);
-	}
-}
-
-#define LocalDefineFmt	"#define %s \"%s\"\n"
-#define IncludeFmt	"#include %s\n"
-#define ImakeDefSym	"INCLUDE_IMAKEFILE"
-#define ImakeTmplSym	"IMAKE_TEMPLATE"
-#define OverrideWarning	"Warning: local file \"%s\" overrides global macros."
-
-boolean
-optional_include(inFile, defsym, fname)
-        FILE	*inFile;
-        char    *defsym;
-        char    *fname;
-{
-	errno = 0;
-	if (access(fname, R_OK) == 0) {
-		LogMsg(OverrideWarning, fname);
-		return (fprintf(inFile, LocalDefineFmt, defsym, fname) < 0 ||
-			fprintf(inFile, IncludeFmt, defsym) < 0);
-	}
-	return FALSE;
-}
-
-void
-doit(outfd, cmd, argv)
-	FILE	*outfd;
-	char    *cmd;
-	char	**argv;
-{
-	int	pid;
-	waitType	status;
-
-	/*
-	 * Fork and exec the command.
-	 */
-#ifdef WIN32
-	if (outfd)
-		dup2(fileno(outfd), 1);
-	status = _spawnvp(_P_WAIT, cmd, argv);
-	if (status < 0)
-		LogFatal("Cannot spawn %s.", cmd);
-	if (status > 0)
-		LogFatalI("Exit code %d.", status);
-#else
-	pid = fork();
-	if (pid < 0)
-		LogFatal("Cannot fork.", "");
-	if (pid) {	/* parent... simply wait */
-		while (wait(&status) > 0) {
-			errno = 0;
-			if (WIFSIGNALED(status))
-				LogFatalI("Signal %d.", waitSig(status));
-			if (WIFEXITED(status) && waitCode(status))
-				LogFatalI("Exit code %d.", waitCode(status));
-		}
-	}
-	else {	/* child... dup and exec cmd */
-		if (verbose)
-			showargs(argv);
-		if (outfd)
-			dup2(fileno(outfd), 1);
-		execvp(cmd, argv);
-		LogFatal("Cannot exec %s.", cmd);
-	}
-#endif
-}
-
-#ifndef WIN32
-static void
-parse_utsname(name, fmt, result, msg)
-     struct utsname *name;
-     char *fmt;
-     char *result;
-     char *msg;
-{
-  char buf[SYS_NMLN * 5 + 1];
-  char *ptr = buf;
-  int arg;
-
-  /* Assemble all the pieces into a buffer. */
-  for (arg = 0; fmt[arg] != ' '; arg++)
-    {
-      /* Our buffer is only guaranteed to hold 5 arguments. */
-      if (arg >= 5)
-	LogFatal(msg, fmt);
-
-      switch (fmt[arg])
-	{
-	case 's':
-	  if (arg > 0)
-	    *ptr++ = ' ';
-	  strcpy(ptr, name->sysname);
-	  ptr += strlen(ptr);
-	  break;
-
-	case 'n':
-	  if (arg > 0)
-	    *ptr++ = ' ';
-	  strcpy(ptr, name->nodename);
-	  ptr += strlen(ptr);
-	  break;
-
-	case 'r':
-	  if (arg > 0)
-	    *ptr++ = ' ';
-	  strcpy(ptr, name->release);
-	  ptr += strlen(ptr);
-	  break;
-
-	case 'v':
-	  if (arg > 0)
-	    *ptr++ = ' ';
-	  strcpy(ptr, name->version);
-	  ptr += strlen(ptr);
-	  break;
-
-	case 'm':
-	  if (arg > 0)
-	    *ptr++ = ' ';
-	  strcpy(ptr, name->machine);
-	  ptr += strlen(ptr);
-	  break;
-
-	default:
-	  LogFatal(msg, fmt);
-	}
-    }
-
-  /* Just in case... */
-  if (strlen(buf) >= sizeof(buf))
-    LogFatal("Buffer overflow parsing uname.", "");
-
-  /* Parse the buffer.  The sscanf() return value is rarely correct. */
-  *result = '\0';
-  (void) sscanf(buf, fmt + arg + 1, result);
-}
-
-/* Trim leading 0's and periods from version names.  The 0's cause
-   the number to be interpreted as octal numbers.  Some version strings
-   have the potential for different numbers of .'s in them.
- */
-	
-static char *
-trim_version(p)
-	char *p;
-{
-
-	if (p != 0 && *p != '\0')
-	{
-		while ((*p == '0' || *p == '.') && *(p + 1) != '\0')
-			++p;
-	}
-	return (p);
-}
-#endif
-
-
-#ifdef linux
-const char *libc_c=
-"#include <stdio.h>\n"
-"#include <ctype.h>\n"
-"\n"
-"#if 0\n"
-"#pragma weak gnu_get_libc_version\n"
-"#pragma weak __libc_version\n"
-"#pragma weak __linux_C_lib_version\n"
-"#else\n"
-"asm (\".weak gnu_get_libc_version\");\n"
-"asm (\".weak __libc_version\");\n"
-"asm (\".weak __linux_C_lib_version\");\n"
-"#endif\n"
-"\n"
-"extern const char * gnu_get_libc_version (void);\n"
-"extern const char * __linux_C_lib_version;\n"
-"extern const char __libc_version [];\n"
-"\n"
-"int\n"
-"main ()\n"
-"{\n"
-"  int libcmajor = 0, libcminor = 0, libcteeny = 0;\n"
-"\n"
-"  if (((&__linux_C_lib_version != 0)\n"
-"       && ((&__libc_version != 0) || (gnu_get_libc_version != 0)))\n"
-"      || (!(&__linux_C_lib_version != 0) && !(&__libc_version != 0)\n"
-"	  && !(gnu_get_libc_version != 0)))\n"
-"  {\n"
-"    libcmajor = 0;\n"
-"    libcminor = 0;\n"
-"    libcteeny = 0;\n"
-"  }\n"
-"  else\n"
-"  {\n"
-"    const char * ptr;\n"
-"    int glibcmajor = 0;\n"
-"\n"
-"    if (gnu_get_libc_version != 0)\n"
-"    {\n"
-"      ptr = gnu_get_libc_version ();\n"
-"      glibcmajor = 4;\n"
-"    }\n"
-"    else if (&__libc_version != 0)\n"
-"    {\n"
-"      ptr = __libc_version;\n"
-"      glibcmajor = 4;\n"
-"    }\n"
-"    else\n"
-"      ptr = __linux_C_lib_version;\n"
-"\n"
-"    while (!isdigit (*ptr))\n"
-"      ptr++;\n"
-"\n"
-"    sscanf (ptr, \"%d.%d.%d\", &libcmajor, &libcminor, &libcteeny);\n"
-"    libcmajor += glibcmajor;\n"
-"  }\n"
-"\n"
-"  printf(\"#define DefaultLinuxCLibMajorVersion %d\\n\", libcmajor);\n"
-"  printf(\"#define DefaultLinuxCLibMinorVersion %d\\n\", libcminor);\n"
-"  printf(\"#define DefaultLinuxCLibTeenyVersion %d\\n\", libcteeny);\n"
-"\n"
-"  return 0;\n"
-"}\n"
-;
-
-static void get_libc_version(inFile)
-  FILE* inFile;
-{
-  char *aout = tmpnam (NULL);
-  FILE *fp;
-  const char *format = "%s -o %s -x c -";
-  char *cc;
-  int len;
-  char *command;
-
-  cc = getenv ("CC");
-  if (cc == NULL)
-    cc = "gcc";
-  len = strlen (aout) + strlen (format) + strlen (cc);
-  if (len < 128) len = 128;
-  command = alloca (len);
-
-  if (snprintf (command , len, format, cc, aout) == len)
-    abort ();
-
-  fp = popen (command, "w");
-  if (fp == NULL || fprintf (fp, "%s\n", libc_c) < 0
-      || pclose (fp) != 0)
-    abort ();
-
-  fp = popen (aout, "r");
-  if (fp == NULL)
-    abort ();
-
-  while (fgets (command, len, fp))
-    fprintf (inFile, command);
-  
-  len = pclose (fp);
-  remove (aout);
-  if (len)
-    abort ();
-}
-
-static void get_ld_version(inFile)
-  FILE* inFile;
-{
-  FILE* ldprog = popen ("ld -v", "r");
-  char c;
-  int ldmajor, ldminor;
-
-  if (ldprog) {
-    do {
-      c = fgetc (ldprog);
-    } while (c != EOF && !isdigit (c));
-    ungetc (c, ldprog);
-    (void) fscanf (ldprog, "%d.%d", &ldmajor, &ldminor);
-    fprintf(inFile, "#define DefaultLinuxBinUtilsMajorVersion %d\n", 
-	    ldmajor * 10 + ldminor);    
-    pclose (ldprog);
-  }
-}
-#endif
-
-#ifndef PATH_MAX
-#define PATH_MAX 1024
-#endif
-
-#ifndef __EMX__
-static void get_gcc_incdir(inFile)
-  FILE* inFile;
-{
-  static char* gcc_path[] = {
-#if defined(linux) || defined(__OpenBSD__)
-    "/usr/bin/cc",	/* for Linux PostIncDir */
-#endif
-    "/usr/local/bin/gcc",
-    "/opt/gnu/bin/gcc"
-  };
-  struct stat sb;
-  int i;
-  FILE* gccproc;
-  char buf[PATH_MAX];
-  char cmd[PATH_MAX];
-  char* ptr;
-
-  buf[0] = '\0';
-  for (i = 0; i < sizeof gcc_path / sizeof gcc_path[0]; i++) {
-    if (lstat (gcc_path[i], &sb) == 0) {
-      strcpy (cmd, gcc_path[i]);
-      strcat (cmd, " --print-libgcc-file-name");
-      if ((gccproc = popen (cmd, "r")) != NULL) {
-	if (fgets (buf, PATH_MAX, gccproc) != NULL) {
-	  ptr = strstr (buf, "libgcc.a");
-	  if (ptr) strcpy (ptr, "include");
-	}
-	(void) pclose (gccproc);
-	break;
-      }
-    }
-  }
-  if (buf[0])
-    fprintf (inFile, "#define DefaultGccIncludeDir %s\n", buf);
-}
-#endif
-
-boolean
-define_os_defaults(inFile)
-	FILE	*inFile;
-{
-#if !defined(WIN32) && !defined(__EMX__)
-#if (defined(DEFAULT_OS_NAME) || defined(DEFAULT_OS_MAJOR_REV) || \
-     defined(DEFAULT_OS_MINOR_REV) || defined(DEFAUL_OS_TEENY_REV))
-	struct utsname name;
-	char buf[SYS_NMLN * 5 + 1];
-
-	/* Obtain the system information. */
-	if (uname(&name) < 0)
-		LogFatal("Cannot invoke uname", "");
-
-# ifdef DEFAULT_OS_NAME
-	parse_utsname(&name, DEFAULT_OS_NAME, buf, 
-		      "Bad DEFAULT_OS_NAME syntax %s");
-#  ifdef DEFAULT_OS_NAME_FROB
-	DEFAULT_OS_NAME_FROB(buf, sizeof buf);
-#  endif
-	if (buf[0] != '\0')
-		fprintf(inFile, "#define DefaultOSName %s\n", buf);
-# endif
-
-# ifdef DEFAULT_OS_MAJOR_REV
-	parse_utsname(&name, DEFAULT_OS_MAJOR_REV, buf,
-		      "Bad DEFAULT_OS_MAJOR_REV syntax %s");
-#  ifdef DEFAULT_OS_MAJOR_REV_FROB
-	DEFAULT_OS_MAJOR_REV_FROB(buf, sizeof buf);
-#  endif
-	fprintf(inFile, "#define DefaultOSMajorVersion %s\n",
-		*buf ? trim_version(buf) : "0");
-# endif
-
-# ifdef DEFAULT_OS_MINOR_REV
-	parse_utsname(&name, DEFAULT_OS_MINOR_REV, buf,
-		      "Bad DEFAULT_OS_MINOR_REV syntax %s");
-#  ifdef DEFAULT_OS_MINOR_REV_FROB
-	DEFAULT_OS_MINOR_REV_FROB(buf, sizeof buf);
-#  endif
-	fprintf(inFile, "#define DefaultOSMinorVersion %s\n",
-		*buf ? trim_version(buf) : "0");
-# endif
-
-# ifdef DEFAULT_OS_TEENY_REV
-	parse_utsname(&name, DEFAULT_OS_TEENY_REV, buf,
-		      "Bad DEFAULT_OS_TEENY_REV syntax %s");
-#  ifdef DEFAULT_OS_TEENY_REV_FROB
-	DEFAULT_OS_TEENY_REV_FROB(buf, sizeof buf);
-#  endif
-	fprintf(inFile, "#define DefaultOSTeenyVersion %s\n",
-		*buf ? trim_version(buf) : "0");
-# endif
-# ifdef DEFAULT_MACHINE_ARCHITECTURE
-	parse_utsname(&name, DEFAULT_MACHINE_ARCHITECTURE, buf, 
-		      "Bad DEFAULT_MACHINE_ARCHITECTURE %s");
-	fprintf(inFile, "#ifndef %s\n# define %s\n#endif\n", buf, buf);
-# endif
-#endif
-#ifdef linux
-    get_libc_version (inFile);
-    get_ld_version(inFile);
-#endif
-    get_gcc_incdir(inFile);
-#endif /* WIN32 */
-	return FALSE;
-}
-
-void
-cppit(imakefile, template, masterc, outfd, outfname)
-	char	*imakefile;
-	char	*template;
-	char	*masterc;
-	FILE	*outfd;
-	char	*outfname;
-{
-	FILE	*inFile;
-
-	haveImakefileC = TRUE;
-	inFile = fopen(masterc, "w");
-	if (inFile == NULL)
-		LogFatal("Cannot open %s for output.", masterc);
-	if (fprintf(inFile, "%s\n", ImakefileCHeader) < 0 ||
-	    define_os_defaults(inFile) ||
-	    optional_include(inFile, "IMAKE_LOCAL_DEFINES", "localdefines") ||
-	    optional_include(inFile, "IMAKE_ADMIN_DEFINES", "admindefines") ||
-	    fprintf(inFile, "#define %s <%s>\n", ImakeDefSym, imakefile) < 0 ||
-	    fprintf(inFile, LocalDefineFmt, ImakeTmplSym, template) < 0 ||
-	    fprintf(inFile, IncludeFmt, ImakeTmplSym) < 0 ||
-	    optional_include(inFile, "IMAKE_ADMIN_MACROS", "adminmacros") ||
-	    optional_include(inFile, "IMAKE_LOCAL_MACROS", "localmacros") ||
-	    fflush(inFile) || 
-	    fclose(inFile))
-		LogFatal("Cannot write to %s.", masterc);
-	/*
-	 * Fork and exec cpp
-	 */
-	doit(outfd, cpp, cpp_argv);
-	CleanCppOutput(outfd, outfname);
-}
-
-void
-makeit()
-{
-	doit(NULL, make_argv[0], make_argv);
-}
-
-char *
-CleanCppInput(imakefile)
-	char	*imakefile;
-{
-	FILE	*outFile = NULL;
-	FILE	*inFile;
-	char	*buf,		/* buffer for file content */
-		*pbuf,		/* walking pointer to buf */
-		*punwritten,	/* pointer to unwritten portion of buf */
-		*ptoken,	/* pointer to # token */
-		*pend,		/* pointer to end of # token */
-		savec;		/* temporary character holder */
-	int	count;
-	struct stat	st;
-
-	/*
-	 * grab the entire file.
-	 */
-	if (!(inFile = fopen(imakefile, "r")))
-		LogFatal("Cannot open %s for input.", imakefile);
-	if (fstat(fileno(inFile), &st) < 0)
-		LogFatal("Cannot stat %s for size.", imakefile);
-	buf = Emalloc((int)st.st_size+3);
-	count = fread(buf + 2, 1, st.st_size, inFile);
-	if (count == 0  &&  st.st_size != 0)
-		LogFatal("Cannot read %s:", imakefile);
-	fclose(inFile);
-	buf[0] = '\n';
-	buf[1] = '\n';
-	buf[count + 2] = '\0';
-
-	punwritten = pbuf = buf + 2;
-	while (*pbuf) {
-	    /* for compatibility, replace make comments for cpp */
-	    if (*pbuf == '#' && pbuf[-1] == '\n' && pbuf[-2] != '\\') {
-		ptoken = pbuf+1;
-		while (*ptoken == ' ' || *ptoken == '\t')
-			ptoken++;
-		pend = ptoken;
-		while (*pend && *pend != ' ' && *pend != '\t' && *pend != '\n')
-			pend++;
-		savec = *pend;
-		*pend = '\0';
-		if (strcmp(ptoken, "define") &&
-		    strcmp(ptoken, "if") &&
-		    strcmp(ptoken, "ifdef") &&
-		    strcmp(ptoken, "ifndef") &&
-		    strcmp(ptoken, "include") &&
-		    strcmp(ptoken, "line") &&
-		    strcmp(ptoken, "else") &&
-		    strcmp(ptoken, "elif") &&
-		    strcmp(ptoken, "endif") &&
-		    strcmp(ptoken, "error") &&
-		    strcmp(ptoken, "pragma") &&
-		    strcmp(ptoken, "undef")) {
-		    if (outFile == NULL) {
-			tmpImakefile = Strdup(tmpImakefile);
-			(void) mktemp(tmpImakefile);
-			outFile = fopen(tmpImakefile, "w");
-			if (outFile == NULL)
-			    LogFatal("Cannot open %s for write.",
-				tmpImakefile);
-		    }
-		    writetmpfile(outFile, punwritten, pbuf-punwritten,
-				 tmpImakefile);
-		    if (ptoken > pbuf + 1)
-			writetmpfile(outFile, "XCOMM", 5, tmpImakefile);
-		    else
-			writetmpfile(outFile, "XCOMM ", 6, tmpImakefile);
-		    punwritten = pbuf + 1;
-		}
-		*pend = savec;
-	    }
-	    pbuf++;
-	}
-	if (outFile) {
-	    writetmpfile(outFile, punwritten, pbuf-punwritten, tmpImakefile);
-	    fclose(outFile);
-	    return tmpImakefile;
-	}
-
-	return(imakefile);
-}
-
-void
-CleanCppOutput(tmpfd, tmpfname)
-	FILE	*tmpfd;
-	char	*tmpfname;
-{
-	char	*input;
-	int	blankline = 0;
-
-	while(input = ReadLine(tmpfd, tmpfname)) {
-		if (isempty(input)) {
-			if (blankline++)
-				continue;
-			KludgeResetRule();
-		} else {
-			blankline = 0;
-			KludgeOutputLine(&input);
-			writetmpfile(tmpfd, input, strlen(input), tmpfname);
-		}
-		writetmpfile(tmpfd, "\n", 1, tmpfname);
-	}
-	fflush(tmpfd);
-#ifdef NFS_STDOUT_BUG
-	/*
-	 * On some systems, NFS seems to leave a large number of nulls at
-	 * the end of the file.  Ralph Swick says that this kludge makes the
-	 * problem go away.
-	 */
-	ftruncate (fileno(tmpfd), (off_t)ftell(tmpfd));
-#endif
-}
-
-/*
- * Determine if a line has nothing in it.  As a side effect, we trim white
- * space from the end of the line.  Cpp magic cookies are also thrown away.
- * "XCOMM" token is transformed to "#".
- */
-boolean
-isempty(line)
-	register char	*line;
-{
-	register char	*pend;
-
-	/*
-	 * Check for lines of the form
-	 *	# n "...
-	 * or
-	 *	# line n "...
-	 */
-	if (*line == '#') {
-		pend = line+1;
-		if (*pend == ' ')
-			pend++;
-		if (*pend == 'l' && pend[1] == 'i' && pend[2] == 'n' &&
-		    pend[3] == 'e' && pend[4] == ' ')
-			pend += 5;
-		if (isdigit(*pend)) {
-		    	do {
-			    pend++;
-			} while (isdigit(*pend));
-			if (*pend == '\n' || *pend == '\0')
-				return(TRUE);
-			if (*pend++ == ' ' && *pend == '"')
-				return(TRUE);
-		}
-		while (*pend)
-		    pend++;
-	} else {
-	    for (pend = line; *pend; pend++) {
-		if (*pend == 'X' && pend[1] == 'C' && pend[2] == 'O' &&
-		    pend[3] == 'M' && pend[4] == 'M' &&
-		    (pend == line || pend[-1] == ' ' || pend[-1] == '\t') &&
-		    (pend[5] == ' ' || pend[5] == '\t' || pend[5] == '\0'))
-		{
-		    *pend = '#';
-		    strcpy(pend+1, pend+5);
-		}
-#ifdef MAGIC_MAKE_VARS
-		if (*pend == 'X' && pend[1] == 'V' && pend[2] == 'A' &&
-		    pend[3] == 'R')
-		{
-		    char varbuf[5];
-		    int i;
-
-		    if (pend[4] == 'd' && pend[5] == 'e' && pend[6] == 'f' &&
-			pend[7] >= '0' && pend[7] <= '9')
-		    {
-			i = pend[7] - '0';
-			sprintf(varbuf, "%0.4d", xvariable);
-			strncpy(pend+4, varbuf, 4);
-			xvariables[i] = xvariable;
-			xvariable = (xvariable + 1) % 10000;
-		    }
-		    else if (pend[4] == 'u' && pend[5] == 's' &&
-			     pend[6] == 'e' && pend[7] >= '0' &&
-			     pend[7] <= '9')
-		    {
-			i = pend[7] - '0';
-			sprintf(varbuf, "%0.4d", xvariables[i]);
-			strncpy(pend+4, varbuf, 4);
-		    }
-		}
-#endif
-	    }
-	}
-	while (--pend >= line && (*pend == ' ' || *pend == '\t')) ;
-	pend[1] = '\0';
-	return (*line == '\0');
-}
-
-/*ARGSUSED*/
-char *
-ReadLine(tmpfd, tmpfname)
-	FILE	*tmpfd;
-	char	*tmpfname;
-{
-	static boolean	initialized = FALSE;
-	static char	*buf, *pline, *end;
-	register char	*p1, *p2;
-
-	if (! initialized) {
-#ifdef WIN32
-		FILE *fp = tmpfd;
-#endif
-		int	total_red;
-		struct stat	st;
-
-		/*
-		 * Slurp it all up.
-		 */
-		fseek(tmpfd, 0, 0);
-		if (fstat(fileno(tmpfd), &st) < 0)
-			LogFatal("cannot stat %s for size", tmpMakefile);
-		pline = buf = Emalloc((int)st.st_size+1);
-		total_red = fread(buf, 1, st.st_size, tmpfd);
-		if (total_red == 0  &&  st.st_size != 0)
-			LogFatal("cannot read %s", tmpMakefile);
-		end = buf + total_red;
-		*end = '\0';
-		fseek(tmpfd, 0, 0);
-#if defined(SYSV) || defined(WIN32) || defined(USE_FREOPEN)
-		tmpfd = freopen(tmpfname, "w+", tmpfd);
-#ifdef WIN32
-		if (! tmpfd) /* if failed try again */
-			tmpfd = freopen(tmpfname, "w+", fp);
-#endif
-		if (! tmpfd)
-			LogFatal("cannot reopen %s\n", tmpfname);
-#else	/* !SYSV */
-		ftruncate(fileno(tmpfd), (off_t) 0);
-#endif	/* !SYSV */
-		initialized = TRUE;
-	    fprintf (tmpfd, "# Makefile generated by imake - do not edit!\n");
-	    fprintf (tmpfd, "# %s\n",
-		"$TOG: imake.c /main/97 1997/06/20 20:23:51 kaleb $");
-	}
-
-	for (p1 = pline; p1 < end; p1++) {
-		if (*p1 == '@' && *(p1+1) == '@'
-		    /* ignore ClearCase version-extended pathnames */
-		    && !(p1 != pline && !isspace(*(p1-1)) && *(p1+2) == '/'))
-		{ /* soft EOL */
-			*p1++ = '\0';
-			p1++; /* skip over second @ */
-			break;
-		}
-		else if (*p1 == '\n') { /* real EOL */
-#ifdef WIN32
-			if (p1 > pline && p1[-1] == '\r')
-				p1[-1] = '\0';
-#endif
-			*p1++ = '\0';
-			break;
-		}
-	}
-
-	/*
-	 * return NULL at the end of the file.
-	 */
-	p2 = (pline == p1 ? NULL : pline);
-	pline = p1;
-	return(p2);
-}
-
-void
-writetmpfile(fd, buf, cnt, fname)
-	FILE	*fd;
-	int	cnt;
-	char	*buf;
-	char	*fname;
-{
-	if (fwrite(buf, sizeof(char), cnt, fd) == -1)
-		LogFatal("Cannot write to %s.", fname);
-}
-
-char *
-Emalloc(size)
-	int	size;
-{
-	char	*p;
-
-	if ((p = malloc(size)) == NULL)
-		LogFatalI("Cannot allocate %d bytes", size);
-	return(p);
-}
-
-#ifdef FIXUP_CPP_WHITESPACE
-void
-KludgeOutputLine(pline)
-	char	**pline;
-{
-	char	*p = *pline;
-	char	quotechar = '\0';
-
-	switch (*p) {
-	    case '#':	/*Comment - ignore*/
-		break;
-	    case '\t':	/*Already tabbed - ignore it*/
-	    	break;
-	    case ' ':	/*May need a tab*/
-	    default:
-# ifdef INLINE_SYNTAX
-		if (*p == '<' && p[1] == '<') { /* inline file close */
-		    InInline--;
-		    InRule = TRUE;
-		    break;
-		}
-# endif
-		/*
-		 * The following cases should not be treated as beginning of 
-		 * rules:
-		 * variable := name	(GNU make)
-		 * variable = .*:.*	(':' should be allowed as value)
-		 *	sed 's:/a:/b:'	(: used in quoted values)
-		 */
-		for (; *p; p++) {
-		    if (quotechar) {
-			if (quotechar == '\\' ||
-			    (*p == quotechar &&
-# ifdef WIN32
-			     quotechar != ')' &&
-# endif
-			     p[-1] != '\\'))
-			    quotechar = '\0';
-			continue;
-		    }
-		    switch (*p) {
-		    case '\\':
-		    case '"':
-		    case '\'':
-			quotechar = *p;
-			break;
-		    case '(':
-			quotechar = ')';
-			break;
-		    case '{':
-			quotechar = '}';
-			break;
-		    case '[':
-			quotechar = ']';
-			break;
-		    case '=':
-# ifdef REMOVE_CPP_LEADSPACE
-			if (!InRule && **pline == ' ') {
-			    while (**pline == ' ')
-				(*pline)++;
-			}
-# endif
-			goto breakfor;
-# ifdef INLINE_SYNTAX
-		    case '<':
-			if (p[1] == '<') /* inline file start */
-			    InInline++;
-			break;
-# endif
-		    case ':':
-			if (p[1] == '=')
-			    goto breakfor;
-			while (**pline == ' ')
-			    (*pline)++;
-			InRule = TRUE;
-			return;
-		    }
-		}
-breakfor:
-		if (InRule && **pline == ' ')
-		    **pline = '\t';
-		break;
-	}
-}
-
-void
-KludgeResetRule()
-{
-	InRule = FALSE;
-}
-#endif /* FIXUP_CPP_WHITESPACE */
-
-char *
-Strdup(cp)
-	register char *cp;
-{
-	register char *new = Emalloc(strlen(cp) + 1);
-
-	strcpy(new, cp);
-	return new;
-}
--- a/Xvnc/config/imake/imake.man
+++ /dev/null
@@ -1,256 +0,0 @@
-.\" $XConsortium: imake.man /main/29 1996/09/28 16:14:42 rws $
-.\" Copyright (c) 1993, 1994  X Consortium
-.\" 
-.\" 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, sublicense, and/or sell copies of the Software, and to
-.\" permit persons to whom the Software is furnished to do so, subject to
-.\" the following conditions:
-.\" 
-.\" The above copyright notice and this permission notice shall be included
-.\" in all copies or substantial portions of the Software.
-.\" 
-.\" 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.
-.\" IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
-.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-.\" OTHER DEALINGS IN THE SOFTWARE.
-.\" 
-.\" Except as contained in this notice, the name of the X Consortium shall
-.\" not be used in advertising or otherwise to promote the sale, use or
-.\" other dealings in this Software without prior written authorization
-.\" from the X Consortium.
-.TH IMAKE 1 "Release 6.1" "X Version 11"
-.SH NAME
-imake \- C preprocessor interface to the make utility
-.SH SYNOPSIS
-\fBimake\fP [ \fB\-D\fP\fIdefine\fP ] [ \fB\-I\fP\fIdir\fP ]
-[ \fB\-T\fP\fItemplate\fP ]
-[ \fB\-f\fP \fIfilename\fP ] [ \fB\-C\fP \fIfilename\fP ]
-[ \fB\-s\fP \fIfilename\fP ] [ \fB\-e\fP ]
-[ \fB\-v\fP ]
-.SH DESCRIPTION
-.I Imake
-is used to 
-generate \fIMakefiles\fP from a template, a set of \fIcpp\fP macro functions,
-and a per-directory input file called an \fIImakefile\fP.  This allows machine
-dependencies (such as compiler options, alternate command names, and special
-\fImake\fP rules) to be kept separate from the descriptions of the
-various items to be built.
-.SH OPTIONS
-The following command line options may be passed to \fIimake\fP:
-.TP 8
-.B \-D\fIdefine\fP
-This option is passed directly to \fIcpp\fP.  It is typically used to set
-directory-specific variables.  For example, the X Window System uses this
-flag to set \fITOPDIR\fP to the name of the directory containing the top
-of the core distribution and \fICURDIR\fP to the name of the current 
-directory, relative to the top.
-.TP 8
-.B \-I\fIdirectory\fP
-This option is passed directly to \fIcpp\fP.  It is typically used to 
-indicate the directory in which the \fIimake\fP template and configuration
-files may be found.
-.TP 8
-.B \-T\fItemplate\fP
-This option specifies the name of the master template file (which is usually
-located in the directory specified with \fI\-I\fP) used by \fIcpp\fP.
-The default is \fIImake.tmpl\fP.
-.TP 8
-.B \-f \fIfilename\fP
-This option specifies the name of the per-directory input file.  The default
-is \fIImakefile\fP.
-.TP 8
-.B \-C \fIfilename\fP
-This option specifies the name of the .c file that is constructed in the
-current directory.  The default is \fIImakefile.c\fP.
-.TP 8
-.B \-s \fIfilename\fP
-This option specifies the name of the \fImake\fP description file to be 
-generated but \fImake\fP should not be invoked.
-If the \fIfilename\fP is a dash (\-), the 
-output is written to \fIstdout\fP.  The default is to generate, but
-not execute, a \fIMakefile\fP.
-.TP 8
-.B \-e
-This option indicates the \fIimake\fP should execute the generated
-\fIMakefile\fP.  The default is to leave this to the user.
-.TP 8
-.B \-v
-This option indicates that \fIimake\fP should print the \fIcpp\fP command line 
-that it is using to generate the \fIMakefile\fP.
-.SH "HOW IT WORKS"
-\fIImake\fP invokes \fIcpp\fP with any \fI\-I\fP or \fI\-D\fP flags passed
-on the command line and passes the name of a file containing the
-following 3 lines:
-.sp
-.nf
-		#define IMAKE_TEMPLATE "Imake.tmpl"
-		#define INCLUDE_IMAKEFILE <Imakefile>
-		#include IMAKE_TEMPLATE
-.fi
-.sp
-where \fIImake.tmpl\fP and \fIImakefile\fP may be overridden by the 
-\fI\-T\fP and \fI\-f\fP command options, respectively.
-.PP
-The IMAKE_TEMPLATE typically
-reads in a file containing machine-dependent parameters 
-(specified as \fIcpp\fP symbols), a site-specific parameters file,
-a file defining variables,
-a file
-containing \fIcpp\fP macro functions for generating \fImake\fP rules, and
-finally the \fIImakefile\fP (specified by INCLUDE_IMAKEFILE) in the current 
-directory.  The \fIImakefile\fP uses the macro functions to indicate what
-targets should be built; \fIimake\fP takes care of generating the appropriate
-rules.
-.PP
-.I Imake
-configuration files contain two types of variables, imake variables
-and make variables.  The imake variables are interpreted by cpp when
-.I imake
-is run.  By convention they are mixed case.  The make variables are
-written into the
-.I Makefile
-for later interpretation by
-.I make.
-By convention make variables are upper case.
-.PP
-The rules file (usually named \fIImake.rules\fP in the configuration
-directory) contains a variety of \fIcpp\fP macro functions that are
-configured according to the current platform.  \fIImake\fP replaces 
-any occurrences of the string ``@@'' with a newline to allow macros that
-generate more than one line of \fImake\fP rules.  
-For example, the macro
-.ta 1i 1.6i 5i
-.nf
-
-#define	program_target(program, objlist)	@@\e
-program:	objlist		@@\e
-	$(CC)  \-o  $@  objlist  $(LDFLAGS)
-
-.fi
-when called with
-.I "program_target(foo, foo1.o  foo2.o)"
-will expand to
-.nf
-
-foo:	foo1.o  foo2.o
-	$(CC)  \-o  $@  foo1.o  foo2.o  $(LDFLAGS)
-
-.fi
-.PP
-\fIImake\fP also replaces any occurrences of the word ``XCOMM'' with
-the character ``#'' to permit placing comments in the Makefile without
-causing ``invalid directive'' errors from the preprocessor.
-.PP
-Some complex \fIimake\fP macros require generated \fImake\fP variables
-local to each invocation of the macro, often because their value
-depends on parameters passed to the macro.
-Such variables can be created by using an \fIimake\fP variable
-of the form \fBXVARdef\fP\fIn\fP, where \fIn\fP is a single digit.
-A unique \fImake\fP variable will be substituted.  Later occurrences
-of the variable \fBXVARuse\fP\fIn\fP will
-be replaced by the variable created by the corresponding
-\fBXVARdef\fP\fIn\fP.
-.PP
-On systems whose \fIcpp\fP reduces multiple tabs and spaces to a single
-space, \fIimake\fP attempts to put back any necessary tabs (\fImake\fP is
-very picky about the difference between tabs and spaces).  For this reason,
-colons (:) in command lines must be preceded by a backslash (\\).
-.SH "USE WITH THE X WINDOW SYSTEM"
-The X Window System uses \fIimake\fP extensively, for both full builds within
-the source tree and external software.  As mentioned above, two special
-variables, \fITOPDIR\fP and \fICURDIR,\fP are set to make referencing files
-using relative path names easier.  For example, the following command is
-generated automatically to build the \fIMakefile\fP in the directory
-\fIlib/X/\fP (relative to the top of the sources):
-.sp
-.nf
-	%  ../.././config/imake  \-I../.././config  \\
-		\-DTOPDIR=../../.   \-DCURDIR=./lib/X
-.fi
-.sp
-When building X programs outside the source tree, a special symbol
-\fIUseInstalled\fP is defined and \fITOPDIR\fP and
-\fICURDIR\fP are omitted.  If the configuration files have been
-properly installed, the script \fIxmkmf\fP(1) may be used.
-.SH "INPUT FILES"
-Here is a summary of the files read by
-.I imake
-as used by X.
-The indentation shows what files include what other files.
-.nf
-.sp
-.ta 3i
-    Imake.tmpl	generic variables
-        site.def	site-specific, BeforeVendorCF defined
-        *.cf	machine-specific
-            *Lib.rules	shared library rules
-        site.def	site-specific, AfterVendorCF defined
-        Imake.rules	rules
-        Project.tmpl	X-specific variables
-            *Lib.tmpl	shared library variables
-        Imakefile
-            Library.tmpl	library rules
-            Server.tmpl	server rules
-            Threads.tmpl	multi-threaded rules
-.fi
-.LP
-Note that \fIsite.def\fP gets included twice, once before the
-\fI*.cf\fP file and once after.  Although most site customizations
-should be specified after the \fI*.cf\fP file, some, such as the
-choice of compiler, need to be specified before, because other
-variable settings may depend on them.
-.LP
-The first time \fIsite.def\fP is included, the variable BeforeVendorCF
-is defined, and the second time, the variable AfterVendorCF is
-defined.  All code in \fIsite.def\fP should be inside an #ifdef for
-one of these symbols.
-.SH FILES
-.ta 3i
-Imakefile.c	temporary input file for cpp
-.br
-/tmp/Imf.XXXXXX	temporary Makefile for -s
-.br
-/tmp/IIf.XXXXXX	temporary Imakefile if specified Imakefile uses # comments
-.br
-/lib/cpp	default C preprocessor
-.DT
-.SH "SEE ALSO"
-make(1), xmkmf(1)
-.br
-S. I. Feldman,
-.I
-Make \(em A Program for Maintaining Computer Programs
-.SH "ENVIRONMENT VARIABLES"
-The following environment variables may be set, however their use is not
-recommended as they introduce dependencies that are not readily apparent
-when \fIimake\fP is run:
-.TP 5
-.B IMAKEINCLUDE
-If defined, this specifies a ``\-I'' include argument to pass to the
-C preprocessor.  E.g., ``\-I/usr/X11/config''.
-.TP 5
-.B IMAKECPP
-If defined, this should be a valid path to a preprocessor program.
-E.g., ``/usr/local/cpp''.
-By default,
-.I imake
-will use /lib/cpp.
-.TP 5
-.B IMAKEMAKE
-If defined, this should be a valid path to a make program,
-such as ``/usr/local/make''.
-By default,
-.I imake
-will use whatever
-.I make
-program is found using
-.I execvp(3).
-This variable is only used if the ``\-e'' option is specified.
-.SH "AUTHOR"
-Todd Brunhoff, Tektronix and MIT Project Athena; Jim Fulton, MIT X Consortium
--- a/Xvnc/config/imake/imakemdep.h
+++ /dev/null
@@ -1,931 +0,0 @@
-/* $TOG: imakemdep.h /main/101 1997/06/06 09:13:20 bill $ */
-/*
-
-Copyright (c) 1993, 1994  X Consortium
-
-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, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-/* $XFree86: xc/config/imake/imakemdep.h,v 3.24.2.3 1997/07/27 02:41:05 dawes Exp $ */
-
-
-/* 
- * This file contains machine-dependent constants for the imake utility.
- * When porting imake, read each of the steps below and add in any necessary
- * definitions.  In general you should *not* edit ccimake.c or imake.c!
- */
-
-#ifdef CCIMAKE
-/*
- * Step 1:  imake_ccflags
- *     Define any special flags that will be needed to get imake.c to compile.
- *     These will be passed to the compile along with the contents of the
- *     make variable BOOTSTRAPCFLAGS.
- */
-#if defined(clipper) || defined(__clipper__)
-#define imake_ccflags "-O -DSYSV -DBOOTSTRAPCFLAGS=-DSYSV"
-#endif
-
-#ifdef hpux
-#ifdef hp9000s800
-#define imake_ccflags "-DSYSV"
-#else
-#define imake_ccflags "-Wc,-Nd4000,-Ns3000 -DSYSV"
-#endif
-#endif
-
-#if defined(macII) || defined(_AUX_SOURCE)
-#define imake_ccflags "-DmacII -DSYSV"
-#endif
-
-#ifdef stellar
-#define imake_ccflags "-DSYSV"
-#endif
-
-#if defined(USL) || defined(__USLC__) || defined(Oki) || defined(NCR)
-#define imake_ccflags "-Xa -DSVR4"
-#endif
-
-/* SCO may define __USLC__ so put this after the USL check */
-#if defined(M_UNIX) || defined(_SCO_DS)
-#ifdef imake_ccflags
-#undef imake_ccflags
-#endif
-#define imake_ccflags "-Dsco -DSYSV"
-#endif
-
-#ifdef sony
-#if defined(SYSTYPE_SYSV) || defined(_SYSTYPE_SYSV)
-#define imake_ccflags "-DSVR4"
-#else
-#include <sys/param.h>
-#if NEWSOS < 41
-#define imake_ccflags "-Dbsd43 -DNOSTDHDRS"
-#else
-#if NEWSOS < 42
-#define imake_ccflags "-Dbsd43"
-#endif
-#endif
-#endif
-#endif
-
-#ifdef _CRAY
-#define imake_ccflags "-DSYSV -DUSG"
-#endif
-
-#if defined(_IBMR2) || defined(aix)
-#define imake_ccflags "-Daix -DSYSV"
-#endif
-
-#ifdef Mips
-#  if defined(SYSTYPE_BSD) || defined(BSD) || defined(BSD43)
-#    define imake_ccflags "-DBSD43"
-#  else 
-#    define imake_ccflags "-DSYSV"
-#  endif
-#endif 
-
-#ifdef is68k
-#define imake_ccflags "-Dluna -Duniosb"
-#endif
-
-#ifdef SYSV386
-# ifdef SVR4
-#  define imake_ccflags "-Xa -DSVR4"
-# else
-#  define imake_ccflags "-DSYSV"
-# endif
-#endif
-
-#ifdef SVR4
-# ifdef i386
-#  define imake_ccflags "-Xa -DSVR4"
-# endif
-#endif
-
-#ifdef SYSV
-# ifdef i386
-#  define imake_ccflags "-DSYSV"
-# endif
-#endif
-
-#ifdef __convex__
-#define imake_ccflags "-fn -tm c1"
-#endif
-
-#ifdef apollo
-#define imake_ccflags "-DX_NOT_POSIX"
-#endif
-
-#ifdef WIN32
-#if _MSC_VER < 1000
-#define imake_ccflags "-nologo -batch -D__STDC__"
-#else
-#define imake_ccflags "-nologo -D__STDC__"
-#endif
-#endif
-
-#ifdef __uxp__
-#define imake_ccflags "-DSVR4 -DANSICPP"
-#endif
-
-#ifdef __sxg__
-#define imake_ccflags "-DSYSV -DUSG -DNOSTDHDRS"
-#endif
-
-#ifdef sequent
-#define imake_ccflags "-DX_NOT_STDC_ENV -DX_NOT_POSIX"
-#endif
-
-#ifdef _SEQUENT_
-#define imake_ccflags "-DSYSV -DUSG"
-#endif
-
-#if defined(SX) || defined(PC_UX)
-#define imake_ccflags "-DSYSV"
-#endif
-
-#ifdef nec_ews_svr2
-#define imake_ccflags "-DUSG"
-#endif
-
-#if defined(nec_ews_svr4) || defined(_nec_ews_svr4) || defined(_nec_up) || defined(_nec_ft)
-#define imake_ccflags "-DSVR4"
-#endif
-
-#ifdef  MACH
-#define imake_ccflags "-DNOSTDHDRS"
-#endif
-
-/* this is for OS/2 under EMX. This won't work with DOS */
-#if defined(__EMX__)
-#define imake_ccflags "-DBSD43"
-#endif
-
-#else /* not CCIMAKE */
-#ifndef MAKEDEPEND
-/*
- * Step 2:  dup2
- *     If your OS doesn't have a dup2() system call to duplicate one file
- *     descriptor onto another, define such a mechanism here (if you don't
- *     already fall under the existing category(ies).
- */
-#if defined(SYSV) && !defined(_CRAY) && !defined(Mips) && !defined(_SEQUENT_) && !defined(sco)
-#define	dup2(fd1,fd2)	((fd1 == fd2) ? fd1 : (close(fd2), \
-					       fcntl(fd1, F_DUPFD, fd2)))
-#endif
-
-
-/*
- * Step 3:  FIXUP_CPP_WHITESPACE
- *     If your cpp collapses tabs macro expansions into a single space and
- *     replaces escaped newlines with a space, define this symbol.  This will
- *     cause imake to attempt to patch up the generated Makefile by looking
- *     for lines that have colons in them (this is why the rules file escapes
- *     all colons).  One way to tell if you need this is to see whether or not
- *     your Makefiles have no tabs in them and lots of @@ strings.
- */
-#if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || defined(sco) || (defined(AMOEBA) && defined(CROSS_COMPILE))
-#define FIXUP_CPP_WHITESPACE
-#endif
-#ifdef WIN32
-#define REMOVE_CPP_LEADSPACE
-#define INLINE_SYNTAX
-#define MAGIC_MAKE_VARS
-#endif
-#ifdef __minix_vmd
-#define FIXUP_CPP_WHITESPACE
-#endif
-
-/*
- * Step 4:  USE_CC_E, DEFAULT_CC, DEFAULT_CPP
- *     If you want to use cc -E instead of cpp, define USE_CC_E.
- *     If use cc -E but want a different compiler, define DEFAULT_CC.
- *     If the cpp you need is not in /lib/cpp, define DEFAULT_CPP.
- */
-#ifdef hpux
-#define USE_CC_E
-#endif
-#ifdef WIN32
-#define USE_CC_E
-#define DEFAULT_CC "cl"
-#endif
-#ifdef apollo
-#define DEFAULT_CPP "/usr/lib/cpp"
-#endif
-#if defined(clipper) || defined(__clipper__)
-#define DEFAULT_CPP "/usr/lib/cpp"
-#endif
-#if defined(_IBMR2) && !defined(DEFAULT_CPP)
-#define DEFAULT_CPP "/usr/ccs/lib/cpp"
-#endif
-#if defined(sun) && (defined(SVR4) || defined(__svr4__) || defined(__SVR4) || defined(__sol__))
-#define DEFAULT_CPP "/usr/ccs/lib/cpp"
-#endif
-#ifdef __bsdi__
-#define DEFAULT_CPP "/usr/bin/cpp"
-#endif
-#ifdef __uxp__
-#define DEFAULT_CPP "/usr/ccs/lib/cpp"
-#endif
-#ifdef __sxg__
-#define DEFAULT_CPP "/usr/lib/cpp"
-#endif
-#ifdef _CRAY
-#define DEFAULT_CPP "/lib/pcpp"
-#endif
-#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
-#define DEFAULT_CPP "/usr/libexec/cpp"
-#endif
-#if defined(__sgi) && defined(__ANSI_CPP__)
-#define USE_CC_E
-#endif
-#ifdef  MACH
-#define USE_CC_E
-#endif
-#ifdef __minix_vmd
-#define DEFAULT_CPP "/usr/lib/cpp"
-#endif
-#if defined(__EMX__)
-/* expects cpp in PATH */
-#define DEFAULT_CPP "cpp"
-#endif
-#ifdef __MACH__
-#define DEFAULT_CPP "/usr/bin/cpp"
-#endif
-
-/*
- * Step 5:  cpp_argv
- *     The following table contains the flags that should be passed
- *     whenever a Makefile is being generated.  If your preprocessor 
- *     doesn't predefine any unique symbols, choose one and add it to the
- *     end of this table.  Then, do the following:
- * 
- *         a.  Use this symbol in Imake.tmpl when setting MacroFile.
- *         b.  Put this symbol in the definition of BootstrapCFlags in your
- *             <platform>.cf file.
- *         c.  When doing a make World, always add "BOOTSTRAPCFLAGS=-Dsymbol" 
- *             to the end of the command line.
- * 
- *     Note that you may define more than one symbol (useful for platforms 
- *     that support multiple operating systems).
- */
-
-#define	ARGUMENTS 50	/* number of arguments in various arrays */
-char *cpp_argv[ARGUMENTS] = {
-	"cc",		/* replaced by the actual program to exec */
-	"-I.",		/* add current directory to include path */
-#ifdef unix
-	"-Uunix",	/* remove unix symbol so that filename unix.c okay */
-#endif
-#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH) || defined(linux) || defined(__GNU__)
-# ifdef __i386__
-	"-D__i386__",
-# endif
-# ifdef __sparc__
-	"-D__sparc__",
-# endif
-# ifdef __alpha__
-       "-D__alpha__",
-# endif
-# ifdef __GNUC__
-	"-traditional",
-# endif
-#endif
-#ifdef M4330
-	"-DM4330",	/* Tektronix */
-#endif
-#ifdef M4310
-	"-DM4310",	/* Tektronix */
-#endif
-#if defined(macII) || defined(_AUX_SOURCE)
-	"-DmacII",	/* Apple A/UX */
-#endif
-#if defined(USL) || defined(__USLC__)
-	"-DUSL",	/* USL */
-#endif
-#ifdef sony
-	"-Dsony",	/* Sony */
-#if !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV) && NEWSOS < 42
-	"-Dbsd43",
-#endif
-#endif
-#ifdef _IBMR2
-	"-D_IBMR2",	/* IBM RS-6000 (we ensured that aix is defined above */
-#ifndef aix
-#define aix		/* allow BOOTSTRAPCFLAGS="-D_IBMR2" */
-#endif
-#endif /* _IBMR2 */
-#ifdef aix
-	"-Daix",	/* AIX instead of AOS */
-#ifndef ibm
-#define ibm		/* allow BOOTSTRAPCFLAGS="-Daix" */
-#endif
-#endif /* aix */
-#ifdef ibm
-	"-Dibm",	/* IBM PS/2 and RT under both AOS and AIX */
-#endif
-#ifdef luna
-	"-Dluna",	/* OMRON luna 68K and 88K */
-#ifdef luna1
-	"-Dluna1",
-#endif
-#ifdef luna88k		/* need not on UniOS-Mach Vers. 1.13 */
-	"-traditional", /* for some older version            */
-#endif			/* instead of "-DXCOMM=\\#"          */
-#ifdef uniosb
-	"-Duniosb",
-#endif
-#ifdef uniosu
-	"-Duniosu",
-#endif
-#endif /* luna */
-#ifdef _CRAY		/* Cray */
-	"-Ucray",
-#endif
-#ifdef Mips
-	"-DMips",	/* Define and use Mips for Mips Co. OS/mach. */
-# if defined(SYSTYPE_BSD) || defined(BSD) || defined(BSD43)
-	"-DBSD43",	/* Mips RISCOS supports two environments */
-# else
-	"-DSYSV",	/* System V environment is the default */
-# endif
-#endif /* Mips */
-#ifdef MOTOROLA
-	"-DMOTOROLA",    /* Motorola Delta Systems */
-# ifdef SYSV
-	"-DSYSV", 
-# endif
-# ifdef SVR4
-	"-DSVR4",
-# endif
-#endif /* MOTOROLA */
-#if defined(M_UNIX) || defined(sco)
-	"-Dsco",
-	"-DSYSV",
-#endif
-#ifdef i386
-	"-Di386",
-# ifdef SVR4
-	"-DSVR4",
-# endif
-# ifdef SYSV
-	"-DSYSV",
-#  ifdef ISC
-	"-DISC",
-#   ifdef ISC40
-	"-DISC40",       /* ISC 4.0 */
-#   else
-#    ifdef ISC202
-	"-DISC202",      /* ISC 2.0.2 */
-#    else
-#     ifdef ISC30
-	"-DISC30",       /* ISC 3.0 */
-#     else
-	"-DISC22",       /* ISC 2.2.1 */
-#     endif
-#    endif
-#   endif
-#  endif
-#  ifdef SCO
-	"-DSCO",
-#   ifdef _SCO_DS
-    "-DSCO325 -DSVR4",
-#   endif
-#  endif
-# endif
-# ifdef ESIX
-	"-DESIX",
-# endif
-# ifdef ATT
-	"-DATT",
-# endif
-# ifdef DELL
-	"-DDELL",
-# endif
-#endif
-#ifdef SYSV386           /* System V/386 folks, obsolete */
-	"-Di386",
-# ifdef SVR4
-	"-DSVR4",
-# endif
-# ifdef ISC
-	"-DISC",
-#  ifdef ISC40
-	"-DISC40",       /* ISC 4.0 */
-#  else
-#   ifdef ISC202
-	"-DISC202",      /* ISC 2.0.2 */
-#   else
-#    ifdef ISC30
-	"-DISC30",       /* ISC 3.0 */
-#    else
-	"-DISC22",       /* ISC 2.2.1 */
-#    endif
-#   endif
-#  endif
-# endif
-# ifdef SCO
-	"-DSCO",
-#  ifdef _SCO_DS
-	"-DSCO325 -DSVR4",
-#  endif
-# endif
-# ifdef ESIX
-	"-DESIX",
-# endif
-# ifdef ATT
-	"-DATT",
-# endif
-# ifdef DELL
-	"-DDELL",
-# endif
-#endif
-#ifdef __osf__
-	"-D__osf__",
-# ifdef __mips__
-	"-D__mips__",
-# endif
-# ifdef __alpha
-	"-D__alpha",
-# endif
-# ifdef __alpha__
-	"-D__alpha__",
-# endif
-# ifdef __i386__
-	"-D__i386__",
-# endif
-# ifdef __s390__
-	"-D__s390__",
-# endif
-# ifdef __GNUC__
-	"-traditional",
-# endif
-#endif
-#ifdef __s390__
-    "-D__s390__",
-#endif
-#ifdef __s390x__
-    "-D__s390x__",
-#endif
-#ifdef Oki
-	"-DOki",
-#endif
-#ifdef sun
-#if defined(SVR4) || defined(__svr4__) || defined(__SVR4) || defined(__sol__)
-	"-DSVR4",
-#endif
-#endif
-#ifdef WIN32
-	"-DWIN32",
-	"-nologo",
-#if _MSC_VER < 1000
-	"-batch",
-#endif
-	"-D__STDC__",
-#endif
-#ifdef NCR
-	"-DNCR",	/* NCR */
-#endif
-#ifdef linux
-        "-traditional",
-        "-Dlinux",
-#endif
-#ifdef __uxp__
-	"-D__uxp__",
-#endif
-#ifdef __sxg__
-	"-D__sxg__",
-#endif
-#ifdef nec_ews_svr2
-	"-Dnec_ews_svr2",
-#endif
-#ifdef AMOEBA
-	"-DAMOEBA",
-# ifdef CROSS_COMPILE
-	"-DCROSS_COMPILE",
-#  ifdef CROSS_i80386
-	"-Di80386",
-#  endif
-#  ifdef CROSS_sparc
-	"-Dsparc",
-#  endif
-#  ifdef CROSS_mc68000
-	"-Dmc68000",
-#  endif
-# else
-#  ifdef i80386
-	"-Di80386",
-#  endif
-#  ifdef sparc
-	"-Dsparc",
-#  endif
-#  ifdef mc68000
-	"-Dmc68000",
-#  endif
-# endif
-#endif
-#if defined(__sgi) && defined(__ANSI_CPP__)
-	"-cckr",
-#endif
-#ifdef __minix_vmd
-	"-Dminix",
-#endif
-
-#if defined(__EMX__)
-	"-traditional",
-	"-Demxos2",
-#endif
-
-};
-
-
-/*
- * Step 6: DEFAULT_OS_MAJOR_REV, DEFAULT_OS_MINOR_REV, DEFAULT_OS_TEENY_REV,
- *	and DEFAULT_OS_NAME.
- *	If your systems provides a way to generate the default major,
- *	minor, teeny, or system names at runtime add commands below.
- *	The syntax of the _REV strings is 'f fmt' where 'f' is an argument
- *	you would give to uname, and "fmt" is a scanf() format string.
- *	Supported uname arguments are "snrvm", and if you specify multiple
- *	arguments they will be separated by spaces.  No more than 5 arguments
- *	may be given.  Unlike uname() order of arguments matters.
- *
- *	DEFAULT_OS_MAJOR_REV_FROB, DEFAULT_OS_MINOR_REV_FROB,
- *	DEFAULT_OS_TEENY_REV_FROB, and DEFAULT_OS_NAME_FROB can be used to
- *	modify the results of the use of the various strings.
- */
-#if defined(aix)
-/* uname -v returns "x" (e.g. "4"), and uname -r returns "y" (e.g. "1") */
-# define DEFAULT_OS_MAJOR_REV	"v %[0-9]"
-# define DEFAULT_OS_MINOR_REV	"r %[0-9]"
-/* No information available to generate default OSTeenyVersion value. */
-# define DEFAULT_OS_NAME	"srvm %[^\n]"
-#elif defined(sun) || defined(sgi) || defined(ultrix) || defined(__uxp__) || defined(sony)
-/* uname -r returns "x.y[.z]", e.g. "5.4" or "4.1.3" */
-# define DEFAULT_OS_MAJOR_REV	"r %[0-9]"
-# define DEFAULT_OS_MINOR_REV	"r %*d.%[0-9]"
-# define DEFAULT_OS_TEENY_REV	"r %*d.%*d.%[0-9]"
-# define DEFAULT_OS_NAME	"srvm %[^\n]"
-#elif defined(hpux)
-/* uname -r returns "W.x.yz", e.g. "B.10.01" */
-# define DEFAULT_OS_MAJOR_REV	"r %*[^.].%[0-9]"
-# define DEFAULT_OS_MINOR_REV	"r %*[^.].%*d.%1s"
-# define DEFAULT_OS_TEENY_REV	"r %*[^.].%*d.%*c%[0-9]"
-# define DEFAULT_OS_NAME	"srvm %[^\n]"
-#elif defined(USL) || defined(__USLC__)
-/* uname -v returns "x.yz" or "x.y.z", e.g. "2.02" or "2.1.2". */
-# define DEFAULT_OS_MAJOR_REV	"v %[0-9]"
-# define DEFAULT_OS_MINOR_REV	"v %*d.%1s"
-# define DEFAULT_OS_TEENY_REV	"v %*d.%*c%[.0-9]"
-# define DEFAULT_OS_NAME	"srvm %[^\n]"
-#elif defined(__osf__)
-/* uname -r returns "Wx.y", e.g. "V3.2" or "T4.0" */
-# define DEFAULT_OS_MAJOR_REV	"r %*[^0-9]%[0-9]"
-# define DEFAULT_OS_MINOR_REV	"r %*[^.].%[0-9]"
-# define DEFAULT_OS_NAME	"srvm %[^\n]"
-#elif defined(__uxp__)
-/* NOTE: "x.y[.z]" above handles UXP/DF.  This is a sample alternative. */
-/* uname -v returns "VxLy Yzzzzz ....", e.g. "V20L10 Y95021 Increment 5 ..." */
-# define DEFAULT_OS_MAJOR_REV	"v V%[0-9]"
-# define DEFAULT_OS_MINOR_REV	"v V%*dL%[0-9]"
-# define DEFAULT_OS_NAME	"srvm %[^\n]"
-#elif defined(linux)
-# define DEFAULT_OS_MAJOR_REV	"r %[0-9]"
-# define DEFAULT_OS_MINOR_REV	"r %*d.%[0-9]"
-# define DEFAULT_OS_TEENY_REV	"r %*d.%*d.%[0-9]"
-# define DEFAULT_OS_NAME	"srm %[^\n]"
-#elif defined(ISC)
-/* ISC all Versions ? */
-/* uname -r returns "x.y", e.g. "3.2" ,uname -v returns "x" e.g. "2" */
-# define DEFAULT_OS_MAJOR_REV   "r %[0-9]"
-# define DEFAULT_OS_MINOR_REV   "r %*d.%[0-9]"
-# define DEFAULT_OS_TEENY_REV   "v %[0-9]" 
-/* # define DEFAULT_OS_NAME        "srm %[^\n]" */ /* Not useful on ISC */
-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
-/* BSD/OS too? */
-/* uname -r returns "x.y[.z]-mumble", e.g. "2.1.5-RELEASE" or "2.2-0801SNAP" */
-# define DEFAULT_OS_MAJOR_REV   "r %[0-9]"
-# define DEFAULT_OS_MINOR_REV   "r %*d.%[0-9]"
-# define DEFAULT_OS_TEENY_REV   "r %*d.%*d.%[0-9]" 
-# define DEFAULT_OS_NAME        "srm %[^\n]"
-# if defined(__FreeBSD__)
-/* Use an alternate way to find the teeny version for -STABLE, -SNAP versions */
-#  define DEFAULT_OS_TEENY_REV_FROB(buf, size)				\
-    do {								\
-	if (*buf == 0) {						\
-		int __mib[2];						\
-		size_t __len;						\
-		int __osrel;						\
-									\
-		__mib[0] = CTL_KERN;					\
-		__mib[1] = KERN_OSRELDATE;				\
-		__len = sizeof(__osrel);				\
-		sysctl(__mib, 2, &__osrel, &__len, NULL, 0);		\
-		if (__osrel < 210000) {					\
-			if (__osrel < 199607)				\
-				buf[0] = '0';				\
-			else if (__osrel < 199612)			\
-				buf[0] = '5';				\
-			else if (__osrel == 199612)			\
-				buf[0] = '6';				\
-			else						\
-				buf[0] = '8'; /* guess */		\
-		} else {						\
-			buf[0] = ((__osrel / 1000) % 10) + '0';		\
-		}							\
-		buf[1] = 0;						\
-	}								\
-    } while (0)
-# else
-   /* OpenBSD - Add DEFAULT_MACHINE_ARCHITECTURE */
-#  define DEFAULT_MACHINE_ARCHITECTURE "m %[^\n]"
-# endif
-#elif defined(__NetBSD__)
-/*
- * uname -r returns "x.y([ABCD...]|_mumble)", e.g.:
- *	1.2	1.2_BETA	1.2A	1.2B
- *
- * That means that we have to do something special to turn the
- * TEENY revision into a form that we can use (i.e., a string of
- * decimal digits).
- *
- * We also frob the name DEFAULT_OS_NAME so that it looks like the
- * 'standard' NetBSD name for the version, e.g. "NetBSD/i386 1.2B" for
- * NetBSD 1.2B on an i386.
- */
-# define DEFAULT_OS_MAJOR_REV   "r %[0-9]"
-# define DEFAULT_OS_MINOR_REV   "r %*d.%[0-9]"
-# define DEFAULT_OS_TEENY_REV   "r %*d.%*d%[A-Z]" 
-# define DEFAULT_OS_TEENY_REV_FROB(buf, size)				\
-    do {								\
-	if (*(buf) >= 'A' && *(buf) <= 'Z') /* sanity check */		\
-		snprintf((buf), (size), "%d", *(buf) - 'A' + 1);	\
-	else								\
-	    *(buf) = '\0';						\
-    } while (0)
-# define DEFAULT_OS_NAME        "smr %[^\n]"
-# define DEFAULT_OS_NAME_FROB(buf, size)				\
-    do {								\
-	char *__sp;							\
-	if ((__sp = strchr((buf), ' ')) != NULL)			\
-		*__sp = '/';						\
-    } while (0)
-#endif
-
-#else /* else MAKEDEPEND */
-/*
- * Step 7:  predefs
- *     If your compiler and/or preprocessor define any specific symbols, add
- *     them to the the following table.  The definition of struct symtab is
- *     in util/makedepend/def.h.
- */
-struct symtab	predefs[] = {
-#ifdef apollo
-	{"apollo", "1"},
-#endif
-#if defined(clipper) || defined(__clipper__)
-	{"clipper", "1"},
-	{"__clipper__", "1"},
-	{"clix", "1"},
-	{"__clix__", "1"},
-#endif
-#ifdef ibm032
-	{"ibm032", "1"},
-#endif
-#ifdef ibm
-	{"ibm", "1"},
-#endif
-#ifdef aix
-	{"aix", "1"},
-#endif
-#ifdef sun
-	{"sun", "1"},
-#endif
-#ifdef sun2
-	{"sun2", "1"},
-#endif
-#ifdef sun3
-	{"sun3", "1"},
-#endif
-#ifdef sun4
-	{"sun4", "1"},
-#endif
-#ifdef sparc
-	{"sparc", "1"},
-#endif
-#ifdef __sparc__
-	{"__sparc__", "1"},
-#endif
-#ifdef hpux
-	{"hpux", "1"},
-#endif
-#ifdef __hpux
-	{"__hpux", "1"},
-#endif
-#ifdef __hp9000s800
-	{"__hp9000s800", "1"},
-#endif
-#ifdef __hp9000s700
-	{"__hp9000s700", "1"},
-#endif
-#ifdef vax
-	{"vax", "1"},
-#endif
-#ifdef VMS
-	{"VMS", "1"},
-#endif
-#ifdef cray
-	{"cray", "1"},
-#endif
-#ifdef CRAY
-	{"CRAY", "1"},
-#endif
-#ifdef _CRAY
-	{"_CRAY", "1"},
-#endif
-#ifdef att
-	{"att", "1"},
-#endif
-#ifdef mips
-	{"mips", "1"},
-#endif
-#ifdef __mips__
-	{"__mips__", "1"},
-#endif
-#ifdef ultrix
-	{"ultrix", "1"},
-#endif
-#ifdef stellar
-	{"stellar", "1"},
-#endif
-#ifdef mc68000
-	{"mc68000", "1"},
-#endif
-#ifdef mc68020
-	{"mc68020", "1"},
-#endif
-#ifdef __GNUC__
-	{"__GNUC__", "1"},
-#endif
-#if __STDC__
-	{"__STDC__", "1"},
-#endif
-#ifdef __HIGHC__
-	{"__HIGHC__", "1"},
-#endif
-#ifdef CMU
-	{"CMU", "1"},
-#endif
-#ifdef luna
-	{"luna", "1"},
-#ifdef luna1
-	{"luna1", "1"},
-#endif
-#ifdef luna2
-	{"luna2", "1"},
-#endif
-#ifdef luna88k
-	{"luna88k", "1"},
-#endif
-#ifdef uniosb
-	{"uniosb", "1"},
-#endif
-#ifdef uniosu
-	{"uniosu", "1"},
-#endif
-#endif
-#ifdef ieeep754
-	{"ieeep754", "1"},
-#endif
-#ifdef is68k
-	{"is68k", "1"},
-#endif
-#ifdef m68k
-        {"m68k", "1"},
-#endif
-#ifdef m88k
-        {"m88k", "1"},
-#endif
-#ifdef __m88k__
-	{"__m88k__", "1"},
-#endif
-#ifdef bsd43
-	{"bsd43", "1"},
-#endif
-#ifdef hcx
-	{"hcx", "1"},
-#endif
-#ifdef sony
-	{"sony", "1"},
-#ifdef SYSTYPE_SYSV
-	{"SYSTYPE_SYSV", "1"},
-#endif
-#ifdef _SYSTYPE_SYSV
-	{"_SYSTYPE_SYSV", "1"},
-#endif
-#endif
-#ifdef __OSF__
-	{"__OSF__", "1"},
-#endif
-#ifdef __osf__
-	{"__osf__", "1"},
-#endif
-#ifdef __alpha
-	{"__alpha", "1"},
-#endif
-#ifdef __alpha__
-	{"__alpha__", "1"},
-#endif
-#ifdef __DECC
-	{"__DECC",  "1"},
-#endif
-#ifdef __decc
-	{"__decc",  "1"},
-#endif
-#ifdef __unix__
-	{"__unix__", "1"},
-#endif
-#ifdef __uxp__
-	{"__uxp__", "1"},
-#endif
-#ifdef __sxg__
-	{"__sxg__", "1"},
-#endif
-#ifdef _SEQUENT_
-	{"_SEQUENT_", "1"},
-	{"__STDC__", "1"},
-#endif
-#ifdef __bsdi__
-	{"__bsdi__", "1"},
-#endif
-#ifdef nec_ews_svr2
-	{"nec_ews_svr2", "1"},
-#endif
-#ifdef nec_ews_svr4
-	{"nec_ews_svr4", "1"},
-#endif
-#ifdef _nec_ews_svr4
-	{"_nec_ews_svr4", "1"},
-#endif
-#ifdef _nec_up
-	{"_nec_up", "1"},
-#endif
-#ifdef SX
-	{"SX", "1"},
-#endif
-#ifdef nec
-	{"nec", "1"},
-#endif
-#ifdef _nec_ft
-	{"_nec_ft", "1"},
-#endif
-#ifdef PC_UX
-	{"PC_UX", "1"},
-#endif
-#ifdef sgi
-	{"sgi", "1"},
-#endif
-#ifdef __sgi
-	{"__sgi", "1"},
-#endif
-#ifdef __FreeBSD__
-	{"__FreeBSD__", "1"},
-#endif
-#ifdef __OpenBSD__
-	{"__OpenBSD__", "1"},
-#endif
-#ifdef __NetBSD__
-	{"__NetBSD__", "1"},
-#endif
-#ifdef __ELF__
-	{"__ELF__", "1"},
-#endif
-#ifdef __EMX__
-	{"__EMX__", "1"},
-#endif
-	/* add any additional symbols before this line */
-	{NULL, NULL}
-};
-
-#endif /* MAKEDEPEND */
-#endif /* CCIMAKE */
--- a/Xvnc/config/imake/imakesvc.cmd
+++ /dev/null
@@ -1,273 +0,0 @@
-/* Rexx OS/2
- * This script serves as a helper cmd file for imake. Install this in
- * the path just like imake itself.
- *
- * $XFree86: xc/config/imake/imakesvc.cmd,v 3.10.2.1 1997/07/19 04:59:10 dawes Exp $
- */
-'@echo off'
-ADDRESS CMD
-CALL RxFuncAdd 'SysFileDelete', 'RexxUtil', 'SysFileDelete'
-CALL RxFuncAdd 'SysFileTree', 'RexxUtil', 'SysFileTree'
-CALL RxFuncAdd 'SysRmDir', 'RexxUtil', 'SysRmDir'
-CALL RxFuncAdd 'SysMkDir', 'RexxUtil', 'SysMkDir'
-
-PARSE ARG all
-code = WORD(all,1)
-
-SELECT
-   WHEN code=1 THEN DO
-      /* imakesvc 1 u/n dir ruledir top current */
-      instflg = WORD(all,2)
-      imakecmd = '\imake'
-      ruledir = WORD(all,4)
-      topdir = WORD(all,5)
-      currentdir = WORD(all,6)
-      IF instflg = 'u' THEN DO 
-         root = VALUE('X11ROOT',,'OS2ENVIRONMENT')
-         IF root = '' THEN DO
-            SAY 'Fatal error: no X11ROOT environment variable found!'
-            EXIT 99
-         END
-         imakecmd = 'imake'
-	 IF POS(':',ruledir) = 0 THEN
-            ruledir1 = root||ruledir
-	 ELSE
-	    ruledir1 = ruledir
-         topdir1 = topdir
-         useinst = '-DUseInstalled'
-      END 
-      ELSE DO
-         /* in n mode, we must add a prefix ../ for MakeMakeSubdirs */
-         ruledir1 = '../'||ruledir
-         topdir1 = '../'||topdir
-         useinst = ''
-      END
-
-      ruledir = ruledir1
-      topdir = topdir1
-      curdir = DIRECTORY()
-      dir = fixbadprefix(WORD(all,3))
-      d = DIRECTORY(dir)
-      dirfwd=TRANSLATE(dir,'/','\')
-      RC = SysFileDelete('Makefile.bak')
-      IF exists('Makefile') THEN REN Makefile Makefile.bak
-      /* There is a difficulty in the Imakefiles. Some builds refer
-       * to directories that are in a different subtree. We need to adjust
-       * the CURDIR and TOPDIR and -I paths
-       */
-      IF SUBSTR(dirfwd,1,2)='..' THEN DO
-         /* must recalculate passed topdir, currentdir, and ruledir */
-         ndist = nlevels(topdir)
-         ncurdir = './'striplevel(dirfwd,ndist-1)
-         ntopdir = maketop(nlevels(ncurdir))
-         nruledir = ntopdir||'/config/cf'
-      END 
-      ELSE DO
-         /* this is simple it is relative to this dir */
-         pfx = downlevels(dirfwd)
-         nruledir = ruledir
-         IF instflg = 'n' THEN DO /*sm120296*/
-            nruledir = pfx||ruledir
-         END
-         ntopdir = pfx||topdir
-         ncurdir = currentdir  /* use to be pfx || currentdir */
-      END
-      imakecmd useinst '-I'nruledir' -DTOPDIR='ntopdir' -DCURDIR='ncurdir'/'dirfwd
-      'x11make MAKE=x11make SHELL= Makefiles'
-      d = DIRECTORY(curdir)
-   END
-   WHEN code=2 THEN DO
-      /* imakesvc 2 buildincdir buildinctop currentdir file */
-      bid = WORD(all,3)
-      cid = WORD(all,4)
-      fil = WORD(all,5)
-      curdir = DIRECTORY()
-      d = DIRECTORY(WORD(all,2))
-      rc = SysFileDelete(fil)
-      dir = TRANSLATE(bid'/'cid'/'fil,'\','/')
-      COPY dir .' >nul 2>&1 '
-      d = DIRECTORY(curdir)
-   END
-   WHEN code=3 THEN DO
-      /* imakesvc 3 subdir updir file */
-      sdi = WORD(all,2)
-      fil = WORD(all,4)
-      curdir = DIRECTORY()
-      d = DIRECTORY(WORD(all,3))
-      rc = SysFileDelete(fil)
-      dir = TRANSLATE(sdi'/'fil,'\','/')
-      COPY dir' . >nul 2>&1'
-      d = DIRECTORY(curdir)
-   END
-   WHEN code=4 THEN DO
-      /* imakesvc 4 [-r] files... */
-      rec = WORD(all,2)
-      fp = 2
-      IF rec = '-r' THEN fp = 3 
-      ELSE rec = '-n'
-      DO i=fp TO WORDS(all)
-	 CALL discard rec,TRANSLATE(WORD(all,i),'\','/')
-      END	
-   END
-   WHEN code=5 THEN DO
-      /* imakesvc 5 file */
-      file = TRANSLATE(WORD(all,2),'\','/')
-      RC = SysFileDelete(file'.bak')
-      if exists(file) THEN 'REN 'file file||'.bak'
-   END
-   WHEN code=6 THEN DO
-      /* imakesvc 6 file */
-      file = TRANSLATE(WORD(all,2),'\','/')
-      CALL SysFileDelete(file||'.bak')
-      if exists(file) THEN 'REN 'file file||'.bak'
-   END
-   WHEN code=7 THEN DO
-      /* imakesvc 7 from to */
-      from = TRANSLATE(WORD(all,2),'\','/')
-      to = TRANSLATE(WORD(all,3),'\','/')
-      CALL SysFileDelete(to)
-      COPY from to' >nul 2>&1'
-   END
-   WHEN code=8 THEN DO
-      /* imakesvc 8 arg */
-      SAY SUBWORD(TRANSLATE(all,'  ','222c'x),2)
-   END
-   WHEN code=9 THEN DO
-      /* imakesvc 9 dst.c incl.h src.c */
-      dst = TRANSLATE(WORD(all,2),'\','/')
-      src = TRANSLATE(WORD(all,4),'\','/')
-      CALL SysFileDelete(dst)
-      CALL LINEOUT dst,'#include "'WORD(all,3)'"'
-      CALL LINEOUT dst,'#include "'src'"'
-      CALL LINEOUT dst 
-   END
-   WHEN code=10 THEN DO
-      /* imakesvc 10 srcfile destdir destfile suffix */
-      src = stripsuffix(WORD(all,2))
-      destdir = TRANSLATE(WORD(all,3),'\','/')
-      dest = stripsuffix(WORD(all,4))
-      suffix = WORD(all,5)
-      tgt = destdir'\'dest'.'suffix
-      /* if you have no col.exe get one from 4.4BSD */
-      'groff -e -t -man -Tascii 'src'.man | col -b >'tgt
-   END
-   WHEN code=11 THEN DO
-      /* imakesvc 11 dirtomake */
-      dirtomake = TRANSLATE(WORD(all,2),'\','/')
-      rc = SysMkDir(dirtomake)
-   END
-   WHEN code=12 THEN DO
-      /* imakesvc 12 srcfile destdir destfile */
-      src = stripsuffix(WORD(all,2))
-      destdir = TRANSLATE(WORD(all,3),'\','/')
-      dest = stripsuffix(WORD(all,4))
-      tgt = destdir'\'dest'.gz'
-      /* if you have no col.exe get one from 4.4BSD */
-      'groff -e -t -man -Tascii 'src'.man | col -b | gzip -n >'tgt
-   END
-   WHEN code=13 THEN DO
-      /* imakesvc 13 indir fromfile tofile */
-      ind = TRANSLATE(WORD(all,2),'\','/')
-      frm = TRANSLATE(WORD(all,3),'\','/')
-      tof = ind'\'WORD(all,4)
-      IF \(exists(ind)) THEN MKDIR ind
-      rc = SysFileDelete(tof)
-      COPY frm' 'tof
-   END
-   OTHERWISE NOP
-END
-RETURN
-
-downlevels:
-oldpos = 1
-pfx = ''
-DO FOREVER
-   newpos = POS('/',ARG(1),oldpos)
-   IF newpos = 0 THEN LEAVE
-   newpfx = '../'pfx
-   oldpos = newpos+1
-   pfx = newpfx
-END
-RETURN pfx
-
-/* returns 1, if file exists */
-exists:
-'DIR "'arg(1)'" >nul 2>&1'
-IF rc = 0 THEN return 1
-RETURN 0
-
-discard: PROCEDURE
-rec=ARG(1)
-files=ARG(2)
-IF rec = '-r' THEN DO
-   old = DIRECTORY()
-   nd = DIRECTORY
-   CALL SysFileTree files, 'deld', 'DO'
-   IF deld.0 > 0 THEN DO
-      DO m=1 TO deld.0
-         CALL DIRECTORY deld.m
-         CALL discard '-R' .
-         CALL DIRECTORY ..
-         CALL SysRmDir deld.m
-      END 
-      CALL SysRmDir files
-   END
-   CALL SysFileTree files, 'delf', 'FO'
-   DO k=1 TO delf.0
-      DEL '"'delf.k'"' '>nul 2>&1'
-   END
-   CALL SysRmDir files
-END 
-ELSE DO
-   DEL '"'files'"' '>nul 2>&1'
-END
-RETURN
-
-/* somehow make or cmd manages to convert a relative path ..\..\. to ..... */
-fixbadprefix:
-count = 1
-str = ARG(1)
-DO WHILE SUBSTR(str,count,2) = '..'
-   count = count+1
-   str = INSERT('\',str,count)
-   count = count+2
-END
-RETURN str
-
-striplevel:
-str=ARG(1)
-n=arg(2)
-DO count=0 TO n
-   p = POS('/',str)
-   IF p = 0 THEN LEAVE
-   str = DELSTR(str,1,p)
-END
-RETURN str
-
-nlevels:
-str = ARG(1)
-count = 0
-oldpos = 1
-DO FOREVER
-   newpos = POS('/',str,oldpos)
-   IF newpos = 0 THEN LEAVE
-   oldpos = newpos + 1
-   count = count + 1
-END
-RETURN count
-
-maketop:
-str = ''
-n = ARG(1)
-DO k=1 TO n
-  str = str||'../'
-END
-RETURN str||'.'
-
-stripsuffix:
-str = ARG(1)
-spos = POS('.',str)
-IF spos = 0 THEN
-   RETURN str
-ELSE
-   RETURN LEFT(str,spos-1)
--- a/Xvnc/config/makedepend/Imakefile
+++ /dev/null
@@ -1,92 +0,0 @@
-XCOMM $TOG: Imakefile /main/27 1997/04/30 15:38:09 kaleb $
-XCOMM
-XCOMM
-XCOMM
-XCOMM
-XCOMM $XFree86: xc/config/makedepend/Imakefile,v 3.4.2.1 1997/06/11 12:08:35 dawes Exp $
-
-    SRCS = include.c main.c parse.c pr.c cppsetup.c ifparser.c 
-    OBJS = include.o main.o parse.o pr.o cppsetup.o ifparser.o 
-
-XCOMM Some compilers generate fatal errors if an -L directory does
-XCOMM not exist.  Since BUILDLIBDIR may not exist yet suppress its use.
-         LDPRELIB =
-        LDPRELIBS =
-
-#if HasGcc && !defined(PreIncDir)
-#define PreIncDir /usr/local/lib/gcc-include
-#endif
-#ifdef PreIncDir
-PREINCDIR = PreIncDir
-PREINC_DEFINES = -DPREINCDIR=\"$(PREINCDIR)\"
-#endif
-#ifndef StdIncDir
-#define StdIncDir /usr/include
-#endif
-STDINCDIR = StdIncDir
-STDINC_DEFINES = -DINCLUDEDIR=\"$(STDINCDIR)\"
-#ifdef PostIncDir
-POSTINCDIR = PostIncDir
-POSTINC_DEFINES = -DPOSTINCDIR=\"$(POSTINCDIR)\"
-#endif
-INC_DEFINES = $(PREINC_DEFINES) $(STDINC_DEFINES) $(POSTINC_DEFINES)
-OSUF = .Osuf
-OSUF_DEFINES = -DOBJSUFFIX=\"$(OSUF)\"
-MAIN_DEFINES = $(INC_DEFINES) $(SIGNAL_DEFINES) $(OSUF_DEFINES)
-INCLUDES = -I$(IMAKESRC) -I$(TOP)/include $(TOP_X_INCLUDES)/X11
-
- DEPLIBS =
-
-#if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture)
- XBSDLIB = /**/
-#endif
-
-AllTarget(ProgramTargetName(makedepend))
-
-/*
- * bootstrapping: want to build the real makedepend
- * only after we've run "make depend" here.  That way
- * the program has the right dependencies for clearmake.
- * Save the bootstrap original files so they can be winked in
- * to other views.
- */
-
-#if HasClearmake
-bootstrap:
-	test -h X11 || $(LN) TOPDIR/include X11
-	$(MAKE) -f Makefile.proto TOP_INCLUDES=-I. makedepend
-
-depend::
-	$(MAKE) -f Makefile.proto depend
-	test -d bootstrap || mkdir bootstrap
-	$(MV) *.o makedepend bootstrap
-	$(MAKE) -f Makefile.proto makedepend
-
-clean::
-	$(RM) -r bootstrap
-	$(RM) X11
-#else
-bootstrap:
-#endif /* HasClearmake */
-
-clean::
-	$(RM) Makefile.proto
-
-#undef InstallManPage
-#define InstallManPage(file,dest) /* as nothing */
-#if CrossCompiling
-ComplexHostProgramTarget(makedepend)
-#else
-ComplexProgramTarget(makedepend)
-#endif
-
-SpecialCObjectRule(main,$(ICONFIGFILES),$(MAIN_DEFINES))
-
-InstallManPageLong(mkdepend,$(MANDIR),makedepend)
-
-#ifdef OS2Architecture
-all::
-	$(CP) ProgramTargetName(makedepend) /
-#endif
-
-InstallLinkKitNamedProg(makedepend,makedepend,$(LINKKITDIR)/config/makedepend)
--- a/Xvnc/config/makedepend/cpp.ed
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# $XConsortium: cpp.ed,v 1.3 89/12/12 12:44:18 jim Exp $
-#
-# $Locker $
-#
-/struct symtab stab/d
-/struct symtab \*defloc;/d
-/struct symtab \*udfloc;/d
-/struct symtab \*incloc;/d
-/struct symtab \*ifloc;/d
-/struct symtab \*elsloc;/d
-/struct symtab \*eifloc;/d
-/struct symtab \*ifdloc;/d
-/struct symtab \*ifnloc;/d
-/struct symtab \*ysysloc;/d
-/struct symtab \*varloc;/d
-/struct symtab \*lneloc;/d
-/struct symtab \*ulnloc;/d
-/struct symtab \*uflloc;/d
-/^sayline(/s/$/	DELETED/p
-.,/^}/d
-/^unfill(/s/$/	DELETED/p
-.-1,/^}/d
-/^doincl(/s/$/	DELETED/p
-.-1,/^}/d
-/^equfrm(/s/$/	DELETED/p
-.,/^}/d
-/^dodef(/s/$/	DELETED/p
-.-1,/^}/d
-/^control(/s/$/	DELETED/p
-.-1,/^}/d
-/^savestring(/s/$/	DELETED/p
-.-1,/^}/d
-/^stsym(/s/$/	DELETED/p
-.-1,/^}/d
-/^ppsym(/s/$/	DELETED/p
-.-1,/^}/d
-/^yyerror(/s/$/	DELETED/p
-.,/^}/d
-/^ppwarn(/s/$/	DELETED/p
-.,/^}/d
-/^lookup(/s/$/	DELETED/p
-.-1,/^}/d
-/^subst(/s/$/	DELETED/p
-.-1,/^}/d
-/^trmdir(/s/$/	DELETED/p
-.-1,/^}/d
-/^copy(/s/$/	DELETED/p
-.-1,/^}/d
-/^pperror(/s/$/	DELETED/p
-.,/^}/d
-/^main(/s/$/	CHANGED to cpp_varsetup(argc,argv)/p
-.c
-cpp_varsetup(argc,argv)
-.
-/^strdex(/s/$/	DELETED/p
-.-1,/^}/d
-/^ for(i=1; i<argc; i++)/s/$/	To the end DELETED/p
-.,$c
-}
-.
-/^dump(/s/$/	DELETED/p
-.,/^}/c
-dump() { fatal("dump\n"); }
-.
-/^refill(/s/$/	DELETED/p
-.,/^}/c
-refill() { fatal("refill\n"); }
-.
-/^slookup(/s/$/	DELETED/p
-.-1,/^}/c
-static struct symtab *slookup() { fatal("slookup\n"); }
-.
-w
-q
--- a/Xvnc/config/makedepend/cppsetup.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/* $XConsortium: cppsetup.c /main/17 1996/09/28 16:15:03 rws $ */
-/*
-
-Copyright (c) 1993, 1994  X Consortium
-
-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, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-/* $XFree86: xc/config/makedepend/cppsetup.c,v 3.2 1996/12/30 13:57:53 dawes Exp $ */
-
-#include "def.h"
-
-#ifdef	CPP
-/*
- * This file is strictly for the sake of cpy.y and yylex.c (if
- * you indeed have the source for cpp).
- */
-#define IB 1
-#define SB 2
-#define NB 4
-#define CB 8
-#define QB 16
-#define WB 32
-#define SALT '#'
-#if defined(pdp11) || defined(vax) || defined(ns16000) || defined(mc68000) || defined(ibm032)
-#define COFF 128
-#else
-#define COFF 0
-#endif
-/*
- * These variables used by cpy.y and yylex.c
- */
-extern char	*outp, *inp, *newp, *pend;
-extern char	*ptrtab;
-extern char	fastab[];
-extern char	slotab[];
-
-/*
- * cppsetup
- */
-struct filepointer	*currentfile;
-struct inclist		*currentinc;
-
-cppsetup(line, filep, inc)
-	register char	*line;
-	register struct filepointer	*filep;
-	register struct inclist		*inc;
-{
-	register char *p, savec;
-	static boolean setupdone = FALSE;
-	boolean	value;
-
-	if (!setupdone) {
-		cpp_varsetup();
-		setupdone = TRUE;
-	}
-
-	currentfile = filep;
-	currentinc = inc;
-	inp = newp = line;
-	for (p=newp; *p; p++)
-		;
-
-	/*
-	 * put a newline back on the end, and set up pend, etc.
-	 */
-	*p++ = '\n';
-	savec = *p;
-	*p = '\0';
-	pend = p;
-
-	ptrtab = slotab+COFF;
-	*--inp = SALT; 
-	outp=inp; 
-	value = yyparse();
-	*p = savec;
-	return(value);
-}
-
-struct symtab **lookup(symbol)
-	char	*symbol;
-{
-	static struct symtab    *undefined;
-	struct symtab   **sp;
-
-	sp = isdefined(symbol, currentinc, NULL);
-	if (sp == NULL) {
-		sp = &undefined;
-		(*sp)->s_value = NULL;
-	}
-	return (sp);
-}
-
-pperror(tag, x0,x1,x2,x3,x4)
-	int	tag,x0,x1,x2,x3,x4;
-{
-	warning("\"%s\", line %d: ", currentinc->i_file, currentfile->f_line);
-	warning(x0,x1,x2,x3,x4);
-}
-
-
-yyerror(s)
-	register char	*s;
-{
-	fatalerr("Fatal error: %s\n", s);
-}
-#else /* not CPP */
-
-#include "ifparser.h"
-struct _parse_data {
-    struct filepointer *filep;
-    struct inclist *inc;
-    const char *line;
-};
-
-static const char *
-my_if_errors (ip, cp, expecting)
-    IfParser *ip;
-    const char *cp;
-    const char *expecting;
-{
-    struct _parse_data *pd = (struct _parse_data *) ip->data;
-    int lineno = pd->filep->f_line;
-    char *filename = pd->inc->i_file;
-    char prefix[300];
-    int prefixlen;
-    int i;
-
-    sprintf (prefix, "\"%s\":%d", filename, lineno);
-    prefixlen = strlen(prefix);
-    fprintf (stderr, "%s:  %s", prefix, pd->line);
-    i = cp - pd->line;
-    if (i > 0 && pd->line[i-1] != '\n') {
-	putc ('\n', stderr);
-    }
-    for (i += prefixlen + 3; i > 0; i--) {
-	putc (' ', stderr);
-    }
-    fprintf (stderr, "^--- expecting %s\n", expecting);
-    return NULL;
-}
-
-
-#define MAXNAMELEN 256
-
-static struct symtab **
-lookup_variable (ip, var, len)
-    IfParser *ip;
-    const char *var;
-    int len;
-{
-    char tmpbuf[MAXNAMELEN + 1];
-    struct _parse_data *pd = (struct _parse_data *) ip->data;
-
-    if (len > MAXNAMELEN)
-	return 0;
-
-    strncpy (tmpbuf, var, len);
-    tmpbuf[len] = '\0';
-    return isdefined (tmpbuf, pd->inc, NULL);
-}
-
-
-static int
-my_eval_defined (ip, var, len)
-    IfParser *ip;
-    const char *var;
-    int len;
-{
-    if (lookup_variable (ip, var, len))
-	return 1;
-    else
-	return 0;
-}
-
-#define isvarfirstletter(ccc) (isalpha(ccc) || (ccc) == '_')
-
-static long
-my_eval_variable (ip, var, len)
-    IfParser *ip;
-    const char *var;
-    int len;
-{
-    struct symtab **s;
-
-    s = lookup_variable (ip, var, len);
-    if (!s)
-	return 0;
-    do {
-	var = (*s)->s_value;
-	if (!isvarfirstletter(*var))
-	    break;
-	s = lookup_variable (ip, var, strlen(var));
-    } while (s);
-
-    return strtol(var, NULL, 0);
-}
-
-
-cppsetup(line, filep, inc)
-	register char	*line;
-	register struct filepointer	*filep;
-	register struct inclist		*inc;
-{
-    IfParser ip;
-    struct _parse_data pd;
-    long val = 0;
-
-    pd.filep = filep;
-    pd.inc = inc;
-    pd.line = line;
-    ip.funcs.handle_error = my_if_errors;
-    ip.funcs.eval_defined = my_eval_defined;
-    ip.funcs.eval_variable = my_eval_variable;
-    ip.data = (char *) &pd;
-
-    (void) ParseIfExpression (&ip, line, &val);
-    if (val)
-	return IF;
-    else
-	return IFFALSE;
-}
-#endif /* CPP */
-
--- a/Xvnc/config/makedepend/def.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* $XConsortium: def.h /main/30 1996/12/04 10:11:12 swick $ */
-/* $XFree86: xc/config/makedepend/def.h,v 3.3 1997/01/12 10:38:17 dawes Exp $ */
-/*
-
-Copyright (c) 1993, 1994  X Consortium
-
-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, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-
-#include "Xos.h"
-#include "Xfuncproto.h"
-#include <stdio.h>
-#ifndef X_NOT_STDC_ENV
-#include <string.h>
-#endif
-#include <ctype.h>
-#ifndef X_NOT_POSIX
-#ifndef _POSIX_SOURCE
-#define _POSIX_SOURCE
-#endif
-#endif
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-#define MAXDEFINES	512
-#define MAXFILES	1024
-#define MAXDIRS		64
-#define SYMTABINC	10	/* must be > 1 for define() to work right */
-#define	TRUE		1
-#define	FALSE		0
-
-/* the following must match the directives table in main.c */
-#define	IF		0
-#define	IFDEF		1
-#define	IFNDEF		2
-#define	ELSE		3
-#define	ENDIF		4
-#define	DEFINE		5
-#define	UNDEF		6
-#define	INCLUDE		7
-#define	LINE		8
-#define	PRAGMA		9
-#define ERROR           10
-#define IDENT           11
-#define SCCS            12
-#define ELIF            13
-#define EJECT           14
-#define WARNING         15
-#define IFFALSE         16     /* pseudo value --- never matched */
-#define ELIFFALSE       17     /* pseudo value --- never matched */
-#define INCLUDEDOT      18     /* pseudo value --- never matched */
-#define IFGUESSFALSE    19     /* pseudo value --- never matched */
-#define ELIFGUESSFALSE  20     /* pseudo value --- never matched */
-
-#ifdef DEBUG
-extern int	_debugmask;
-/*
- * debug levels are:
- * 
- *     0	show ifn*(def)*,endif
- *     1	trace defined/!defined
- *     2	show #include
- *     3	show #include SYMBOL
- *     4-6	unused
- */
-#define debug(level,arg) { if (_debugmask & (1 << level)) warning arg; }
-#else
-#define	debug(level,arg) /**/
-#endif /* DEBUG */
-
-typedef	unsigned char boolean;
-
-struct symtab {
-	char	*s_name;
-	char	*s_value;
-};
-
-/* possible i_flag */
-#define DEFCHECKED	(1<<0)	/* whether defines have been checked */
-#define NOTIFIED	(1<<1)	/* whether we have revealed includes */
-#define MARKED		(1<<2)	/* whether it's in the makefile */
-#define SEARCHED	(1<<3)	/* whether we have read this */
-#define FINISHED	(1<<4)	/* whether we are done reading this */
-#define INCLUDED_SYM	(1<<5)	/* whether #include SYMBOL was found
-				   Can't use i_list if TRUE */
-struct	inclist {
-	char		*i_incstring;	/* string from #include line */
-	char		*i_file;	/* path name of the include file */
-	struct inclist	**i_list;	/* list of files it itself includes */
-	int		i_listlen;	/* length of i_list */
-	struct symtab	**i_defs;	/* symbol table for this file and its
-					   children when merged */
-	int		i_ndefs;	/* current # defines */
-	boolean		*i_merged;      /* whether we have merged child
-					   defines */
-	unsigned char   i_flags;
-};
-
-struct filepointer {
-	char	*f_p;
-	char	*f_base;
-	char	*f_end;
-	long	f_len;
-	long	f_line;
-};
-
-#ifndef X_NOT_STDC_ENV
-#include <stdlib.h>
-#if defined(macII) && !defined(__STDC__)  /* stdlib.h fails to define these */
-char *malloc(), *realloc();
-#endif /* macII */
-#else
-char			*malloc();
-char			*realloc();
-#endif
-
-char			*copy();
-char			*base_name();
-char			*x_getline();
-struct symtab		**slookup();
-struct symtab		**isdefined();
-struct symtab		**fdefined();
-struct filepointer	*getfile();
-struct inclist		*newinclude();
-struct inclist		*inc_path();
-
-#if NeedVarargsPrototypes
-extern void fatalerr(char *, ...);
-extern void warning(char *, ...);
-extern void warning1(char *, ...);
-#endif
--- a/Xvnc/config/makedepend/ifparser.c
+++ /dev/null
@@ -1,544 +0,0 @@
-/*
- * $XConsortium: ifparser.c /main/10 1996/09/28 16:15:18 rws $
- * $XFree86: xc/config/makedepend/ifparser.c,v 3.6 1996/12/30 13:57:55 dawes Exp $
- *
- * Copyright 1992 Network Computing Devices, Inc.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Network Computing Devices may not be
- * used in advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission.  Network Computing Devices makes
- * no representations about the suitability of this software for any purpose.
- * It is provided ``as is'' without express or implied warranty.
- * 
- * NETWORK COMPUTING DEVICES DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE FOR 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.
- * 
- * Author:  Jim Fulton
- *          Network Computing Devices, Inc.
- * 
- * Simple if statement processor
- *
- * This module can be used to evaluate string representations of C language
- * if constructs.  It accepts the following grammar:
- * 
- *     EXPRESSION	:=	VALUE
- * 			 |	VALUE  BINOP	EXPRESSION
- *			 |	VALUE	'?'	EXPRESSION ':'	EXPRESSION
- * 
- *     VALUE		:=	'('  EXPRESSION  ')'
- * 			 |	'!'  VALUE
- * 			 |	'-'  VALUE
- *			 |	'~'  VALUE
- * 			 |	'defined'  '('  variable  ')'
- * 			 |	'defined'  variable
- *			 |	# variable '(' variable-list ')'
- * 			 |	variable
- * 			 |	number
- * 
- *     BINOP		:=	'*'	|  '/'	|  '%'
- * 			 |	'+'	|  '-'
- * 			 |	'<<'	|  '>>'
- * 			 |	'<'	|  '>'	|  '<='  |  '>='
- * 			 |	'=='	|  '!='
- * 			 |	'&'	|  '^'  |  '|'
- * 			 |	'&&'	|  '||'
- * 
- * The normal C order of precedence is supported.
- * 
- * 
- * External Entry Points:
- * 
- *     ParseIfExpression		parse a string for #if
- */
-
-#include "ifparser.h"
-#include <ctype.h>
-
-/****************************************************************************
-		   Internal Macros and Utilities for Parser
- ****************************************************************************/
-
-#define DO(val) if (!(val)) return NULL
-#define CALLFUNC(ggg,fff) (*((ggg)->funcs.fff))
-#define SKIPSPACE(ccc) while (isspace(*ccc)) ccc++
-#define isvarfirstletter(ccc) (isalpha(ccc) || (ccc) == '_')
-
-
-static const char *
-parse_variable (g, cp, varp)
-    IfParser *g;
-    const char *cp;
-    const char **varp;
-{
-    SKIPSPACE (cp);
-
-    if (!isvarfirstletter (*cp))
-	return CALLFUNC(g, handle_error) (g, cp, "variable name");
-
-    *varp = cp;
-    /* EMPTY */
-    for (cp++; isalnum(*cp) || *cp == '_'; cp++) ;
-    return cp;
-}
-
-
-static const char *
-parse_number (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    long *valp;
-{
-    SKIPSPACE (cp);
-
-    if (!isdigit(*cp))
-	return CALLFUNC(g, handle_error) (g, cp, "number");
-
-    *valp = strtol(cp, &cp, 0);
-    /* skip trailing qualifiers */
-    while (*cp == 'U' || *cp == 'u' || *cp == 'L' || *cp == 'l') cp++;
-#if 0
-    *valp = atoi (cp);
-    /* EMPTY */
-    for (cp++; isdigit(*cp); cp++) ;
-#endif
-    return cp;
-}
-
-static const char *
-parse_character (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    long *valp;
-{
-    char val;
-
-    SKIPSPACE (cp);
-    if (*cp == '\\')
-	switch (cp[1]) {
-	case 'n': val = '\n'; break;
-	case 't': val = '\t'; break;
-	case 'v': val = '\v'; break;
-	case 'b': val = '\b'; break;
-	case 'r': val = '\r'; break;
-	case 'f': val = '\f'; break;
-	case 'a': val = '\a'; break;
-	case '\\': val = '\\'; break;
-	case '?': val = '\?'; break;
-	case '\'': val = '\''; break;
-	case '\"': val = '\"'; break;
-	case 'x': val = (char) strtol (cp + 2, NULL, 16); break;
-	default: val = (char) strtol (cp + 1, NULL, 8); break;
-	}
-    else
-	val = *cp;
-    while (*cp != '\'') cp++;
-    *valp = (long) val;
-    return cp;
-}
-
-static const char *
-parse_value (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    long *valp;
-{
-    const char *var;
-
-    *valp = 0;
-
-    SKIPSPACE (cp);
-    if (!*cp)
-	return cp;
-
-    switch (*cp) {
-      case '(':
-	DO (cp = ParseIfExpression (g, cp + 1, valp));
-	SKIPSPACE (cp);
-	if (*cp != ')') 
-	    return CALLFUNC(g, handle_error) (g, cp, ")");
-
-	return cp + 1;			/* skip the right paren */
-
-      case '!':
-	DO (cp = parse_value (g, cp + 1, valp));
-	*valp = !(*valp);
-	return cp;
-
-      case '-':
-	DO (cp = parse_value (g, cp + 1, valp));
-	*valp = -(*valp);
-	return cp;
-
-      case '~':
-	DO (cp = parse_value (g, cp + 1, valp));
-	*valp = ~(*valp);
-	return cp;
-
-      case '#':
-	DO (cp = parse_variable (g, cp + 1, &var));
-	SKIPSPACE (cp);
-	if (*cp != '(')
-	    return CALLFUNC(g, handle_error) (g, cp, "(");
-	do {
-	    DO (cp = parse_variable (g, cp + 1, &var));
-	    SKIPSPACE (cp);
-	} while (*cp && *cp != ')');
-	if (*cp != ')')
-	    return CALLFUNC(g, handle_error) (g, cp, ")");
-	*valp = 1; /* XXX */
-	return cp + 1;
-
-      case '\'':
-	DO (cp = parse_character (g, cp + 1, valp));
-	if (*cp != '\'')
-	    return CALLFUNC(g, handle_error) (g, cp, "'");
-	return cp + 1;
-
-      case 'd':
-	if (strncmp (cp, "defined", 7) == 0 && !isalnum(cp[7])) {
-	    int paren = 0;
-	    int len;
-
-	    cp += 7;
-	    SKIPSPACE (cp);
-	    if (*cp == '(') {
-		paren = 1;
-		cp++;
-	    }
-	    DO (cp = parse_variable (g, cp, &var));
-	    len = cp - var;
-	    SKIPSPACE (cp);
-	    if (paren && *cp != ')')
-		return CALLFUNC(g, handle_error) (g, cp, ")");
-	    *valp = (*(g->funcs.eval_defined)) (g, var, len);
-	    return cp + paren;		/* skip the right paren */
-	}
-	/* fall out */
-    }
-
-    if (isdigit(*cp)) {
-	DO (cp = parse_number (g, cp, valp));
-    } else if (!isvarfirstletter(*cp))
-	return CALLFUNC(g, handle_error) (g, cp, "variable or number");
-    else {
-	DO (cp = parse_variable (g, cp, &var));
-	*valp = (*(g->funcs.eval_variable)) (g, var, cp - var);
-    }
-    
-    return cp;
-}
-
-
-
-static const char *
-parse_product (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    long *valp;
-{
-    long rightval;
-
-    DO (cp = parse_value (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '*':
-	DO (cp = parse_product (g, cp + 1, &rightval));
-	*valp = (*valp * rightval);
-	break;
-
-      case '/':
-	DO (cp = parse_product (g, cp + 1, &rightval));
-	*valp = (*valp / rightval);
-	break;
-
-      case '%':
-	DO (cp = parse_product (g, cp + 1, &rightval));
-	*valp = (*valp % rightval);
-	break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_sum (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    long *valp;
-{
-    long rightval;
-
-    DO (cp = parse_product (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '+':
-	DO (cp = parse_sum (g, cp + 1, &rightval));
-	*valp = (*valp + rightval);
-	break;
-
-      case '-':
-	DO (cp = parse_sum (g, cp + 1, &rightval));
-	*valp = (*valp - rightval);
-	break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_shift (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    long *valp;
-{
-    long rightval;
-
-    DO (cp = parse_sum (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '<':
-	if (cp[1] == '<') {
-	    DO (cp = parse_shift (g, cp + 2, &rightval));
-	    *valp = (*valp << rightval);
-	}
-	break;
-
-      case '>':
-	if (cp[1] == '>') {
-	    DO (cp = parse_shift (g, cp + 2, &rightval));
-	    *valp = (*valp >> rightval);
-	}
-	break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_inequality (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    long *valp;
-{
-    long rightval;
-
-    DO (cp = parse_shift (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '<':
-	if (cp[1] == '=') {
-	    DO (cp = parse_inequality (g, cp + 2, &rightval));
-	    *valp = (*valp <= rightval);
-	} else {
-	    DO (cp = parse_inequality (g, cp + 1, &rightval));
-	    *valp = (*valp < rightval);
-	}
-	break;
-
-      case '>':
-	if (cp[1] == '=') {
-	    DO (cp = parse_inequality (g, cp + 2, &rightval));
-	    *valp = (*valp >= rightval);
-	} else {
-	    DO (cp = parse_inequality (g, cp + 1, &rightval));
-	    *valp = (*valp > rightval);
-	}
-	break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_equality (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    long *valp;
-{
-    long rightval;
-
-    DO (cp = parse_inequality (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '=':
-	if (cp[1] == '=')
-	    cp++;
-	DO (cp = parse_equality (g, cp + 1, &rightval));
-	*valp = (*valp == rightval);
-	break;
-
-      case '!':
-	if (cp[1] != '=')
-	    break;
-	DO (cp = parse_equality (g, cp + 2, &rightval));
-	*valp = (*valp != rightval);
-	break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_band (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    long *valp;
-{
-    long rightval;
-
-    DO (cp = parse_equality (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '&':
-	if (cp[1] != '&') {
-	    DO (cp = parse_band (g, cp + 1, &rightval));
-	    *valp = (*valp & rightval);
-	}
-	break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_bxor (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    long *valp;
-{
-    long rightval;
-
-    DO (cp = parse_band (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '^':
-	DO (cp = parse_bxor (g, cp + 1, &rightval));
-	*valp = (*valp ^ rightval);
-	break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_bor (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    long *valp;
-{
-    long rightval;
-
-    DO (cp = parse_bxor (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '|':
-	if (cp[1] != '|') {
-	    DO (cp = parse_bor (g, cp + 1, &rightval));
-	    *valp = (*valp | rightval);
-	}
-	break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_land (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    long *valp;
-{
-    long rightval;
-
-    DO (cp = parse_bor (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '&':
-	if (cp[1] != '&')
-	    return CALLFUNC(g, handle_error) (g, cp, "&&");
-	DO (cp = parse_land (g, cp + 2, &rightval));
-	*valp = (*valp && rightval);
-	break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_lor (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    long *valp;
-{
-    long rightval;
-
-    DO (cp = parse_land (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '|':
-	if (cp[1] != '|')
-	    return CALLFUNC(g, handle_error) (g, cp, "||");
-	DO (cp = parse_lor (g, cp + 2, &rightval));
-	*valp = (*valp || rightval);
-	break;
-    }
-    return cp;
-}
-
-
-static const char *
-parse_cond(g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    long *valp;
-{
-    long trueval, falseval;
-
-    DO (cp = parse_lor (g, cp, valp));
-    SKIPSPACE (cp);
-
-    switch (*cp) {
-      case '?':
-	DO (cp = parse_cond (g, cp + 1, &trueval));
-	SKIPSPACE (cp);
-	if (*cp != ':')
-	    return CALLFUNC(g, handle_error) (g, cp, ":");
-	DO (cp = parse_cond (g, cp + 1, &falseval));
-	*valp = (*valp ? trueval : falseval);
-	break;
-    }
-    return cp;
-}
-
-
-/****************************************************************************
-			     External Entry Points
- ****************************************************************************/
-
-const char *
-ParseIfExpression (g, cp, valp)
-    IfParser *g;
-    const char *cp;
-    long *valp;
-{
-    return parse_cond (g, cp, valp);
-}
--- a/Xvnc/config/makedepend/ifparser.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * $XConsortium: ifparser.h /main/4 1996/09/28 16:15:24 rws $
- *
- * Copyright 1992 Network Computing Devices, Inc.
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Network Computing Devices may not be
- * used in advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission.  Network Computing Devices makes
- * no representations about the suitability of this software for any purpose.
- * It is provided ``as is'' without express or implied warranty.
- * 
- * NETWORK COMPUTING DEVICES DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE FOR 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.
- * 
- * Author:  Jim Fulton
- *          Network Computing Devices, Inc.
- * 
- * Simple if statement processor
- *
- * This module can be used to evaluate string representations of C language
- * if constructs.  It accepts the following grammar:
- * 
- *     EXPRESSION	:=	VALUE
- * 			 |	VALUE  BINOP	EXPRESSION
- *			 |	VALUE	'?'	EXPRESSION ':'	EXPRESSION
- * 
- *     VALUE		:=	'('  EXPRESSION  ')'
- * 			 |	'!'  VALUE
- * 			 |	'-'  VALUE
- *			 |	'~'  VALUE
- * 			 |	'defined'  '('  variable  ')'
- * 			 |	variable
- * 			 |	number
- * 
- *     BINOP		:=	'*'	|  '/'	|  '%'
- * 			 |	'+'	|  '-'
- * 			 |	'<<'	|  '>>'
- * 			 |	'<'	|  '>'	|  '<='  |  '>='
- * 			 |	'=='	|  '!='
- * 			 |	'&'	|  '^'  |  '|'
- * 			 |	'&&'	|  '||'
- * 
- * The normal C order of precedence is supported.
- * 
- * 
- * External Entry Points:
- * 
- *     ParseIfExpression		parse a string for #if
- */
-
-/* $XFree86: xc/config/makedepend/ifparser.h,v 3.2 1996/12/30 13:57:56 dawes Exp $ */
-
-#include <stdio.h>
-
-#define const /**/
-typedef int Bool;
-#define False 0
-#define True 1
-
-typedef struct _if_parser {
-    struct {				/* functions */
-	char *(*handle_error) (/* struct _if_parser *, const char *,
-				 const char * */);
-	long (*eval_variable) (/* struct _if_parser *, const char *, int */);
-	int (*eval_defined) (/* struct _if_parser *, const char *, int */);
-    } funcs;
-    char *data;
-} IfParser;
-
-char *ParseIfExpression (
-#ifdef __STDC__
-    IfParser *, 
-    const char *, 
-    long *
-#endif
-);
-
--- a/Xvnc/config/makedepend/include.c
+++ /dev/null
@@ -1,320 +0,0 @@
-/* $XConsortium: include.c /main/20 1996/12/04 10:11:18 swick $ */
-/*
-
-Copyright (c) 1993, 1994  X Consortium
-
-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, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-
-
-#include "def.h"
-
-extern struct	inclist	inclist[ MAXFILES ],
-			*inclistp;
-extern char	*includedirs[ ];
-extern char	*notdotdot[ ];
-extern boolean show_where_not;
-extern boolean warn_multiple;
-
-boolean
-isdot(p)
-	register char	*p;
-{
-	if(p && *p++ == '.' && *p++ == '\0')
-		return(TRUE);
-	return(FALSE);
-}
-
-boolean
-isdotdot(p)
-	register char	*p;
-{
-	if(p && *p++ == '.' && *p++ == '.' && *p++ == '\0')
-		return(TRUE);
-	return(FALSE);
-}
-
-boolean
-issymbolic(dir, component)
-	register char	*dir, *component;
-{
-#ifdef S_IFLNK
-	struct stat	st;
-	char	buf[ BUFSIZ ], **pp;
-
-	sprintf(buf, "%s%s%s", dir, *dir ? "/" : "", component);
-	for (pp=notdotdot; *pp; pp++)
-		if (strcmp(*pp, buf) == 0)
-			return (TRUE);
-	if (lstat(buf, &st) == 0
-	&& (st.st_mode & S_IFMT) == S_IFLNK) {
-		*pp++ = copy(buf);
-		if (pp >= &notdotdot[ MAXDIRS ])
-			fatalerr("out of .. dirs, increase MAXDIRS\n");
-		return(TRUE);
-	}
-#endif
-	return(FALSE);
-}
-
-/*
- * Occasionally, pathnames are created that look like .../x/../y
- * Any of the 'x/..' sequences within the name can be eliminated.
- * (but only if 'x' is not a symbolic link!!)
- */
-void
-remove_dotdot(path)
-	char	*path;
-{
-	register char	*end, *from, *to, **cp;
-	char		*components[ MAXFILES ],
-			newpath[ BUFSIZ ];
-	boolean		component_copied;
-
-	/*
-	 * slice path up into components.
-	 */
-	to = newpath;
-	if (*path == '/')
-		*to++ = '/';
-	*to = '\0';
-	cp = components;
-	for (from=end=path; *end; end++)
-		if (*end == '/') {
-			while (*end == '/')
-				*end++ = '\0';
-			if (*from)
-				*cp++ = from;
-			from = end;
-		}
-	*cp++ = from;
-	*cp = NULL;
-
-	/*
-	 * Recursively remove all 'x/..' component pairs.
-	 */
-	cp = components;
-	while(*cp) {
-		if (!isdot(*cp) && !isdotdot(*cp) && isdotdot(*(cp+1))
-		    && !issymbolic(newpath, *cp))
-		{
-		    char **fp = cp + 2;
-		    char **tp = cp;
-
-		    do 
-			*tp++ = *fp; /* move all the pointers down */
-		    while (*fp++);
-		    if (cp != components)
-			cp--;	/* go back and check for nested ".." */
-		} else {
-		    cp++;
-		}
-	}
-	/*
-	 * Concatenate the remaining path elements.
-	 */
-	cp = components;
-	component_copied = FALSE;
-	while(*cp) {
-		if (component_copied)
-			*to++ = '/';
-		component_copied = TRUE;
-		for (from = *cp; *from; )
-			*to++ = *from++;
-		*to = '\0';
-		cp++;
-	}
-	*to++ = '\0';
-
-	/*
-	 * copy the reconstituted path back to our pointer.
-	 */
-	strcpy(path, newpath);
-}
-
-/*
- * Add an include file to the list of those included by 'file'.
- */
-struct inclist *newinclude(newfile, incstring)
-	register char	*newfile, *incstring;
-{
-	register struct inclist	*ip;
-
-	/*
-	 * First, put this file on the global list of include files.
-	 */
-	ip = inclistp++;
-	if (inclistp == inclist + MAXFILES - 1)
-		fatalerr("out of space: increase MAXFILES\n");
-	ip->i_file = copy(newfile);
-
-	if (incstring == NULL)
-		ip->i_incstring = ip->i_file;
-	else
-		ip->i_incstring = copy(incstring);
-
-	return(ip);
-}
-
-void
-included_by(ip, newfile)
-	register struct inclist	*ip, *newfile;
-{
-	register int i;
-
-	if (ip == NULL)
-		return;
-	/*
-	 * Put this include file (newfile) on the list of files included
-	 * by 'file'.  If 'file' is NULL, then it is not an include
-	 * file itself (i.e. was probably mentioned on the command line).
-	 * If it is already on the list, don't stick it on again.
-	 */
-	if (ip->i_list == NULL) {
-		ip->i_list = (struct inclist **)
-			malloc(sizeof(struct inclist *) * ++ip->i_listlen);
-		ip->i_merged = (boolean *)
-		    malloc(sizeof(boolean) * ip->i_listlen);
-	} else {
-		for (i=0; i<ip->i_listlen; i++)
-			if (ip->i_list[ i ] == newfile) {
-			    i = strlen(newfile->i_file);
-			    if (!(ip->i_flags & INCLUDED_SYM) &&
-				!(i > 2 &&
-				  newfile->i_file[i-1] == 'c' &&
-				  newfile->i_file[i-2] == '.'))
-			    {
-				/* only bitch if ip has */
-				/* no #include SYMBOL lines  */
-				/* and is not a .c file */
-				if (warn_multiple)
-				{
-					warning("%s includes %s more than once!\n",
-						ip->i_file, newfile->i_file);
-					warning1("Already have\n");
-					for (i=0; i<ip->i_listlen; i++)
-						warning1("\t%s\n", ip->i_list[i]->i_file);
-				}
-			    }
-			    return;
-			}
-		ip->i_list = (struct inclist **) realloc(ip->i_list,
-			sizeof(struct inclist *) * ++ip->i_listlen);
-		ip->i_merged = (boolean *)
-		    realloc(ip->i_merged, sizeof(boolean) * ip->i_listlen);
-	}
-	ip->i_list[ ip->i_listlen-1 ] = newfile;
-	ip->i_merged[ ip->i_listlen-1 ] = FALSE;
-}
-
-void
-inc_clean ()
-{
-	register struct inclist *ip;
-
-	for (ip = inclist; ip < inclistp; ip++) {
-		ip->i_flags &= ~MARKED;
-	}
-}
-
-struct inclist *inc_path(file, include, dot)
-	register char	*file,
-			*include;
-	boolean	dot;
-{
-	static char	path[ BUFSIZ ];
-	register char		**pp, *p;
-	register struct inclist	*ip;
-	struct stat	st;
-	boolean	found = FALSE;
-
-	/*
-	 * Check all previously found include files for a path that
-	 * has already been expanded.
-	 */
-	for (ip = inclist; ip->i_file; ip++)
-	    if ((strcmp(ip->i_incstring, include) == 0) &&
-		!(ip->i_flags & INCLUDED_SYM))
-	    {
-		found = TRUE;
-		break;
-	    }
-
-	/*
-	 * If the path was surrounded by "" or is an absolute path,
-	 * then check the exact path provided.
-	 */
-	if (!found && (dot || *include == '/')) {
-		if (stat(include, &st) == 0) {
-			ip = newinclude(include, include);
-			found = TRUE;
-		}
-		else if (show_where_not)
-			warning1("\tnot in %s\n", include);
-	}
-
-	/*
-	 * If the path was surrounded by "" see if this include file is in the
-	 * directory of the file being parsed.
-	 */
-	if (!found && dot) {
-		for (p=file+strlen(file); p>file; p--)
-			if (*p == '/')
-				break;
-		if (p == file)
-			strcpy(path, include);
-		else {
-			strncpy(path, file, (p-file) + 1);
-			path[ (p-file) + 1 ] = '\0';
-			strcpy(path + (p-file) + 1, include);
-		}
-		remove_dotdot(path);
-		if (stat(path, &st) == 0) {
-			ip = newinclude(path, include);
-			found = TRUE;
-		}
-		else if (show_where_not)
-			warning1("\tnot in %s\n", path);
-	}
-
-	/*
-	 * Check the include directories specified. (standard include dir
-	 * should be at the end.)
-	 */
-	if (!found)
-		for (pp = includedirs; *pp; pp++) {
-			sprintf(path, "%s/%s", *pp, include);
-			remove_dotdot(path);
-			if (stat(path, &st) == 0) {
-				ip = newinclude(path, include);
-				found = TRUE;
-				break;
-			}
-			else if (show_where_not)
-				warning1("\tnot in %s\n", path);
-		}
-
-	if (!found)
-		ip = NULL;
-	return(ip);
-}
--- a/Xvnc/config/makedepend/main.c
+++ /dev/null
@@ -1,782 +0,0 @@
-/* $XConsortium: main.c /main/84 1996/12/04 10:11:23 swick $ */
-/* $XFree86: xc/config/makedepend/main.c,v 3.11.2.1 1997/05/11 05:04:07 dawes Exp $ */
-/*
-
-Copyright (c) 1993, 1994  X Consortium
-
-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, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-
-#include "def.h"
-#ifdef hpux
-#define sigvec sigvector
-#endif /* hpux */
-
-#ifdef X_POSIX_C_SOURCE
-#define _POSIX_C_SOURCE X_POSIX_C_SOURCE
-#include <signal.h>
-#undef _POSIX_C_SOURCE
-#else
-#if defined(X_NOT_POSIX) || defined(_POSIX_SOURCE)
-#include <signal.h>
-#else
-#define _POSIX_SOURCE
-#include <signal.h>
-#undef _POSIX_SOURCE
-#endif
-#endif
-
-#if NeedVarargsPrototypes
-#include <stdarg.h>
-#endif
-
-#ifdef MINIX
-#define USE_CHMOD	1
-#endif
-
-#ifdef DEBUG
-int	_debugmask;
-#endif
-
-char *ProgramName;
-
-char	*directives[] = {
-	"if",
-	"ifdef",
-	"ifndef",
-	"else",
-	"endif",
-	"define",
-	"undef",
-	"include",
-	"line",
-	"pragma",
-	"error",
-	"ident",
-	"sccs",
-	"elif",
-	"eject",
-	"warning",
-	NULL
-};
-
-#define MAKEDEPEND
-#include "imakemdep.h"	/* from config sources */
-#undef MAKEDEPEND
-
-struct	inclist inclist[ MAXFILES ],
-		*inclistp = inclist,
-		maininclist;
-
-char	*filelist[ MAXFILES ];
-char	*includedirs[ MAXDIRS + 1 ];
-char	*notdotdot[ MAXDIRS ];
-char	*objprefix = "";
-char	*objsuffix = OBJSUFFIX;
-char	*startat = "# DO NOT DELETE";
-int	width = 78;
-boolean	append = FALSE;
-boolean	printed = FALSE;
-boolean	verbose = FALSE;
-boolean	show_where_not = FALSE;
-boolean warn_multiple = FALSE;	/* Warn on multiple includes of same file */
-
-void freefile();
-void redirect();
-#if !NeedVarargsPrototypes
-void fatalerr();
-void warning();
-void warning1();
-#endif
-
-static
-#ifdef SIGNALRETURNSINT
-int
-#else
-void
-#endif
-catch (sig)
-    int sig;
-{
-	fflush (stdout);
-	fatalerr ("got signal %d\n", sig);
-}
-
-#if defined(USG) || (defined(i386) && defined(SYSV)) || defined(WIN32) || defined(__EMX__) || defined(Lynx_22)
-#define USGISH
-#endif
-
-#ifndef USGISH
-#ifndef _POSIX_SOURCE
-#define sigaction sigvec
-#define sa_handler sv_handler
-#define sa_mask sv_mask
-#define sa_flags sv_flags
-#endif
-struct sigaction sig_act;
-#endif /* USGISH */
-
-main(argc, argv)
-	int	argc;
-	char	**argv;
-{
-	register char	**fp = filelist;
-	register char	**incp = includedirs;
-	register char	*p;
-	register struct inclist	*ip;
-	char	*makefile = NULL;
-	struct filepointer	*filecontent;
-	struct symtab *psymp = predefs;
-	char *endmarker = NULL;
-	char *defincdir = NULL;
-	char **undeflist = NULL;
-	int numundefs = 0, i;
-
-	ProgramName = argv[0];
-
-	while (psymp->s_name)
-	{
-	    define2(psymp->s_name, psymp->s_value, &maininclist);
-	    psymp++;
-	}
-	if (argc == 2 && argv[1][0] == '@') {
-	    struct stat ast;
-	    int afd;
-	    char *args;
-	    char **nargv;
-	    int nargc;
-	    char quotechar = '\0';
-
-	    nargc = 1;
-	    if ((afd = open(argv[1]+1, O_RDONLY)) < 0)
-		fatalerr("cannot open \"%s\"\n", argv[1]+1);
-	    fstat(afd, &ast);
-	    args = (char *)malloc(ast.st_size + 1);
-	    if ((ast.st_size = read(afd, args, ast.st_size)) < 0)
-		fatalerr("failed to read %s\n", argv[1]+1);
-	    args[ast.st_size] = '\0';
-	    close(afd);
-	    for (p = args; *p; p++) {
-		if (quotechar) {
-		    if (quotechar == '\\' ||
-			(*p == quotechar && p[-1] != '\\'))
-			quotechar = '\0';
-		    continue;
-		}
-		switch (*p) {
-		case '\\':
-		case '"':
-		case '\'':
-		    quotechar = *p;
-		    break;
-		case ' ':
-		case '\n':
-		    *p = '\0';
-		    if (p > args && p[-1])
-			nargc++;
-		    break;
-		}
-	    }
-	    if (p[-1])
-		nargc++;
-	    nargv = (char **)malloc(nargc * sizeof(char *));
-	    nargv[0] = argv[0];
-	    argc = 1;
-	    for (p = args; argc < nargc; p += strlen(p) + 1)
-		if (*p) nargv[argc++] = p;
-	    argv = nargv;
-	}
-	for(argc--, argv++; argc; argc--, argv++) {
-	    	/* if looking for endmarker then check before parsing */
-		if (endmarker && strcmp (endmarker, *argv) == 0) {
-		    endmarker = NULL;
-		    continue;
-		}
-		if (**argv != '-') {
-			/* treat +thing as an option for C++ */
-			if (endmarker && **argv == '+')
-				continue;
-			*fp++ = argv[0];
-			continue;
-		}
-		switch(argv[0][1]) {
-		case '-':
-			endmarker = &argv[0][2];
-			if (endmarker[0] == '\0') endmarker = "--";
-			break;
-		case 'D':
-			if (argv[0][2] == '\0') {
-				argv++;
-				argc--;
-			}
-			for (p=argv[0] + 2; *p ; p++)
-				if (*p == '=') {
-					*p = ' ';
-					break;
-				}
-			define(argv[0] + 2, &maininclist);
-			break;
-		case 'I':
-			if (incp >= includedirs + MAXDIRS)
-			    fatalerr("Too many -I flags.\n");
-			*incp++ = argv[0]+2;
-			if (**(incp-1) == '\0') {
-				*(incp-1) = *(++argv);
-				argc--;
-			}
-			break;
-		case 'U':
-			/* Undef's override all -D's so save them up */
-			numundefs++;
-			if (numundefs == 1)
-			    undeflist = malloc(sizeof(char *));
-			else
-			    undeflist = realloc(undeflist,
-						numundefs * sizeof(char *));
-			if (argv[0][2] == '\0') {
-				argv++;
-				argc--;
-			}
-			undeflist[numundefs - 1] = argv[0] + 2;
-			break;
-		case 'Y':
-			defincdir = argv[0]+2;
-			break;
-		/* do not use if endmarker processing */
-		case 'a':
-			if (endmarker) break;
-			append = TRUE;
-			break;
-		case 'w':
-			if (endmarker) break;
-			if (argv[0][2] == '\0') {
-				argv++;
-				argc--;
-				width = atoi(argv[0]);
-			} else
-				width = atoi(argv[0]+2);
-			break;
-		case 'o':
-			if (endmarker) break;
-			if (argv[0][2] == '\0') {
-				argv++;
-				argc--;
-				objsuffix = argv[0];
-			} else
-				objsuffix = argv[0]+2;
-			break;
-		case 'p':
-			if (endmarker) break;
-			if (argv[0][2] == '\0') {
-				argv++;
-				argc--;
-				objprefix = argv[0];
-			} else
-				objprefix = argv[0]+2;
-			break;
-		case 'v':
-			if (endmarker) break;
-			verbose = TRUE;
-#ifdef DEBUG
-			if (argv[0][2])
-				_debugmask = atoi(argv[0]+2);
-#endif
-			break;
-		case 's':
-			if (endmarker) break;
-			startat = argv[0]+2;
-			if (*startat == '\0') {
-				startat = *(++argv);
-				argc--;
-			}
-			if (*startat != '#')
-				fatalerr("-s flag's value should start %s\n",
-					"with '#'.");
-			break;
-		case 'f':
-			if (endmarker) break;
-			makefile = argv[0]+2;
-			if (*makefile == '\0') {
-				makefile = *(++argv);
-				argc--;
-			}
-			break;
-
-		case 'm':
-			warn_multiple = TRUE;
-			break;
-			
-		/* Ignore -O, -g so we can just pass ${CFLAGS} to
-		   makedepend
-		 */
-		case 'O':
-		case 'g':
-			break;
-		default:
-			if (endmarker) break;
-	/*		fatalerr("unknown opt = %s\n", argv[0]); */
-			warning("ignoring option %s\n", argv[0]);
-		}
-	}
-	/* Now do the undefs from the command line */
-	for (i = 0; i < numundefs; i++)
-	    undefine(undeflist[i], &maininclist);
-	if (numundefs > 0)
-	    free(undeflist);
-
-	if (!defincdir) {
-#ifdef PREINCDIR
-	    if (incp >= includedirs + MAXDIRS)
-		fatalerr("Too many -I flags.\n");
-	    *incp++ = PREINCDIR;
-#endif
-#ifdef __EMX__
-	    {
-		char *emxinc = getenv("C_INCLUDE_PATH");
-		/* can have more than one component */
-		if (emxinc) {
-		    char *beg, *end;
-		    beg= (char*)strdup(emxinc);
-		    for (;;) {
-			end = (char*)strchr(beg,';');
-			if (end) *end = 0;
-		    	if (incp >= includedirs + MAXDIRS)
-				fatalerr("Too many include dirs\n");
-			*incp++ = beg;
-			if (!end) break;
-			beg = end+1;
-		    }
-		}
-	    }
-#else /* !__EMX__, does not use INCLUDEDIR at all */
-	    if (incp >= includedirs + MAXDIRS)
-		fatalerr("Too many -I flags.\n");
-	    *incp++ = INCLUDEDIR;
-#endif
-
-#ifdef POSTINCDIR
-	    if (incp >= includedirs + MAXDIRS)
-		fatalerr("Too many -I flags.\n");
-	    *incp++ = POSTINCDIR;
-#endif
-	} else if (*defincdir) {
-	    if (incp >= includedirs + MAXDIRS)
-		fatalerr("Too many -I flags.\n");
-	    *incp++ = defincdir;
-	}
-
-	redirect(startat, makefile);
-
-	/*
-	 * catch signals.
-	 */
-#ifdef USGISH
-/*  should really reset SIGINT to SIG_IGN if it was.  */
-#ifdef SIGHUP
-	signal (SIGHUP, catch);
-#endif
-	signal (SIGINT, catch);
-#ifdef SIGQUIT
-	signal (SIGQUIT, catch);
-#endif
-	signal (SIGILL, catch);
-#ifdef SIGBUS
-	signal (SIGBUS, catch);
-#endif
-	signal (SIGSEGV, catch);
-#ifdef SIGSYS
-	signal (SIGSYS, catch);
-#endif
-#else
-	sig_act.sa_handler = catch;
-#ifdef _POSIX_SOURCE
-	sigemptyset(&sig_act.sa_mask);
-	sigaddset(&sig_act.sa_mask, SIGINT);
-	sigaddset(&sig_act.sa_mask, SIGQUIT);
-#ifdef SIGBUS
-	sigaddset(&sig_act.sa_mask, SIGBUS);
-#endif
-	sigaddset(&sig_act.sa_mask, SIGILL);
-	sigaddset(&sig_act.sa_mask, SIGSEGV);
-	sigaddset(&sig_act.sa_mask, SIGHUP);
-	sigaddset(&sig_act.sa_mask, SIGPIPE);
-#ifdef SIGSYS
-	sigaddset(&sig_act.sa_mask, SIGSYS);
-#endif
-#else
-	sig_act.sa_mask = ((1<<(SIGINT -1))
-			   |(1<<(SIGQUIT-1))
-#ifdef SIGBUS
-			   |(1<<(SIGBUS-1))
-#endif
-			   |(1<<(SIGILL-1))
-			   |(1<<(SIGSEGV-1))
-			   |(1<<(SIGHUP-1))
-			   |(1<<(SIGPIPE-1))
-#ifdef SIGSYS
-			   |(1<<(SIGSYS-1))
-#endif
-			   );
-#endif /* _POSIX_SOURCE */
-	sig_act.sa_flags = 0;
-	sigaction(SIGHUP, &sig_act, (struct sigaction *)0);
-	sigaction(SIGINT, &sig_act, (struct sigaction *)0);
-	sigaction(SIGQUIT, &sig_act, (struct sigaction *)0);
-	sigaction(SIGILL, &sig_act, (struct sigaction *)0);
-#ifdef SIGBUS
-	sigaction(SIGBUS, &sig_act, (struct sigaction *)0);
-#endif
-	sigaction(SIGSEGV, &sig_act, (struct sigaction *)0);
-#ifdef SIGSYS
-	sigaction(SIGSYS, &sig_act, (struct sigaction *)0);
-#endif
-#endif /* USGISH */
-
-	/*
-	 * now peruse through the list of files.
-	 */
-	for(fp=filelist; *fp; fp++) {
-		filecontent = getfile(*fp);
-		ip = newinclude(*fp, (char *)NULL);
-
-		find_includes(filecontent, ip, ip, 0, FALSE);
-		freefile(filecontent);
-		recursive_pr_include(ip, ip->i_file, base_name(*fp));
-		inc_clean();
-	}
-	if (printed)
-		printf("\n");
-	exit(0);
-}
-
-#ifdef __EMX__
-/*
- * eliminate \r chars from file
- */
-static int elim_cr(char *buf, int sz)
-{
-	int i,wp;
-	for (i= wp = 0; i<sz; i++) {
-		if (buf[i] != '\r')
-			buf[wp++] = buf[i];
-	}
-	return wp;
-}
-#endif
-
-struct filepointer *getfile(file)
-	char	*file;
-{
-	register int	fd;
-	struct filepointer	*content;
-	struct stat	st;
-
-	content = (struct filepointer *)malloc(sizeof(struct filepointer));
-	if ((fd = open(file, O_RDONLY)) < 0) {
-		warning("cannot open \"%s\"\n", file);
-		content->f_p = content->f_base = content->f_end = (char *)malloc(1);
-		*content->f_p = '\0';
-		return(content);
-	}
-	fstat(fd, &st);
-	content->f_base = (char *)malloc(st.st_size+1);
-	if (content->f_base == NULL)
-		fatalerr("cannot allocate mem\n");
-	if ((st.st_size = read(fd, content->f_base, st.st_size)) < 0)
-		fatalerr("failed to read %s\n", file);
-#ifdef __EMX__
-	st.st_size = elim_cr(content->f_base,st.st_size);
-#endif
-	close(fd);
-	content->f_len = st.st_size+1;
-	content->f_p = content->f_base;
-	content->f_end = content->f_base + st.st_size;
-	*content->f_end = '\0';
-	content->f_line = 0;
-	return(content);
-}
-
-void
-freefile(fp)
-	struct filepointer	*fp;
-{
-	free(fp->f_base);
-	free(fp);
-}
-
-char *copy(str)
-	register char	*str;
-{
-	register char	*p = (char *)malloc(strlen(str) + 1);
-
-	strcpy(p, str);
-	return(p);
-}
-
-match(str, list)
-	register char	*str, **list;
-{
-	register int	i;
-
-	for (i=0; *list; i++, list++)
-		if (strcmp(str, *list) == 0)
-			return(i);
-	return(-1);
-}
-
-/*
- * Get the next line.  We only return lines beginning with '#' since that
- * is all this program is ever interested in.
- */
-char *x_getline(filep)
-	register struct filepointer	*filep;
-{
-	register char	*p,	/* walking pointer */
-			*eof,	/* end of file pointer */
-			*bol;	/* beginning of line pointer */
-	register int	lineno;	/* line number */
-
-	p = filep->f_p;
-	eof = filep->f_end;
-	if (p >= eof)
-		return((char *)NULL);
-	lineno = filep->f_line;
-
-	for(bol = p--; ++p < eof; ) {
-		if (*p == '/' && *(p+1) == '*') { /* consume comments */
-			*p++ = ' ', *p++ = ' ';
-			while (*p) {
-				if (*p == '*' && *(p+1) == '/') {
-					*p++ = ' ', *p = ' ';
-					break;
-				}
-				else if (*p == '\n')
-					lineno++;
-				*p++ = ' ';
-			}
-			continue;
-		}
-#if defined(WIN32) || defined(__EMX__)
-		else if (*p == '/' && *(p+1) == '/') { /* consume comments */
-			*p++ = ' ', *p++ = ' ';
-			while (*p && *p != '\n')
-				*p++ = ' ';
-			lineno++;
-			continue;
-		}
-#endif
-		else if (*p == '\\') {
-			if (*(p+1) == '\n') {
-				*p = ' ';
-				*(p+1) = ' ';
-				lineno++;
-			}
-		}
-		else if (*p == '\n') {
-			lineno++;
-			if (*bol == '#') {
-				register char *cp;
-
-				*p++ = '\0';
-				/* punt lines with just # (yacc generated) */
-				for (cp = bol+1; 
-				     *cp && (*cp == ' ' || *cp == '\t'); cp++);
-				if (*cp) goto done;
-			}
-			bol = p+1;
-		}
-	}
-	if (*bol != '#')
-		bol = NULL;
-done:
-	filep->f_p = p;
-	filep->f_line = lineno;
-	return(bol);
-}
-
-/*
- * Strip the file name down to what we want to see in the Makefile.
- * It will have objprefix and objsuffix around it.
- */
-char *base_name(file)
-	register char	*file;
-{
-	register char	*p;
-
-	file = copy(file);
-	for(p=file+strlen(file); p>file && *p != '.'; p--) ;
-
-	if (*p == '.')
-		*p = '\0';
-	return(file);
-}
-
-#if defined(USG) && !defined(CRAY) && !defined(SVR4) && !defined(__EMX__) && !defined(clipper) && !defined(__clipper__)
-int rename (from, to)
-    char *from, *to;
-{
-    (void) unlink (to);
-    if (link (from, to) == 0) {
-	unlink (from);
-	return 0;
-    } else {
-	return -1;
-    }
-}
-#endif /* USGISH */
-
-void
-redirect(line, makefile)
-	char	*line,
-		*makefile;
-{
-	struct stat	st;
-	FILE	*fdin, *fdout;
-	char	backup[ BUFSIZ ],
-		buf[ BUFSIZ ];
-	boolean	found = FALSE;
-	int	len;
-
-	/*
-	 * if makefile is "-" then let it pour onto stdout.
-	 */
-	if (makefile && *makefile == '-' && *(makefile+1) == '\0') {
-		puts(line);
-		return;
-	}
-
-	/*
-	 * use a default makefile is not specified.
-	 */
-	if (!makefile) {
-		if (stat("Makefile", &st) == 0)
-			makefile = "Makefile";
-		else if (stat("makefile", &st) == 0)
-			makefile = "makefile";
-		else
-			fatalerr("[mM]akefile is not present\n");
-	}
-	else
-	    stat(makefile, &st);
-	if ((fdin = fopen(makefile, "r")) == NULL)
-		fatalerr("cannot open \"%s\"\n", makefile);
-	sprintf(backup, "%s.bak", makefile);
-	unlink(backup);
-#if defined(WIN32) || defined(__EMX__)
-	fclose(fdin);
-#endif
-	if (rename(makefile, backup) < 0)
-		fatalerr("cannot rename %s to %s\n", makefile, backup);
-#if defined(WIN32) || defined(__EMX__)
-	if ((fdin = fopen(backup, "r")) == NULL)
-		fatalerr("cannot open \"%s\"\n", backup);
-#endif
-	if ((fdout = freopen(makefile, "w", stdout)) == NULL)
-		fatalerr("cannot open \"%s\"\n", backup);
-	len = strlen(line);
-	while (!found && fgets(buf, BUFSIZ, fdin)) {
-		if (*buf == '#' && strncmp(line, buf, len) == 0)
-			found = TRUE;
-		fputs(buf, fdout);
-	}
-	if (!found) {
-		if (verbose)
-		warning("Adding new delimiting line \"%s\" and dependencies...\n",
-			line);
-		puts(line); /* same as fputs(fdout); but with newline */
-	} else if (append) {
-	    while (fgets(buf, BUFSIZ, fdin)) {
-		fputs(buf, fdout);
-	    }
-	}
-	fflush(fdout);
-#if defined(USGISH) || defined(_SEQUENT_) || defined(USE_CHMOD)
-	chmod(makefile, st.st_mode);
-#else
-        fchmod(fileno(fdout), st.st_mode);
-#endif /* USGISH */
-}
-
-void
-#if NeedVarargsPrototypes
-fatalerr(char *msg, ...)
-#else
-/*VARARGS*/
-fatalerr(msg,x1,x2,x3,x4,x5,x6,x7,x8,x9)
-    char *msg;
-#endif
-{
-#if NeedVarargsPrototypes
-	va_list args;
-#endif
-	fprintf(stderr, "%s: error:  ", ProgramName);
-#if NeedVarargsPrototypes
-	va_start(args, msg);
-	vfprintf(stderr, msg, args);
-	va_end(args);
-#else
-	fprintf(stderr, msg,x1,x2,x3,x4,x5,x6,x7,x8,x9);
-#endif
-	exit (1);
-}
-
-void
-#if NeedVarargsPrototypes
-warning(char *msg, ...)
-#else
-/*VARARGS0*/
-warning(msg,x1,x2,x3,x4,x5,x6,x7,x8,x9)
-    char *msg;
-#endif
-{
-#if NeedVarargsPrototypes
-	va_list args;
-#endif
-	fprintf(stderr, "%s: warning:  ", ProgramName);
-#if NeedVarargsPrototypes
-	va_start(args, msg);
-	vfprintf(stderr, msg, args);
-	va_end(args);
-#else
-	fprintf(stderr, msg,x1,x2,x3,x4,x5,x6,x7,x8,x9);
-#endif
-}
-
-void
-#if NeedVarargsPrototypes
-warning1(char *msg, ...)
-#else
-/*VARARGS0*/
-warning1(msg,x1,x2,x3,x4,x5,x6,x7,x8,x9)
-    char *msg;
-#endif
-{
-#if NeedVarargsPrototypes
-	va_list args;
-	va_start(args, msg);
-	vfprintf(stderr, msg, args);
-	va_end(args);
-#else
-	fprintf(stderr, msg,x1,x2,x3,x4,x5,x6,x7,x8,x9);
-#endif
-}
--- a/Xvnc/config/makedepend/mkdepend.man
+++ /dev/null
@@ -1,373 +0,0 @@
-.\" $XConsortium: mkdepend.man /main/19 1996/09/28 16:15:44 rws $
-.\" Copyright (c) 1993, 1994  X Consortium
-.\" 
-.\" 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, sublicense, 
-.\" and/or sell copies of the Software, and to permit persons to whom the 
-.\" Software furnished to do so, subject to the following conditions:
-.\" 
-.\" The above copyright notice and this permission notice shall be included in
-.\" all copies or substantial portions of the Software.
-.\" 
-.\" 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.  IN NO EVENT SHALL 
-.\" THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
-.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF 
-.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-.\" SOFTWARE.
-.\" 
-.\" Except as contained in this notice, the name of the X Consortium shall not 
-.\" be used in advertising or otherwise to promote the sale, use or other 
-.\" dealing in this Software without prior written authorization from the 
-.\" X Consortium.
-.TH MAKEDEPEND 1 "Release 6.1" "X Version 11"
-.UC 4
-.SH NAME
-makedepend \- create dependencies in makefiles
-.SH SYNOPSIS
-.B makedepend
-[
-.BI \-D name\fB=\fPdef
-] [
-.BI \-D name
-] [
-.BI \-I includedir
-] [
-.BI \-Y includedir
-] [
-.B \-a
-] [
-.BI \-f makefile
-] [
-.BI \-o objsuffix
-] [
-.BI \-p objprefix
-] [
-.BI \-s string
-] [
-.BI \-w width
-] [
-.B \-v
-] [
-.B \-m
-] [
-\-\^\-
-.I otheroptions
-\-\^\-
-]
-.I sourcefile
-\&.\|.\|.
-.br
-.SH DESCRIPTION
-The
-.B makedepend
-program reads each
-.I sourcefile
-in sequence and parses it like a C-preprocessor,
-processing all
-.I #include,
-.I #define,
-.I #undef,
-.I #ifdef,
-.I #ifndef,
-.I #endif,
-.I #if,
-.I #elif
-and
-.I #else
-directives so that it can correctly tell which
-.I #include,
-directives would be used in a compilation.
-Any
-.I #include,
-directives can reference files having other
-.I #include
-directives, and parsing will occur in these files as well.
-.PP
-Every file that a
-.I sourcefile
-includes,
-directly or indirectly,
-is what
-.B makedepend
-calls a \fIdependency.\fP
-These dependencies are then written to a
-.I makefile
-in such a way that
-.B make(1)
-will know which object files must be recompiled when a dependency has changed.
-.PP
-By default,
-.B makedepend
-places its output in the file named
-.I makefile
-if it exists, otherwise
-.I Makefile.
-An alternate makefile may be specified with the
-.B \-f
-option.
-It first searches the makefile for
-the line
-.sp
-    # DO NOT DELETE THIS LINE \-\^\- make depend depends on it.
-.sp
-or one provided with the
-.B \-s
-option,
-as a delimiter for the dependency output.
-If it finds it, it will delete everything
-following this to the end of the makefile
-and put the output after this line.
-If it doesn't find it, the program
-will append the string to the end of the makefile
-and place the output following that.
-For each
-.I sourcefile
-appearing on the command line,
-.B makedepend
-puts lines in the makefile of the form
-.sp
-     sourcefile.o:\0dfile .\|.\|.
-.sp
-Where \fIsourcefile.o\fP is the name from the command
-line with its suffix replaced with ``.o'',
-and \fIdfile\fP is a dependency discovered in a
-.I #include
-directive while parsing
-.I sourcefile
-or one of the files it included.
-.SH EXAMPLE
-Normally,
-.B makedepend
-will be used in a makefile target so that typing ``make depend'' will
-bring the dependencies up to date for the makefile.
-For example,
-.nf
-    SRCS\0=\0file1.c\0file2.c\0.\|.\|.
-    CFLAGS\0=\0\-O\0\-DHACK\0\-I\^.\^.\^/foobar\0\-xyz
-    depend:
-            makedepend\0\-\^\-\0$(CFLAGS)\0\-\^\-\0$(SRCS)
-.fi
-.SH OPTIONS
-The program
-will ignore any option that it does not understand so that you may use
-the same arguments that you would for
-.B cc(1).
-.TP 5
-.B \-D\fIname\fP=\fIdef\fP \fRor\fP \-D\fIname\fP
-Define.
-This places a definition for
-.I name
-in
-.B makedepend's
-symbol table.
-Without 
-.I =def\|
-the symbol becomes defined as ``1''.
-.TP 5
-.B \-I\fIincludedir\fP
-Include directory.
-This option tells
-.B makedepend
-to prepend
-.I includedir
-to its list of directories to search when it encounters
-a
-.I #include
-directive.
-By default,
-.B makedepend
-only searches the standard include directories (usually /usr/include
-and possibly a compiler-dependent directory).
-.TP 5
-.B \-Y\fIincludedir\fP
-Replace all of the standard include directories with the single specified
-include directory; you can omit the
-.I includedir
-to simply prevent searching the standard include directories.
-.TP 5
-.B \-a
-Append the dependencies to the end of the file instead of replacing them. 
-.TP 5
-.B \-f\fImakefile\fP
-Filename.
-This allows you to specify an alternate makefile in which
-.B makedepend
-can place its output.
-Specifying ``\-'' as the file name (i.e., \fB\-f\-\fP) sends the
-output to standard output instead of modifying an existing file.
-.TP 5
-.B \-o\fIobjsuffix\fP
-Object file suffix.
-Some systems may have object files whose suffix is something other
-than ``.o''.
-This option allows you to specify another suffix, such as
-``.b'' with
-.I \-o.b
-or ``:obj''
-with
-.I \-o:obj
-and so forth.
-.TP 5
-.B \-p\fIobjprefix\fP
-Object file prefix.
-The prefix is prepended to the name of the object file. This is
-usually used to designate a different directory for the object file.
-The default is the empty string.
-.TP 5
-.B \-s\fIstring\fP
-Starting string delimiter.
-This option permits you to specify
-a different string for
-.B makedepend
-to look for in the makefile.
-.TP 5
-.B \-w\fIwidth\fP
-Line width.
-Normally,
-.B makedepend
-will ensure that every output line that it writes will be no wider than
-78 characters for the sake of readability.
-This option enables you to change this width.
-.TP 5
-.B \-v
-Verbose operation.
-This option causes 
-.B makedepend
-to emit the list of files included by each input file on standard output.
-.TP 5
-.B \-m
-Warn about multiple inclusion.
-This option causes 
-.B makedepend
-to produce a warning if any input file includes another file more than
-once.  In previous versions of 
-.B makedepend
-this was the default behavior; the default has been changed to better
-match the behavior of the C compiler, which does not consider multiple
-inclusion to be an error.  This option is provided for backward 
-compatibility, and to aid in debugging problems related to multiple
-inclusion.
-.TP 5
-.B "\-\^\- \fIoptions\fP \-\^\-"
-If
-.B makedepend
-encounters a double hyphen (\-\^\-) in the argument list,
-then any unrecognized argument following it
-will be silently ignored; a second double hyphen terminates this
-special treatment.
-In this way,
-.B makedepend
-can be made to safely ignore esoteric compiler arguments that might
-normally be found in a CFLAGS
-.B make
-macro (see the
-.B EXAMPLE
-section above).
-All options that
-.B makedepend
-recognizes and appear between the pair of double hyphens
-are processed normally.
-.SH ALGORITHM
-The approach used in this program enables it to run an order of magnitude
-faster than any other ``dependency generator'' I have ever seen.
-Central to this performance are two assumptions:
-that all files compiled by a single
-makefile will be compiled with roughly the same
-.I \-I
-and
-.I \-D
-options;
-and that most files in a single directory will include largely the
-same files.
-.PP
-Given these assumptions,
-.B makedepend
-expects to be called once for each makefile, with
-all source files that are maintained by the
-makefile appearing on the command line.
-It parses each source and include
-file exactly once, maintaining an internal symbol table
-for each.
-Thus, the first file on the command line will take an amount of time
-proportional to the amount of time that a normal C preprocessor takes.
-But on subsequent files, if it encounters an include file
-that it has already parsed, it does not parse it again.
-.PP
-For example,
-imagine you are compiling two files,
-.I file1.c
-and
-.I file2.c,
-they each include the header file
-.I header.h,
-and the file
-.I header.h
-in turn includes the files
-.I def1.h
-and
-.I def2.h.
-When you run the command
-.sp
-    makedepend\0file1.c\0file2.c
-.sp
-.B makedepend
-will parse
-.I file1.c
-and consequently,
-.I header.h
-and then
-.I def1.h
-and
-.I def2.h.
-It then decides that the dependencies for this file are
-.sp
-    file1.o:\0header.h\0def1.h\0def2.h
-.sp
-But when the program parses
-.I file2.c
-and discovers that it, too, includes
-.I header.h,
-it does not parse the file,
-but simply adds
-.I header.h,
-.I def1.h
-and
-.I def2.h
-to the list of dependencies for
-.I file2.o.
-.SH "SEE ALSO"
-cc(1), make(1)
-.SH BUGS
-.B makedepend
-parses, but does not currently evaluate, the SVR4
-#predicate(token-list) preprocessor expression;
-such expressions are simply assumed to be true.
-This may cause the wrong
-.I #include
-directives to be evaluated.
-.PP
-Imagine you are parsing two files,
-say
-.I file1.c
-and
-.I file2.c,
-each includes the file
-.I def.h.
-The list of files that
-.I def.h
-includes might truly be different when
-.I def.h
-is included by
-.I file1.c
-than when it is included by
-.I file2.c.
-But once
-.B makedepend
-arrives at a list of dependencies for a file,
-it is cast in concrete.
-.SH AUTHOR
-Todd Brunhoff, Tektronix, Inc. and MIT Project Athena
--- a/Xvnc/config/makedepend/parse.c
+++ /dev/null
@@ -1,647 +0,0 @@
-/* $XConsortium: parse.c /main/33 1996/12/04 10:11:28 swick $ */
-/*
-
-Copyright (c) 1993, 1994  X Consortium
-
-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, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-/* $XFree86: xc/config/makedepend/parse.c,v 1.3 1997/01/12 10:39:45 dawes Exp $ */
-
-#include "def.h"
-
-extern char	*directives[];
-extern struct inclist	maininclist;
-
-int
-gobble(filep, file, file_red)
-	register struct filepointer *filep;
-	struct inclist		*file, *file_red;
-{
-	register char	*line;
-	register int	type;
-
-	while (line = x_getline(filep)) {
-		switch(type = deftype(line, filep, file_red, file, FALSE)) {
-		case IF:
-		case IFFALSE:
-		case IFGUESSFALSE:
-		case IFDEF:
-		case IFNDEF:
-			type = gobble(filep, file, file_red);
-			while ((type == ELIF) || (type == ELIFFALSE) ||
-			       (type == ELIFGUESSFALSE))
-			    type = gobble(filep, file, file_red);
-			if (type == ELSE)
-			        (void)gobble(filep, file, file_red);
-			break;
-		case ELSE:
-		case ENDIF:
-			debug(0,("%s, line %d: #%s\n",
-				file->i_file, filep->f_line,
-				directives[type]));
-			return(type);
-		case DEFINE:
-		case UNDEF:
-		case INCLUDE:
-		case INCLUDEDOT:
-		case PRAGMA:
-		case ERROR:
-		case IDENT:
-		case SCCS:
-		case EJECT:
-		case WARNING:
-			break;
-		case ELIF:
-		case ELIFFALSE:
-		case ELIFGUESSFALSE:
-			return(type);
-		case -1:
-			warning("%s, line %d: unknown directive == \"%s\"\n",
-				file_red->i_file, filep->f_line, line);
-			break;
-		}
-	}
-	return(-1);
-}
-
-/*
- * Decide what type of # directive this line is.
- */
-int deftype (line, filep, file_red, file, parse_it)
-	register char	*line;
-	register struct filepointer *filep;
-	register struct inclist *file_red, *file;
-	int	parse_it;
-{
-	register char	*p;
-	char	*directive, savechar;
-	register int	ret;
-
-	/*
-	 * Parse the directive...
-	 */
-	directive=line+1;
-	while (*directive == ' ' || *directive == '\t')
-		directive++;
-
-	p = directive;
-	while (*p >= 'a' && *p <= 'z')
-		p++;
-	savechar = *p;
-	*p = '\0';
-	ret = match(directive, directives);
-	*p = savechar;
-
-	/* If we don't recognize this compiler directive or we happen to just
-	 * be gobbling up text while waiting for an #endif or #elif or #else
-	 * in the case of an #elif we must check the zero_value and return an
-	 * ELIF or an ELIFFALSE.
-	 */
-
-	if (ret == ELIF && !parse_it)
-	{
-	    while (*p == ' ' || *p == '\t')
-		p++;
-	    /*
-	     * parse an expression.
-	     */
-	    debug(0,("%s, line %d: #elif %s ",
-		   file->i_file, filep->f_line, p));
-	    ret = zero_value(p, filep, file_red);
-	    if (ret != IF)
-	    {
-		debug(0,("false...\n"));
-		if (ret == IFFALSE)
-		    return(ELIFFALSE);
-		else
-		    return(ELIFGUESSFALSE);
-	    }
-	    else
-	    {
-		debug(0,("true...\n"));
-		return(ELIF);
-	    }
-	}
-
-	if (ret < 0 || ! parse_it)
-		return(ret);
-
-	/*
-	 * now decide how to parse the directive, and do it.
-	 */
-	while (*p == ' ' || *p == '\t')
-		p++;
-	switch (ret) {
-	case IF:
-		/*
-		 * parse an expression.
-		 */
-		ret = zero_value(p, filep, file_red);
-		debug(0,("%s, line %d: %s #if %s\n",
-			 file->i_file, filep->f_line, ret?"false":"true", p));
-		break;
-	case IFDEF:
-	case IFNDEF:
-		debug(0,("%s, line %d: #%s %s\n",
-			file->i_file, filep->f_line, directives[ret], p));
-	case UNDEF:
-		/*
-		 * separate the name of a single symbol.
-		 */
-		while (isalnum(*p) || *p == '_')
-			*line++ = *p++;
-		*line = '\0';
-		break;
-	case INCLUDE:
-		debug(2,("%s, line %d: #include %s\n",
-			file->i_file, filep->f_line, p));
-
-		/* Support ANSI macro substitution */
-		{
-		    struct symtab **sym = isdefined(p, file_red, NULL);
-		    while (sym) {
-			p = (*sym)->s_value;
-			debug(3,("%s : #includes SYMBOL %s = %s\n",
-			       file->i_incstring,
-			       (*sym) -> s_name,
-			       (*sym) -> s_value));
-			/* mark file as having included a 'soft include' */
-			file->i_flags |= INCLUDED_SYM; 
-			sym = isdefined(p, file_red, NULL);
-		    }
-		}
-
-		/*
-		 * Separate the name of the include file.
-		 */
-		while (*p && *p != '"' && *p != '<')
-			p++;
-		if (! *p)
-			return(-2);
-		if (*p++ == '"') {
-			ret = INCLUDEDOT;
-			while (*p && *p != '"')
-				*line++ = *p++;
-		} else
-			while (*p && *p != '>')
-				*line++ = *p++;
-		*line = '\0';
-		break;
-	case DEFINE:
-		/*
-		 * copy the definition back to the beginning of the line.
-		 */
-		strcpy (line, p);
-		break;
-	case ELSE:
-	case ENDIF:
-	case ELIF:
-	case PRAGMA:
-	case ERROR:
-	case IDENT:
-	case SCCS:
-	case EJECT:
-	case WARNING:
-		debug(0,("%s, line %d: #%s\n",
-			file->i_file, filep->f_line, directives[ret]));
-		/*
-		 * nothing to do.
-		 */
-		break;
-	}
-	return(ret);
-}
-
-struct symtab **fdefined(symbol, file, srcfile)
-	register char	*symbol;
-	struct inclist	*file;
-	struct inclist	**srcfile;
-{
-	register struct inclist	**ip;
-	register struct symtab	**val;
-	register int	i;
-	static int	recurse_lvl = 0;
-
-	if (file->i_flags & DEFCHECKED)
-		return(NULL);
-	file->i_flags |= DEFCHECKED;
-	if (val = slookup(symbol, file))
-		debug(1,("%s defined in %s as %s\n",
-			 symbol, file->i_file, (*val)->s_value));
-	if (val == NULL && file->i_list)
-		{
-		for (ip = file->i_list, i=0; i < file->i_listlen; i++, ip++)
-			if (file->i_merged[i]==FALSE) {
-				val = fdefined(symbol, *ip, srcfile);
-				if ((*ip)->i_flags & FINISHED) {
-					merge2defines(file,*ip);
-					file->i_merged[i]=TRUE;
-				    }
-				if (val!=NULL) break;
-			}
-		}
-	else if (val != NULL && srcfile != NULL) *srcfile = file;
-	recurse_lvl--;
-	file->i_flags &= ~DEFCHECKED;
-
-	return(val);
-}
-
-struct symtab **isdefined(symbol, file, srcfile)
-	register char	*symbol;
-	struct inclist	*file;
-	struct inclist	**srcfile;
-{
-	register struct symtab	**val;
-
-	if (val = slookup(symbol, &maininclist)) {
-		debug(1,("%s defined on command line\n", symbol));
-		if (srcfile != NULL) *srcfile = &maininclist;
-		return(val);
-	}
-	if (val = fdefined(symbol, file, srcfile))
-		return(val);
-	debug(1,("%s not defined in %s\n", symbol, file->i_file));
-	return(NULL);
-}
-
-/*
- * Return type based on if the #if expression evaluates to 0
- */
-int
-zero_value(exp, filep, file_red)
-	register char	*exp;
-	register struct filepointer *filep;
-	register struct inclist *file_red;
-{
-	if (cppsetup(exp, filep, file_red))
-	    return(IFFALSE);
-	else
-	    return(IF);
-}
-
-void
-define2(name, val, file)
-	char	*name, *val;
-	struct inclist	*file;
-{
-    int first, last, below;
-    register struct symtab **sp = NULL, **dest;
-    struct symtab *stab;
-
-    /* Make space if it's needed */
-    if (file->i_defs == NULL)
-    {
-	file->i_defs = (struct symtab **)
-			malloc(sizeof (struct symtab*) * SYMTABINC);
-	file->i_ndefs = 0;
-    }
-    else if (!(file->i_ndefs % SYMTABINC))
-	file->i_defs = (struct symtab **)
-			realloc(file->i_defs,
-			   sizeof(struct symtab*)*(file->i_ndefs+SYMTABINC));
-
-    if (file->i_defs == NULL)
-	fatalerr("malloc()/realloc() failure in insert_defn()\n");
-
-    below = first = 0;
-    last = file->i_ndefs - 1;
-    while (last >= first)
-    {
-	/* Fast inline binary search */
-	register char *s1;
-	register char *s2;
-	register int middle = (first + last) / 2;
-
-	/* Fast inline strchr() */
-	s1 = name;
-	s2 = file->i_defs[middle]->s_name;
-	while (*s1++ == *s2++)
-	    if (s2[-1] == '\0') break;
-
-	/* If exact match, set sp and break */
-	if (*--s1 == *--s2) 
-	{
-	    sp = file->i_defs + middle;
-	    break;
-	}
-
-	/* If name > i_defs[middle] ... */
-	if (*s1 > *s2) 
-	{
-	    below = first;
-	    first = middle + 1;
-	}
-	/* else ... */
-	else
-	{
-	    below = last = middle - 1;
-	}
-    }
-
-    /* Search is done.  If we found an exact match to the symbol name,
-       just replace its s_value */
-    if (sp != NULL)
-    {
-	free((*sp)->s_value);
-	(*sp)->s_value = copy(val);
-	return;
-    }
-
-    sp = file->i_defs + file->i_ndefs++;
-    dest = file->i_defs + below + 1;
-    while (sp > dest)
-    {
-	*sp = sp[-1];
-	sp--;
-    }
-    stab = (struct symtab *) malloc(sizeof (struct symtab));
-    if (stab == NULL)
-	fatalerr("malloc()/realloc() failure in insert_defn()\n");
-
-    stab->s_name = copy(name);
-    stab->s_value = copy(val);
-    *sp = stab;
-}
-
-void
-define(def, file)
-	char	*def;
-	struct inclist	*file;
-{
-    char *val;
-
-    /* Separate symbol name and its value */
-    val = def;
-    while (isalnum(*val) || *val == '_')
-	val++;
-    if (*val)
-	*val++ = '\0';
-    while (*val == ' ' || *val == '\t')
-	val++;
-
-    if (!*val)
-	val = "1";
-    define2(def, val, file);
-}
-
-struct symtab **slookup(symbol, file)
-	register char	*symbol;
-	register struct inclist	*file;
-{
-	register int first = 0;
-	register int last = file->i_ndefs - 1;
-
-	if (file) while (last >= first)
-	{
-	    /* Fast inline binary search */
-	    register char *s1;
-	    register char *s2;
-	    register int middle = (first + last) / 2;
-
-	    /* Fast inline strchr() */
-	    s1 = symbol;
-	    s2 = file->i_defs[middle]->s_name;
-	    while (*s1++ == *s2++)
-	        if (s2[-1] == '\0') break;
-
-	    /* If exact match, we're done */
-	    if (*--s1 == *--s2) 
-	    {
-	        return file->i_defs + middle;
-	    }
-
-	    /* If symbol > i_defs[middle] ... */
-	    if (*s1 > *s2) 
-	    {
-	        first = middle + 1;
-	    }
-	    /* else ... */
-	    else
-	    {
-	        last = middle - 1;
-	    }
-	}
-	return(NULL);
-}
-
-int merge2defines(file1, file2)
-	struct inclist	*file1;
-	struct inclist	*file2;
-{
-	if ((file1!=NULL) && (file2!=NULL)) 
-        {
-		int first1 = 0;
-		int last1 = file1->i_ndefs - 1;
-
-		int first2 = 0;
-		int last2 = file2->i_ndefs - 1;
-
-                int first=0;
-                struct symtab** i_defs = NULL;
-		int deflen=file1->i_ndefs+file2->i_ndefs;
-
-                if (deflen>0)
-                { 
-                	/* make sure deflen % SYMTABINC == 0 is still true */
-                	deflen += (SYMTABINC - deflen % SYMTABINC) % SYMTABINC;
-                	i_defs=(struct symtab**)
-			    malloc(deflen*sizeof(struct symtab*));
-                	if (i_defs==NULL) return 0;
-        	}
-
-        	while ((last1 >= first1) && (last2 >= first2))
-        	{
-	    		char *s1=file1->i_defs[first1]->s_name;
-	    		char *s2=file2->i_defs[first2]->s_name;
-
-     			if (strcmp(s1,s2) < 0)
-                        	i_defs[first++]=file1->i_defs[first1++];
-     			else if (strcmp(s1,s2) > 0)
-                        	i_defs[first++]=file2->i_defs[first2++];
-                        else /* equal */
-                        {
-                        	i_defs[first++]=file2->i_defs[first2++];
-                                first1++;
-                        }
-        	}
-        	while (last1 >= first1)
-        	{
-                        i_defs[first++]=file1->i_defs[first1++];
-        	}
-        	while (last2 >= first2)
-        	{
-                        i_defs[first++]=file2->i_defs[first2++];
-        	}
-
-                if (file1->i_defs) free(file1->i_defs);
-                file1->i_defs=i_defs;
-                file1->i_ndefs=first;
-                
-		return 1;
-  	}
-	return 0;
-}
-
-void
-undefine(symbol, file)
-	char	*symbol;
-	register struct inclist	*file;
-{
-	register struct symtab **ptr;
-	struct inclist *srcfile;
-	while ((ptr = isdefined(symbol, file, &srcfile)) != NULL)
-	{
-	    srcfile->i_ndefs--;
-	    for (; ptr < srcfile->i_defs + srcfile->i_ndefs; ptr++)
-		*ptr = ptr[1];
-	}
-}
-
-int
-find_includes(filep, file, file_red, recursion, failOK)
-	struct filepointer	*filep;
-	struct inclist		*file, *file_red;
-	int			recursion;
-	boolean			failOK;
-{
-	register char	*line;
-	register int	type;
-	boolean recfailOK;
-
-	while (line = x_getline(filep)) {
-		switch(type = deftype(line, filep, file_red, file, TRUE)) {
-		case IF:
-		doif:
-			type = find_includes(filep, file,
-				file_red, recursion+1, failOK);
-			while ((type == ELIF) || (type == ELIFFALSE) ||
-			       (type == ELIFGUESSFALSE))
-				type = gobble(filep, file, file_red);
-			if (type == ELSE)
-				gobble(filep, file, file_red);
-			break;
-		case IFFALSE:
-		case IFGUESSFALSE:
-		    doiffalse:
-			if (type == IFGUESSFALSE || type == ELIFGUESSFALSE)
-			    recfailOK = TRUE;
-			else
-			    recfailOK = failOK;
-			type = gobble(filep, file, file_red);
-			if (type == ELSE)
-			    find_includes(filep, file,
-					  file_red, recursion+1, recfailOK);
-			else
-			if (type == ELIF)
-			    goto doif;
-			else
-			if ((type == ELIFFALSE) || (type == ELIFGUESSFALSE))
-			    goto doiffalse;
-			break;
-		case IFDEF:
-		case IFNDEF:
-			if ((type == IFDEF && isdefined(line, file_red, NULL))
-			 || (type == IFNDEF && !isdefined(line, file_red, NULL))) {
-				debug(1,(type == IFNDEF ?
-				    "line %d: %s !def'd in %s via %s%s\n" : "",
-				    filep->f_line, line,
-				    file->i_file, file_red->i_file, ": doit"));
-				type = find_includes(filep, file,
-					file_red, recursion+1, failOK);
-				while (type == ELIF || type == ELIFFALSE || type == ELIFGUESSFALSE)
-					type = gobble(filep, file, file_red);
-				if (type == ELSE)
-					gobble(filep, file, file_red);
-			}
-			else {
-				debug(1,(type == IFDEF ?
-				    "line %d: %s !def'd in %s via %s%s\n" : "",
-				    filep->f_line, line,
-				    file->i_file, file_red->i_file, ": gobble"));
-				type = gobble(filep, file, file_red);
-				if (type == ELSE)
-					find_includes(filep, file,
-						file_red, recursion+1, failOK);
-				else if (type == ELIF)
-				    	goto doif;
-				else if (type == ELIFFALSE || type == ELIFGUESSFALSE)
-				    	goto doiffalse;
-			}
-			break;
-		case ELSE:
-		case ELIFFALSE:
-		case ELIFGUESSFALSE:
-		case ELIF:
-			if (!recursion)
-				gobble(filep, file, file_red);
-		case ENDIF:
-			if (recursion)
-				return(type);
-		case DEFINE:
-			define(line, file);
-			break;
-		case UNDEF:
-			if (!*line) {
-			    warning("%s, line %d: incomplete undef == \"%s\"\n",
-				file_red->i_file, filep->f_line, line);
-			    break;
-			}
-			undefine(line, file_red);
-			break;
-		case INCLUDE:
-			add_include(filep, file, file_red, line, FALSE, failOK);
-			break;
-		case INCLUDEDOT:
-			add_include(filep, file, file_red, line, TRUE, failOK);
-			break;
-		case ERROR:
-		case WARNING:
-		    	warning("%s: %d: %s\n", file_red->i_file,
-				 filep->f_line, line);
-		    	break;
-		    
-		case PRAGMA:
-		case IDENT:
-		case SCCS:
-		case EJECT:
-			break;
-		case -1:
-			warning("%s", file_red->i_file);
-			if (file_red != file)
-			    warning1(" (reading %s)", file->i_file);
-			warning1(", line %d: unknown directive == \"%s\"\n",
-				 filep->f_line, line);
-			break;
-		case -2:
-			warning("%s", file_red->i_file);
-			if (file_red != file)
-			    warning1(" (reading %s)", file->i_file);
-			warning1(", line %d: incomplete include == \"%s\"\n",
-				 filep->f_line, line);
-			break;
-		}
-	}
-	file->i_flags |= FINISHED;
-	return(-1);
-}
--- a/Xvnc/config/makedepend/pr.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/* $XConsortium: pr.c /main/20 1996/12/04 10:11:41 swick $ */
-/*
-
-Copyright (c) 1993, 1994  X Consortium
-
-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, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-
-#include "def.h"
-
-extern struct	inclist	inclist[ MAXFILES ],
-			*inclistp;
-extern char	*objprefix;
-extern char	*objsuffix;
-extern int	width;
-extern boolean	printed;
-extern boolean	verbose;
-extern boolean	show_where_not;
-
-void
-add_include(filep, file, file_red, include, dot, failOK)
-	struct filepointer	*filep;
-	struct inclist	*file, *file_red;
-	char	*include;
-	boolean	dot;
-{
-	register struct inclist	*newfile;
-	register struct filepointer	*content;
-
-	/*
-	 * First decide what the pathname of this include file really is.
-	 */
-	newfile = inc_path(file->i_file, include, dot);
-	if (newfile == NULL) {
-		if (failOK)
-		    return;
-		if (file != file_red)
-			warning("%s (reading %s, line %d): ",
-				file_red->i_file, file->i_file, filep->f_line);
-		else
-			warning("%s, line %d: ", file->i_file, filep->f_line);
-		warning1("cannot find include file \"%s\"\n", include);
-		show_where_not = TRUE;
-		newfile = inc_path(file->i_file, include, dot);
-		show_where_not = FALSE;
-	}
-
-	if (newfile) {
-		included_by(file, newfile);
-		if (!(newfile->i_flags & SEARCHED)) {
-			newfile->i_flags |= SEARCHED;
-			content = getfile(newfile->i_file);
-			find_includes(content, newfile, file_red, 0, failOK);
-			freefile(content);
-		}
-	}
-}
-
-void
-pr(ip, file, base)
-	register struct inclist  *ip;
-	char	*file, *base;
-{
-	static char	*lastfile;
-	static int	current_len;
-	register int	len, i;
-	char	buf[ BUFSIZ ];
-
-	printed = TRUE;
-	len = strlen(ip->i_file)+1;
-	if (current_len + len > width || file != lastfile) {
-		lastfile = file;
-		sprintf(buf, "\n%s%s%s: %s", objprefix, base, objsuffix,
-			ip->i_file);
-		len = current_len = strlen(buf);
-	}
-	else {
-		buf[0] = ' ';
-		strcpy(buf+1, ip->i_file);
-		current_len += len;
-	}
-	fwrite(buf, len, 1, stdout);
-
-	/*
-	 * If verbose is set, then print out what this file includes.
-	 */
-	if (! verbose || ip->i_list == NULL || ip->i_flags & NOTIFIED)
-		return;
-	ip->i_flags |= NOTIFIED;
-	lastfile = NULL;
-	printf("\n# %s includes:", ip->i_file);
-	for (i=0; i<ip->i_listlen; i++)
-		printf("\n#\t%s", ip->i_list[ i ]->i_incstring);
-}
-
-void
-recursive_pr_include(head, file, base)
-	register struct inclist	*head;
-	register char	*file, *base;
-{
-	register int	i;
-
-	if (head->i_flags & MARKED)
-		return;
-	head->i_flags |= MARKED;
-	if (head->i_file != file)
-		pr(head, file, base);
-	for (i=0; i<head->i_listlen; i++)
-		recursive_pr_include(head->i_list[ i ], file, base);
-}
--- a/Xvnc/config/util/Imakefile
+++ /dev/null
@@ -1,101 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/16 1996/11/13 14:43:28 lehors $
-XCOMM $XFree86: xc/config/util/Imakefile,v 3.15 1996/12/23 05:56:12 dawes Exp $
-
-#if UseCCMakeDepend
-MDEP_PROG = makedepend
-#endif
-
-#ifdef ExportListGenSource
-EXPORTLISTGEN = exportlistgen
-#endif
-
-#ifdef Win32Architecture
-CMKDIRHIER = mkdirhier.exe
-#endif
-
-#ifndef OS2Architecture
-GCCMDEP_PROG = gccmakedep
-#endif
-
-PROGRAMS = xmkmf $(MDEP_PROG) $(GCCMDEP_PROG) mergelib ProgramTargetName(makestrs) $(EXPORTLISTGEN) $(CMKDIRHIER)
-DEPLIBS =
-#ifndef Win32Architecture
-  EXTRA_LIBRARIES =
-#endif
-
-XCOMM Some compilers generate fatal errors if an -L directory does
-XCOMM not exist.  Since BUILDLIBDIR may not exist yet suppress its use.
-         LDPRELIB =
-        LDPRELIBS =
-
-all:: $(PROGRAMS)
-
-#if HasGcc
-GCCCMD = $(CC)
-#else
-GCCCMD = gcc
-#endif
-
-includes:: ProgramTargetName(makestrs)
-
-#ifdef ExportListGenSource
-CppScriptTarget(exportlistgen,ExportListGenSource,-DCXXFILT=$(CXXFILT),)
-InstallNamedProg(exportlistgen,exportlistgen,$(BINDIR))
-#endif
-
-CppScriptTarget(xmkmf,xmkmf.cpp,-DCONFIGDIRSPEC='"'"-I$(CONFIGDIR)"'"',$(ICONFIGFILES))
-CppScriptTarget(makedepend,mdepend.cpp,-DPREPROC='"'"$(PREPROCESSCMD)"'"',$(ICONFIGFILES))
-CppScriptTarget(mergelib,mergelib.cpp,"-DARCMD=$(AR)" "-DRANLIB=$(RANLIB)",$(ICONFIGFILES))
-#ifndef OS2Architecture
-CppScriptTarget(gccmakedep,gccmdep.cpp,-DCCCMD='"'"$(GCCCMD)"'"' -DRMCMD='"'"$(RM)"'"' -DLNCMD='"'"$(LN)"'"' -DMVCMD='"'"$(MV)"'"',$(ICONFIGFILES))
-#endif
-
-#if HasSymLinks
-#if CrossCompiling
-SimpleHostProgramTarget(lndir)
-#else
-SimpleProgramTarget(lndir)
-#endif
-#endif
-
-#ifdef Win32Architecture
-SimpleProgramTarget(mkdirhier)
-#endif
-
-NormalProgramTarget(makestrs,makestrs.o,,,)
-
-InstallManPage(makestrs,$(MANDIR))
-
-InstallManPage(xmkmf,$(MANDIR))
-
-#if defined(OS2Architecture)
-includes:: makestrs.exe
-	ImakeHelper 7 makestrs.exe /makestrs.exe
-
-InstallNamedProg(mkdirhier.cmd,mkdirhier.cmd,$(BINDIR))
-InstallNamedProg(indir.cmd,indir.cmd,$(BINDIR))
-InstallNamedProg(os2inst.cmd,os2inst.cmd,$(BINDIR))
-InstallNamedProg(xmkmf.cmd,xmkmf.cmd,$(BINDIR))
-InstallNamedProg(xmake.cmd,make.cmd,$(BINDIR))
-InstallLinkKitNamedProg(mkdirhier.cmd,mkdirhier.cmd,$(LINKKITDIR)/config/util)
-InstallLinkKitNamedProg(indir.cmd,indir.cmd,$(LINKKITDIR)/config/util)
-InstallLinkKitNamedProg(os2inst.cmd,os2inst.cmd,$(LINKKITDIR)/config/util)
-#else
-InstallNamedProg(xmkmf,xmkmf,$(BINDIR))
-InstallNamedProg(mkdirhier.sh,mkdirhier,$(BINDIR))
-InstallNamedProg(gccmakedep,gccmakedep,$(BINDIR))
-InstallLinkKitNamedProg(mkdirhier.sh,mkdirhier.sh,$(LINKKITDIR)/config/util)
-InstallLinkKitNamedProg(gccmakedep,gccmakedep,$(LINKKITDIR)/config/util)
-InstallNamedProg(mergelib,mergelib,$(BINDIR))
-InstallNamedProg(makeg.sh,makeg,$(BINDIR))
-InstallManPage(makeg,$(MANDIR))
-#endif
-InstallManPage(mkdirhier,$(MANDIR))
-#if UseCCMakeDepend
-InstallNamedProg(makedepend,makedepend,$(BINDIR))
-InstallLinkKitNamedProg(makedepend,makedepend,$(LINKKITDIR)/config/util)
-#endif
-#if SystemV || SystemV4
-InstallNamedProg(bsdinst.sh,bsdinst,$(BINDIR))
-InstallLinkKitNamedProg(bsdinst.sh,bsdinst.sh,$(LINKKITDIR)/config/util)
-#endif
--- a/Xvnc/config/util/Makefile.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-# $XConsortium: Makefile.ini,v 1.2 94/04/17 14:55:28 gildea Exp $
-#
-# A way to get lndir built the first time, before you have imake up
-# and running.  You may well have to specify OSFLAGS=-D<something> to
-# get it to compile, which values are embedded in config files.  What
-# you would pass as BOOTSTRAPCFLAGS might work.
-
-OSFLAGS = 
-CC = cc
-CDEBUGFLAGS = -O
-INCLUDES = -I.
-CFLAGS = $(OSFLAGS) $(CDEBUGFLAGS) $(INCLUDES)
-SHELL = /bin/sh
-RM = rm -f
-LN = ln -s
-
-lndir:
-	$(LN) ../../include X11
-	$(CC) -o lndir $(CFLAGS) lndir.c
-	$(RM) X11
--- a/Xvnc/config/util/added.cmd
+++ /dev/null
@@ -1,23 +0,0 @@
-/* OS/2 REXX script to create nonexisting directories
- * run with 'added dirlist_file'
- * where dirlist_file is a XFree86 added-* file
- *
- * $XFree86: xc/config/util/added.cmd,v 3.0 1994/10/20 06:01:00 dawes Exp $
- */
-
-file = arg(1)
-linein(file,1,0)
-curdir = directory()
-do while lines(file)=1
-  fs = strip(filespec("path",linein(file)),'t','/')
-  newdir = directory(fs)
-  if newdir='' then do
-    say 'create directory='fs
-    call directory(curdir)
-    call 'xc\config\util\mkdirhier.cmd' fs
-  end 
-  else do
-    say 'found directory='newdir
-    call directory(curdir)
-  end
-end
--- a/Xvnc/config/util/aminstall.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-# $XConsortium: aminstall.sh,v 1.1 94/03/29 15:54:08 gildea Exp $
-# aminstall - transfer cross-compiled files to system running Amoeba.
-# Usage: aminstall binary-directory [-s stksz] unix-source amoeba-dest
-
-#
-# Default soap mask for files
-#
-SPMASK=0xFF:2:2
-export SPMASK
-PROG=$0
-USAGE="Usage: $PROG binary-directory unix-source amoeba-dest"
-
-#
-# Argument check
-#
-case $# in
-3|5)	;;
-*)	echo $USAGE >&2
-	exit 1
-	;;
-esac
-
-bindir=$1
-stksz=
-case $2 in
--s)	if [ $# -ne 5 ]
-	then
-	    echo $USAGE >&2
-	    exit 1
-	fi
-	stksz="-s $3"
-	shift
-	shift
-	;;
-esac
-
-unxfile=$2
-dest=$3
-
-#
-# Change /public .... into /super (just for installation)
-#
-stripped=`echo $dest | sed 's:^/public::'`
-if [ X$dest != X$stripped ]; then
-    dest=/super$stripped
-fi
-
-#
-# If the file already exists, then delete it
-#
-INFO=`$bindir/std_info $dest 2>&1`
-case $INFO in
-*"not found"*)	;;
-*failed*)	;;
-*bytes*)	$bindir/del -f $dest
-		;;
-/??????)	echo $PROG: cannot install over directory 1>&2
-		exit
-		;;
-*)		$bindir/del -d $dest
-		;;
-esac
-
-#
-# Transfer the file to Amoeba
-#
-$bindir/../bin.scripts/ainstall $stksz $unxfile $dest > /dev/null 2>&1
-if [ $? -ne 0 ]
-then
-	echo "This is not binary - using tob"
-	$bindir/tob $unxfile $dest
-fi
-
--- a/Xvnc/config/util/bsdinst.sh
+++ /dev/null
@@ -1,168 +0,0 @@
-#!/bin/sh
-
-# $XFree86: xc/config/util/bsdinst.sh,v 3.3 1996/12/23 05:56:13 dawes Exp $
-#
-# This accepts bsd-style install arguments and makes the appropriate calls
-# to the System V install.
-# $XConsortium: bsdinst.sh /main/8 1996/09/28 16:16:11 rws $
-
-flags=""
-dst=""
-src=""
-dostrip=""
-owner=""
-group=""
-mode=""
-bargs=$*
-
-while [ x$1 != x ]; do
-    case $1 in 
-	-c) shift
-	    continue;;
-
-	-m) flags="$flags $1 $2 "
-	    mode="$2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) flags="$flags -u $2 "
-	    owner="$2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) flags="$flags $1 $2 "
-	    group="$2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) dostrip="strip"
-	    shift
-	    continue;;
-
-	*)  if [ x$src = x ] 
-	    then
-		src=$1
-	    else
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x$src = x ] 
-then
-	echo "$0:  no input file specified"
-	exit 1
-fi
-
-if [ x$dst = x ] 
-then
-	echo "$0:  no destination specified"
-	exit 1
-fi
-
-if [ -x /usr/ucb/install ]
-then
-	if [ -d "$dst" ]
-	then
-		dst=$dst/`basename "$src"`
-	fi
-	case "$group" in
-	"")
-		bargs="-g other $bargs"
-		;;
-	esac
-	/usr/ucb/install $bargs
-	if [ x$dostrip = xstrip -a -x /usr/bin/mcs ]
-	then
-		/usr/bin/mcs -d $dst
-	fi
-	exit 0
-fi
-	
-case "$mode" in
-"")
-	;;
-*)
-	case "$owner" in
-	"")
-		flags="$flags -u root"
-		;;
-	esac
-	;;
-esac
-
-
-# set up some variable to be used later
-
-rmcmd=""
-srcdir="."
-
-# if the destination isn't a directory we'll need to copy it first
-
-if [ ! -d $dst ]
-then
-	dstbase=`basename $dst`
-	cp $src /tmp/$dstbase
-	rmcmd="rm -f /tmp/$dstbase"
-	src=$dstbase
-	srcdir=/tmp
-	dst="`echo $dst | sed 's,^\(.*\)/.*$,\1,'`"
-	if [ x$dst = x ]
-	then
-		dst="."
-	fi
-fi
-
-
-# If the src file has a directory, copy it to /tmp to make install happy
-
-srcbase=`basename $src`
-
-if [ "$src" != "$srcbase" ] && [ "$src" != "./$srcbase" ] 
-then
-	cp $src /tmp/$srcbase
-	src=$srcbase
-	srcdir=/tmp
-	rmcmd="rm -f /tmp/$srcbase"
-fi
-
-# do the actual install
-
-if [ -f /usr/sbin/install ]
-then
-	installcmd=/usr/sbin/install
-elif [ -f /etc/install ]
-then
-	installcmd=/etc/install
-else
-	installcmd=install
-fi
-
-# This rm is commented out because some people want to be able to
-# install through symbolic links.  Uncomment it if it offends you.
-# rm -f $dst/$srcbase
-(cd $srcdir ; $installcmd -f $dst $flags $src)
-
-if [ x$dostrip = xstrip ]
-then
-	strip $dst/$srcbase
-	if [ -x /usr/bin/mcs ]
-	then
-		/usr/bin/mcs -d $dst/$srcbase
-	fi
-fi
-
-if [ x$mode != x ]
-then
-	chmod $mode $dst/$srcbase
-fi
-
-# and clean up
-
-$rmcmd
-
--- a/Xvnc/config/util/buildos2.cmd
+++ /dev/null
@@ -1,110 +0,0 @@
-/* REXX */
-/* $XFree86: xc/config/util/buildos2.cmd,v 3.7.2.1 1997/05/12 12:52:09 hohndel Exp $
- * this file is supposed to run from the xc/ dir.
- * you must copy it manually to there before using. It is just here
- * in order not to be in the root dir.
- *
- * copy some essential files to a location where we find them again
- */
-'@echo off'
-env = 'OS2ENVIRONMENT'
-'copy config\util\indir.cmd \ > nul 2>&1'
-'copy config\util\mkdirhier.cmd \ > nul 2>&1'
-'copy config\imake\imakesvc.cmd \ > nul 2>&1'
-
-IF \ exists('config\cf\host.def') THEN
-    CALL LINEOUT 'config\cf\host.def',' '
-
-CALL create_makefile
-
-CALL VALUE 'GCCOPT','-pipe',env
-CALL VALUE 'EMXLOAD',5,env
-CALL VALUE 'MAKEFLAGS','--no-print-directory',env
-'emxload -e x11make.exe rm.exe mv.exe'
-'emxload -e -gcc -omf'
-
-'x11make MAKE=x11make SHELL= MFLAGS="MAKE=x11make CC=gcc BOOTSTRAPCFLAGS=-DBSD43 SHELL= " World.OS2 2>&1 | tee buildxc.log'
-
-EXIT
-
-/* returns 1, if file exists */
-exists:
-	IF STREAM(arg(1), 'C', 'QUERY EXISTS') = '' THEN
-		RETURN 0
-	ELSE
-		RETURN 1
-
-create_makefile:
-IF exists(Makefile) THEN del Makefile
-CALL LINEOUT 'Makefile','RELEASE = "Release 6.3"',1
-CALL LINEOUT 'Makefile','SHELL = /bin/sh'
-CALL LINEOUT 'Makefile','RM = rm -f'
-CALL LINEOUT 'Makefile','MV = mv'
-CALL LINEOUT 'Makefile','WORLDOPTS = -k'
-CALL LINEOUT 'Makefile','TOP = .'
-CALL LINEOUT 'Makefile','CURRENT_DIR = .'
-CALL LINEOUT 'Makefile','CONFIGSRC = $(TOP)/config'
-CALL LINEOUT 'Makefile','IMAKESRC = $(CONFIGSRC)/imake'
-CALL LINEOUT 'Makefile','DEPENDSRC = $(CONFIGSRC)/makedepend'
-CALL LINEOUT 'Makefile','DEPENDTOP = ../..'
-CALL LINEOUT 'Makefile','IMAKETOP = ../..'
-CALL LINEOUT 'Makefile','IRULESRC = $(CONFIGSRC)/cf'
-CALL LINEOUT 'Makefile','IMAKE = $(IMAKESRC)/imake'
-CALL LINEOUT 'Makefile','IMAKE_CMD = $(IMAKE) -I$(IRULESRC) $(IMAKE_DEFINES)'
-CALL LINEOUT 'Makefile','MAKE_OPTS = '
-CALL LINEOUT 'Makefile','MAKE_CMD = $(MAKE) $(MAKE_OPTS)'
-CALL LINEOUT 'Makefile','FLAGS = $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"'
-CALL LINEOUT 'Makefile',' '
-CALL LINEOUT 'Makefile','World.OS2:'
-CALL LINEOUT 'Makefile','	@echo :'
-CALL LINEOUT 'Makefile','	@echo Building $(RELEASE) of the X Window System on OS/2.'
-CALL LINEOUT 'Makefile','	@echo :'
-CALL LINEOUT 'Makefile','	@echo :'
-CALL LINEOUT 'Makefile','	\indir $(IMAKESRC) $(MAKE) SHELL= -f Makefile.ini clean.os2'
-CALL LINEOUT 'Makefile','	\indir $(IMAKESRC) $(MAKE) SHELL= CC=gcc -f Makefile.ini imake.os2'
-CALL LINEOUT 'Makefile','	-if exist Makefile.bak del Makefile.bak'
-CALL LINEOUT 'Makefile','	-if exist Makefile ren Makefile Makefile.bak'
-CALL LINEOUT 'Makefile','	$(subst /,\,$(IMAKE)) -I$(IRULESRC) $(IMAKE_DEFINES) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)'
-CALL LINEOUT 'Makefile','	$(MAKE) $(MFLAGS) VerifyOS'
-CALL LINEOUT 'Makefile','	$(MAKE) $(MFLAGS) Makefiles'
-CALL LINEOUT 'Makefile','	$(MAKE) $(MFLAGS) clean'
-CALL LINEOUT 'Makefile','	$(MAKE) $(MFLAGS) includes'
-CALL LINEOUT 'Makefile','	$(MAKE) $(MFLAGS) depend'
-CALL LINEOUT 'Makefile','	$(MAKE) $(MFLAGS)  '
-CALL LINEOUT 'Makefile','	@echo :'
-CALL LINEOUT 'Makefile','	@echo :'
-CALL LINEOUT 'Makefile','	@echo Full build of $(RELEASE) of the X Window System complete.'
-CALL LINEOUT 'Makefile','	@echo :'
-CALL LINEOUT 'Makefile',' '
-CALL LINEOUT 'Makefile','# dont allow any default rules in this Makefile'
-CALL LINEOUT 'Makefile','.SUFFIXES:'
-CALL LINEOUT 'Makefile','# quiet "make" programs that display a message if suffix list empty'
-CALL LINEOUT 'Makefile','.SUFFIXES: .Dummy'
-CALL LINEOUT 'Makefile',' '
-CALL LINEOUT 'Makefile','# a copy of every rule that might be invoked at top level'
-CALL LINEOUT 'Makefile',' '
-CALL LINEOUT 'Makefile','clean:'
-CALL LINEOUT 'Makefile','	    $(MAKE_CMD) $@'
-CALL LINEOUT 'Makefile','dangerous_strip_clean:'
-CALL LINEOUT 'Makefile','	    $(MAKE_CMD) $@'
-CALL LINEOUT 'Makefile','depend:'
-CALL LINEOUT 'Makefile','	    $(MAKE_CMD) $@'
-CALL LINEOUT 'Makefile','Everything:'
-CALL LINEOUT 'Makefile','	    $(MAKE_CMD) $@'
-CALL LINEOUT 'Makefile','includes:'
-CALL LINEOUT 'Makefile','	    $(MAKE_CMD) $@'
-CALL LINEOUT 'Makefile','install.man:'
-CALL LINEOUT 'Makefile','	    $(MAKE_CMD) $@'
-CALL LINEOUT 'Makefile','install:'
-CALL LINEOUT 'Makefile','	    $(MAKE_CMD) $@'
-CALL LINEOUT 'Makefile','Makefiles:'
-CALL LINEOUT 'Makefile','	    $(MAKE_CMD) $@'
-CALL LINEOUT 'Makefile','man_keywords:'
-CALL LINEOUT 'Makefile','	    $(MAKE_CMD) $@'
-CALL LINEOUT 'Makefile','tags:'
-CALL LINEOUT 'Makefile','	    $(MAKE_CMD) $@'
-CALL LINEOUT 'Makefile','VerifyOS:'
-CALL LINEOUT 'Makefile','	    $(MAKE_CMD) $@'
-CALL LINEOUT 'Makefile',' '
-CALL STREAM 'Makefile','c','close'
-RETURN
--- a/Xvnc/config/util/checktree.c
+++ /dev/null
@@ -1,343 +0,0 @@
-/* $XConsortium: checktree.c,v 1.7 94/04/17 20:10:40 gildea Exp $ */
-
-/*
-
-Copyright (c) 1993  X Consortium
-
-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, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-*/
-
-#include <X11/Xos.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <errno.h>
-
-#ifndef X_NOT_POSIX
-#include <dirent.h>
-#else
-#ifdef SYSV
-#include <dirent.h>
-#else
-#ifdef USG
-#include <dirent.h>
-#else
-#include <sys/dir.h>
-#ifndef dirent
-#define dirent direct
-#endif
-#endif
-#endif
-#endif
-
-#ifdef S_IFLNK
-#define Stat lstat
-#else
-#define Stat stat
-#endif
-
-#define CHARSALLOWED \
-"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_."
-
-#define fmode_bits_minset 0444
-#define fmode_bits_maxset 0777
-#define fmode_bits_write  0222
-#define dmode_bits_minset 0775
-
-#ifdef X_NOT_STDC_ENV
-extern int errno;
-#endif
-
-int dorcs = 1;			/* check RCS file */
-int do83 = 1;			/* check for 8+3 clash */
-int doro = 1;			/* disallow writable (checked out) files */
-int dodot = 1;			/* disallow .files */
-int dotwiddle = 1;		/* disallow file~ */
-
-int dontcare(fn)
-    char *fn;
-{
-    char *cp;
-
-    if (fn[strlen(fn) - 1] == '~')
-	return 1;
-    cp = strrchr(fn, '.');
-    return cp && (!strcmp(cp + 1, "Z") || !strcmp(cp + 1, "PS"));
-}
-
-checkfile(fullname, fn, fs)
-    char *fullname, *fn;
-    struct stat *fs;
-{
-    char *cp;
-    int maxlen = 12;
-    int len, mode;
-
-    if (dodot && fn[0] == '.') {
-	printf("dot file: %s\n", fullname);
-	return;
-    }
-    for (len = 0, cp = fn; *cp; len++, cp++) {
-	if (!strchr(CHARSALLOWED, *cp)) {
-	    if (dotwiddle || *cp != '~' || cp[1])
-		printf ("bad character: %s\n", fullname);
-	    break;
-	}
-    }
-    if (len > maxlen && !dontcare(fn))
-	printf("too long (%d): %s\n", len, fullname);
-#ifdef S_IFLNK
-    if ((fs->st_mode & S_IFLNK) == S_IFLNK) {
-	printf("symbolic link: %s\n", fullname);
-	return;
-    }
-#endif
-    mode = fs->st_mode & (~S_IFMT);
-    if ((fs->st_mode & S_IFDIR) == S_IFDIR) {
-	maxlen = 14;
-	if ((mode & dmode_bits_minset) != dmode_bits_minset)
-	    printf("directory mode 0%o not minimum 0%o: %s\n",
-		   mode, dmode_bits_minset, fullname);
-    } else if ((fs->st_mode & S_IFREG) != S_IFREG)
-	printf("not a regular file: %s\n", fullname);
-    else {
-	if ((mode & fmode_bits_minset) != fmode_bits_minset)
-	    printf("file mode 0%o not minimum 0%o: %s\n",
-		   fs->st_mode, fmode_bits_minset, fullname);
-	if (fs->st_nlink != 1)
-	    printf("%d links instead of 1: %s\n", fs->st_nlink, fullname);
-	if (doro && (mode & fmode_bits_write) && !dontcare(fn))
-	    printf("writable: %s\n", fullname);
-    }
-    if ((mode & ~fmode_bits_maxset) != 0)
-	printf("mode 0%o outside maximum set 0%o: %s\n",
-	       mode, fmode_bits_maxset, fullname);
-}
-
-void
-checkrcs(dir, p)
-    char *dir;
-    char *p;
-{
-    DIR *df;
-    struct dirent *dp;
-    struct stat fs;
-    int i;
-
-    if (!(df = opendir(dir))) {
-	fprintf(stderr, "cannot open: %s\n", dir);
-	return;
-    }
-    while (dp = readdir(df)) {
-	i = strlen(dp->d_name);
-	if (dp->d_name[i - 1] == 'v' && dp->d_name[i - 2] == ',') {
-	    strcpy(p, dp->d_name);
-	    p[i - 2] = '\0';
-	    if (Stat(dir, &fs) < 0) {
-		strcpy(p, "RCS/");
-		strcat(p, dp->d_name);
-		printf("not used: %s\n", dir);
-	    }
-	}
-    }
-    closedir(df);
-}
-
-int
-Strncmp(cp1, cp2, n)
-    char *cp1, *cp2;
-    int n;
-{
-    char c1, c2;
-
-    for (; --n >= 0 && *cp1 && *cp2; cp1++, cp2++) {
-	if (*cp1 != *cp2) {
-	    c1 = *cp1;
-	    c2 = *cp2;
-	    if (c1 >= 'A' && c1 <= 'Z')
-		c1 += 'a' - 'A';
-	    else if (c1 == '-')
-		c1 = '_';
-	    if (c2 >= 'A' && c2 <= 'Z')
-		c2 += 'a' - 'A';
-	    else if (c2 == '-')
-		c2 = '_';
-	    if (c1 != c2)
-		return (int)c1 - (int)c2;
-	}
-    }
-    if (n < 0)
-	return 0;
-    return (int)*cp1 - (int)*cp2;
-}
-
-int
-fncomp(n1, n2)
-    char **n1, **n2;
-{
-    int i, res;
-    char *cp1, *cp2;
-    char c1, c2;
-
-    i = Strncmp(*n1, *n2, 8);
-    if (!i) {
-	cp1 = strrchr(*n1, '.');
-	cp2 = strrchr(*n2, '.');
-	if (cp1 || cp2) {
-	    if (!cp1)
-		return -1;
-	    if (!cp2)
-		return 1;
-	    i = Strncmp(cp1 + 1, cp2 + 1, 3);
-	}
-    }
-    return i;
-}
-
-void
-checkdir(dir)
-    char *dir;
-{
-    DIR *df;
-    struct dirent *dp;
-    char *p;
-    struct stat fs;
-    char *s, **names;
-    int i, max;
-
-    if (!(df = opendir(dir))) {
-	fprintf(stderr, "cannot open: %s\n", dir);
-	return;
-    }
-    p = dir + strlen(dir);
-    if (p[-1] != '/')
-	*p++ = '/';
-    i = 0;
-    max = 0;
-    names = NULL;
-    while (dp = readdir(df)) {
-	strcpy(p, dp->d_name);
-	if (Stat(dir, &fs) < 0) {
-	    perror(dir);
-	    continue;
-	}
-	if ((fs.st_mode & S_IFDIR) == S_IFDIR) {
-	    if (dp->d_name[0] == '.' &&
-		(dp->d_name[1] == '\0' || (dp->d_name[1] == '.' &&
-					   dp->d_name[2] == '\0')))
-		continue;
-	    if (!strcmp (dp->d_name, "RCS")) {
-		if (dorcs)
-		    checkrcs(dir, p);
-		continue;
-	    }
-	    if (!strcmp (dp->d_name, "SCCS"))
-		continue;
-	    if (!strcmp (dp->d_name, "CVS.adm"))
-		continue;
-	    checkfile(dir, p, &fs);
-	    checkdir(dir);
-	    continue;
-	}
-	checkfile(dir, p, &fs);
-	if (dorcs && !dontcare(dp->d_name)) {
-	    strcpy(p, "RCS/");
-	    strcat(p, dp->d_name);
-	    strcat(p, ",v");
-	    if (Stat(dir, &fs) < 0) {
-		strcpy(p, dp->d_name);
-		printf("no RCS: %s\n", dir);
-	    }
-	}
-	if (do83) {
-	    s = (char *)malloc(strlen(dp->d_name) + 1);
-	    strcpy(s, dp->d_name);
-	    if (i >= max) {
-		max += 25;
-		if (names)
-		    names = (char **)realloc((char *)names,
-					     (max + 1) * sizeof(char *));
-		else
-		    names = (char **)malloc((max + 1) * sizeof(char *));
-	    }
-	    names[i++] = s;
-	}
-    }
-    closedir(df);
-    if (do83) {
-	qsort((char *)names, i, sizeof(char *), fncomp);
-	max = i - 1;
-	*p = '\0';
-	for (i = 0; i < max; i++) {
-	    if (!fncomp(&names[i], &names[i + 1]))
-		printf("8+3 clash: %s%s and %s\n",
-		       dir, names[i], names[i + 1]);
-	    free(names[i]);
-	}
-	if (names) {
-	    free(names[i]);
-	    free((char *)names);
-	}
-    }
-}
-
-main(argc, argv)
-    int argc;
-    char **argv;
-{
-    char buf[2048];
-
-    argc--;
-    argv++;
-    while (argc > 0) {
-	if (!strcmp(*argv, "-rcs")) {
-	    dorcs = 0;
-	    argc--;
-	    argv++;
-	} else if (!strcmp(*argv, "-83")) {
-	    do83 = 0;
-	    argc--;
-	    argv++;
-	} else if (!strcmp(*argv, "-ro")) {
-	    doro = 0;
-	    argc--;
-	    argv++;
-	} else if (!strcmp(*argv, "-dot")) {
-	    dodot = 0;
-	    argc--;
-	    argv++;
-	} else if (!strcmp(*argv, "-twiddle")) {
-	    dotwiddle = 0;
-	    argc--;
-	    argv++;
-	} else
-	    break;
-    }
-    if (!argc) {
-	strcpy(buf, ".");
-	checkdir(buf);
-    } else
-	while (--argc >= 0) {
-	    strcpy(buf, *argv++);
-	    checkdir(buf);
-	}
-}
--- a/Xvnc/config/util/chownxterm.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* $XConsortium: chownxterm.c,v 1.3 94/04/17 20:10:41 gildea Exp $ */
-/*
-
-Copyright (c) 1993, 1994  X Consortium
-
-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, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-
-/*
- * chownxterm --- make xterm suid root
- *
- * By Stephen Gildea, December 1993
- */
-
-
-#define XTERM_PATH "/x11/programs/xterm/xterm"
-
-#include <stdio.h>
-#include <errno.h>
-
-char *prog_name;
-
-void help()
-{
-    setgid(getgid());
-    setuid(getuid());
-    printf("chown-xterm makes %s suid root\n", XTERM_PATH);
-    printf("This is necessary on Ultrix for /dev/tty operation.\n");
-    exit(0);
-}
-
-void print_error(err_string)
-    char *err_string;
-{
-    setgid(getgid());
-    setuid(getuid());
-    fprintf(stderr, "%s: \"%s\"", prog_name, err_string);
-    perror(" failed");
-    exit(1);
-}
-
-main(argc, argv)
-    int argc;
-    char **argv;
-{
-    prog_name = argv[0];
-    if (argc >= 2 && strcmp(argv[1], "-help") == 0) {
-	help();
-    } else {
-	if (chown(XTERM_PATH, 0, -1) != 0)
-	    print_error("chown root " XTERM_PATH);
-	if (chmod(XTERM_PATH, 04555) != 0)
-	    print_error("chmod 4555 " XTERM_PATH);
-    }
-    exit(0);
-}
--- a/Xvnc/config/util/crayar.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-lib=$1
-shift
-if cray2; then
-        bld cr $lib `lorder $* | tsort`
-else
-        ar clq $lib $*
-fi
-
--- a/Xvnc/config/util/elistgen.hp
+++ /dev/null
@@ -1,202 +0,0 @@
-XCOMM!/bin/sh
-XCOMM $XConsortium: elistgen.hp /main/2 1996/12/04 10:13:14 swick $
-XCOMM
-XCOMM #########################################################################
-XCOMM Construct shared-library export lists for HP-UX based on standardized
-XCOMM export list description file
-XCOMM
-XCOMM Usage: exportlistgen libfoo.sl libfoo.elist > libfoo.lopt
-XCOMM
-XCOMM	libfoo.sl    => shared library of interest
-XCOMM	libfoo.elist => Meta description of necessary export list.
-XCOMM
-XCOMM The output may then be passed to the linker to reconstruct the
-XCOMM shared library.  For unknown reasons naming only exported symbols
-XCOMM with "+e" does not work for debuggable C++ code, even though "nm"
-XCOMM reports no difference between the resulting libraries.  The linker
-XCOMM complains that "first non-inline virtual function" is not defined for
-XCOMM vtables.  We instead hide internal symbols with "-h" as a work-around.
-XCOMM
-XCOMM Author: Aloke Gupta 5/25/94.
-XCOMM (c) Copyright 1996 Digital Equipment Corporation.
-XCOMM (c) Copyright 1994,1996 Hewlett-Packard Company.
-XCOMM (c) Copyright 1996 International Business Machines Corp.
-XCOMM (c) Copyright 1996 Sun Microsystems, Inc.
-XCOMM (c) Copyright 1996 Novell, Inc.
-XCOMM (c) Copyright 1996 FUJITSU LIMITED.
-XCOMM (c) Copyright 1996 Hitachi.
-XCOMM
-XCOMM #########################################################################
-
-XCOMM Utility programs
-FILTER=CXXFILT			# C++ symbol demangler
-AWK=awk				# awk
-PATH=/usr/bin:/bin:/usr/ucb	# For nm, cat, pr, expand, awk, c++filt
-
-XCOMM Temporary files
-EXPORTLIST=/tmp/elistgen1.$$	# list of export symbols from "libfoo.elist"
-NMLIST=/tmp/elistgen2.$$	# name list from libfoo.sl
-FILTLIST=/tmp/elistgen3.$$	# demangled (C++) version of NMLIST
-
-XCOMM Print useful information at the top of the output
-echo "#" `date`
-echo "# This linker options list was produced by" $0
-echo "# Input export list description taken from:" $2
-echo "# Target library:" $1
-echo "# Target Operating System:" `uname -msrv`
-echo "# "
-
-XCOMM Extract the globally visible symbols from target library
-XCOMM The NMLIST generated here is later used to cross-check the symbols in the
-XCOMM supplied export-list.
-XCOMM
-nm -p $1 | $AWK '
-    / [cCTDB][S ] [^\$]/{print $3}   # Text, Data, BSS, or Secondary symbols
-' > $NMLIST
-
-XCOMM Demangle the global library symbols. This operation is necessary to
-XCOMM convert mangled C++ symbols into their C++ notation.
-${FILTER:-cat} $NMLIST > $FILTLIST
-
-XCOMM
-XCOMM Cleanup the export-list description file.
-XCOMM Note that C++ symbols may have embedded spaces in them.
-XCOMM
-cat $2 | $AWK '
-    BEGIN           {
-	csyms      = 0;		# C   language symbols in libfoo.list
-	cplusplus  = 0;		# C++ language symbols in libfoo.list
-	isyms      = 0;		# C   internal symbols in libfoo.elist
-	icplusplus = 0;		# C++ internal symbols in libfoo.elist
-	implicit = "";		# Handling of implicit symbols.
-    }
-    $1 == "default" {
-	# A default clause suppresses warnings about implicit symbols.
-	if ($2 != "" && $2 != "force" && $2 != "public" && 
-	    $2 != "private" && $2 != "internal") {
-	    print "# Warning: illegal default clause:", $2 | "cat 1>&2";
-	    next;
-	}
-	if (implicit != "")
-	    print "# Warning: multiple default clauses." | "cat 1>&2";
-        implicit = $2;
-	next;
-    }
-    $1 == "force" || $1 == "public" || $1 == "private" {
-	csyms ++;
-	print $1 ";;" $2;
-	next;
-    }
-    $1 == "publicC++" || $1 == "privateC++" {
-	cplusplus ++;
-	string = $2;
-	for (n = 3; n <= NF; n++)
-	    string = string " " $n;
-	print $1 ";;" string;
-	next;
-    }
-    $1 == "internal" {
-	isyms ++;
-	print $1 ";;" $2;
-	next;
-    }
-    $1 == "internalC++" {
-	icplusplus ++;
-	string = $2;
-	for (n = 3; n <= NF; n++)
-	    string = string " " $n;
-	print $1 ";;" string;
-	next;
-    }
-    END  {
-	printf("# Exporting %d C and %d C++ symbols, hiding %d and %d.\n",
-		csyms, cplusplus, isyms, icplusplus) | "cat 1>&2";
-	if (implicit != "") {
-	    print "# Unspecified symbols are " implicit "." | "cat 1>&2";
-	    print "default;;" implicit;
-	}
-    }
-' > $EXPORTLIST
-
-XCOMM Read in the above files and write result to stdout.  The contents
-XCOMM of NMLIST and FILTLIST are used to construct a symbol lookup table.
-XCOMM The contents of EXPORTLIST are converted with the help of this table.
-XCOMM Use ";" as a delimiter in the symbol lookup table.
-XCOMM
-(pr -m -s";" -t -w1024 $NMLIST $FILTLIST| expand -t 1;cat $EXPORTLIST ) | $AWK '
-    BEGIN {
-	FS = ";";
-	implicit = 0;
-    }
-    NF == 2 {
-	# This is "pr" output, i.e., symbol translation table.
-	syms[$2] = $1;
-	next;
-    }
-    NF == 3 && $1 == "default" {
-	# Treatment of unspecified symbols.
-	if ($3 == "internal" || $3 == "internalC++")
-	    implicit = 1;
-	else if ($3 == "private" || $3 == "privateC++")
-	    implicit = 2;
-	else if ($3 == "public" || $3 == "publicC++")
-	    implicit = 3;
-	else # $3 == "force"
-	    implicit = 4;
-        next;
-    }
-    NF == 3 {
-	# Parse our instructions for this symbol.
-	if ($1 == "internal" || $1 == "internalC++")
-	    export = 1;
-	else if ($1 == "private" || $1 == "privateC++")
-	    export = 2;
-	else if ($1 == "public" || $1 == "publicC++")
-	    export = 3;
-	else # $1 == "force"
-	    export = 4;
-
-	# Process it.
-	if (length(syms[$3]) > 0) {
-	    if (donelist[$3])
-		print "# Warning: Duplicate entry for", $3,
-			"in export list" | "cat 1>&2";
-	    if (donelist[$3] < export)
-		donelist[$3] = export;
-	} else {
-	    if (export == 4)
-		donelist[$3] = export;
-	    else
-		print "# Warning:", $3,
-		    "was not in the nm list for this library" | "cat 1>&2";
-	}
-	next;
-    }
-    END {
-	# Force implicit exporting of errno.
-	if (! donelist["errno"])
-	    donelist["errno"] = 4;
-
-	# Complain about some implicit symbols.
-	for (i in syms) {
-	    if (!donelist[i] && (length(syms[i]) > 0)) {
-		# Ignore automatic symbols generated by the C++ compiler.
-		if (implicit == 0 && 
-		    (syms[i] !~ /^__noperfopt__/) &&
-		    (syms[i] !~ /^__ptbl_vec__/) &&
-		    (syms[i] !~ /^__vtbl__[0-9]*_/) &&
-		    (syms[i] !~ /^__cfront_version_[0-9]*_xxxxxxxx$/))
-		    print "# Warning:", syms[i],
-			  "was not in the export list" | "cat 1>&2";
-		donelist[i] = implicit;
-	    }
-	    if ((donelist[i] > 1) && (length(syms[i]) > 0))
-		print "-e", syms[i];
-	}
-    }
-'
-
-XCOMM Clean up temporary files
-rm $EXPORTLIST
-rm $NMLIST
-rm $FILTLIST
--- a/Xvnc/config/util/elistgen.ibm
+++ /dev/null
@@ -1,220 +0,0 @@
-XCOMM!/bin/sh
-XCOMM $XConsortium: elistgen.ibm /main/2 1996/12/04 10:13:18 swick $
-XCOMM
-XCOMM #########################################################################
-XCOMM Construct shared-library export lists for IBM-AIX based on standardized
-XCOMM export list description file
-XCOMM
-XCOMM Usage: elistgen libfoo.sl libfoo.elist > libfoo.lopt
-XCOMM
-XCOMM	libfoo.a     => shared library of interest
-XCOMM	libfoo.elist => Meta description of necessary export list.
-XCOMM
-XCOMM    The output file, "libfoo.lopt" may then be passed to the IBM linker to 
-XCOMM    reconstruct the shared library, libfoo.sl.
-XCOMM
-XCOMM Author: Yanling Qi 10/03/94, Last updated 10/03/94
-XCOMM (c) Copyright 1996 Digital Equipment Corporation.
-XCOMM (c) Copyright 1996 Hewlett-Packard Company.
-XCOMM (c) Copyright 1994,1996 International Business Machines Corp.
-XCOMM (c) Copyright 1996 Sun Microsystems, Inc.
-XCOMM (c) Copyright 1996 Novell, Inc. 
-XCOMM (c) Copyright 1996 FUJITSU LIMITED.
-XCOMM (c) Copyright 1996 Hitachi.
-XCOMM
-XCOMM #########################################################################
-
-#define HASH #
-
-XCOMM Utility programs
-FILTER=CXXFILT			# C++ symbol demangler
-AWK=awk				# awk
-
-XCOMM For dump, cat, pr, expand, awk, c++filt
-PATH=/usr/bin:/bin:/usr/ucb:/usr/lpp/xlC/bin
-
-XCOMM Temporary files
-EXPORTLIST=/tmp/elistgen1.$$	# export directives from "libfoo.list"
-NMLIST=/tmp/elistgen2.$$	# name list from libfoo.sl
-FILTLIST=/tmp/elistgen3.$$	# demangled (C++) version of above
-
-XCOMM Print useful information
-echo "*" `date`
-echo "* This linker options list was produced by" $0
-echo "* Input export list description taken from:" $2
-echo "* Target library:" $1
-echo "* Target Operating System:" `uname`
-echo "*"
-
-XCOMM Extract the globally visible symbols from target library
-dump -g $1 | $AWK  '$1 ~ /[0-9][0-9]/ && $2 !~ /^[\.]/ {print $2}' > $NMLIST
-
-XCOMM Demangle the global library symbols
-${FILTER:-cat} $NMLIST > $FILTLIST
-
-XCOMM
-XCOMM Clean up the export-list description file.
-XCOMM Note that C++ symbols may have embedded spaces in them.
-XCOMM
-$AWK '
-    BEGIN {
-	csyms     = 0;		# C   language symbols in libfoo.list
-	cplusplus = 0;		# C++ language symbols in libfoo.list
-	isyms     = 0;		# C   internal symbols in libfoo.list
-	iplusplus = 0;		# C++ internal symbols in libfoo.list
-	count     = 0;		# Running count of symbols
-	implicit  = "";		# Handling of implicit symbols.
-    }
-    $1 == "default" {
-	HASH A default clause suppresses warnings about implicit symbols.
-	if ($2 != "" && $2 != "force" && $2 != "public" && 
-	    $2 != "private" && $2 != "internal") {
-	    print "# Warning: illegal default clause:", $2 | "cat 1>&2";
-	    next;
-	}
-	if (implicit != "")
-	    print "# Warning: multiple default clauses." | "cat 1>&2";
-        implicit = $2;
-	next;
-    }
-    $1 == "force" || $1 == "public" || $1 == "private" {
-	csyms ++;
-	symbol[count++] = $1 ";;" $2;
-	next;
-    }
-    $1 == "publicC++" || $1 == "privateC++" {
-	HASH forceC++ is unsupported because we only know how to demangle,
-	HASH not how to mangle symbols, and the final ld input file must
-	HASH be mangled.
-	cplusplus ++;
-	string = $2;
-	for (n = 3; n <= NF; n++)
-	    string = string " " $n;
-	symbol[count++] = $1 ";;" string;
-	next;
-    }
-    $1 == "internal" {
-	isyms ++;
-	symbol[count++] = $1 ";;" $2;
-	next;
-    }
-    $1 == "internalC++" {
-	iplusplus ++;
-	string = ";;" $2;
-	for (n = 3; n <= NF; n++)
-	    string = string " " $n;
-	symbol[count++] = $1 ";;" string;
-	next;
-    }
-    $1 == "#line" || $1 == "#" {
-	HASH cpp will have removed comments, but may have added other stuff.
-	next;
-    }
-    NF > 0 {
-	print "# Warning: unrecognized directive:", $0 | "cat 1>&2";
-	next;
-    }
-    END  {
-	printf("# Exporting %d C and %d C++ symbols, hiding %d and %d.\n",
-	       csyms, cplusplus, isyms, iplusplus) | "cat 1>&2";
-	if (implicit != "") {
-	    print "# Unspecified symbols are " implicit "." | "cat 1>&2";
-	    print "default;;" implicit;
-	}
-	for (i in symbol)
-	    print symbol[i];
-    }
-' $2 > $EXPORTLIST
-
-XCOMM
-XCOMM Read in the above files and write result to stdout.  Use the
-XCOMM delimiter ";" to identify the entries in the symbol lookup table.
-XCOMM
-(pr -m -s";" -t -w1024 $NMLIST $FILTLIST | expand -t 1; cat $EXPORTLIST) | $AWK '
-    BEGIN {
-	FS = ";";
-	implicit = 0;
-    }
-    NF == 2 {
-	HASH This is "pr" output, i.e., symbol translation table
-	r2=$2
-	gsub(/ /,"",r2);       # Remove spaces because c++filt is unpredictable
-	syms[r2] = $1;
-	r1=$1;
-	gsub(/ /,"",r1);
-	mangled[r1] = 1;       # Save the mangling because the export lists
-			       HASH sometimes use it instead of a prototype.
-	next;
-    }
-    NF == 3 && $1 == "default" {
-	HASH Treatment of unspecified symbols.
-	if ($3 == "internal")
-	    implicit = 1;
-	else if ($3 == "private" || $3 == "privateC++")
-	    implicit = 2;
-	else if ($3 == "public" || $3 == "publicC++")
-	    implicit = 3;
-	else # $3 == "force"
-	    implicit = 4;
-        next;
-    }
-    NF == 3 {
-	HASH Generate canonical demangled form as an alternate symbol.
-	alt=$3;
-	gsub(/ \.\.\./,",...",alt); # change " ..." to ",..." to match c++filt
-	gsub(/ /,"",alt);	    # remove all spaces
-	gsub(/\(void\)/,"()",alt);  # change "(void)" to "()" to match c++filt
-
-	HASH Parse our instructions for this symbol.
-	if ($1 == "internal" || $1 == "internalC++")
-	    export = 1;
-	else if ($1 == "private" || $1 == "privateC++")
-	    export = 2;
-	else if ($1 == "public" || $1 == "publicC++")
-	    export = 3;
-	else # $1 == "force"
-	    export = 4;
-
-	HASH Process it.
-	if ((length(syms[alt]) > 0) || mangled[alt]) {
-	    HASH This symbol is present in the library.
-	    if (donelist[alt])
-		print "# Warning: Duplicate entry for", $3, 
-		    "in export list" | "cat 1>&2";
-	    if (donelist[alt] < export) {
-		if (export > 1)
-		    print syms[alt];
-		donelist[alt] = export;
-	    }
-	} else { 
-	    HASH Print forced-export symbols without complaining.
-	    if (export == 4) {
-		print alt;
-		donelist[alt] = export;
-	    } else {
-		print "# Warning:", $3,
-		    "was not in the nm list for this library" | "cat 1>&2";
-	    }
-	}
-
-	next;
-    }
-    END { 
-	HASH Process implicit symbols.
-	for (i in syms) {
-	    if ((! donelist[i]) && (length(syms[i]) > 0)) {
-		HASH Do not complain about C++ virtual function tables.
-		if (implicit == 0 && syms[i] !~ /^__vft[0-9]*_/)
-		    print "# Warning:", syms[i],
-			"was not in the export list" | "cat 1>&2";
-		if (implicit > 1)
-		    print syms[i];
-	    }
-	}
-    }
-'
-
-XCOMM Clean up temporary files
-rm $EXPORTLIST
-rm $NMLIST
-rm $FILTLIST
--- a/Xvnc/config/util/elistgen.sun
+++ /dev/null
@@ -1,243 +0,0 @@
-XCOMM!/bin/sh -f
-XCOMM $XConsortium: exportlistgen.sun /main/3 1996/10/11 13:54:11 swick $
-XCOMM
-XCOMM ########################################################################
-XCOMM Construct shared-library scoping mapfile for Solaris based on standardized
-XCOMM export list description file
-XCOMM
-XCOMM Usage: exportlistgen libfoo.so libfoo.elist > mapfile.scope
-XCOMM
-XCOMM	libfoo.so    => shared library of interest
-XCOMM	libfoo.elist => Meta description of necessary export list.
-XCOMM
-XCOMM    The output file, "mapfile.scope" may then be passed to the Solaris 
-XCOMM    linker to reconstruct the shared library, libfoo.so.
-XCOMM
-XCOMM ########################################################################
-
-XCOMM Utility programs
-FILTER=CXXFILT			# C++ symbol demangler
-AWK=awk				# Awk
-
-XCOMM For nm, cat, pr, expand, awk, c++filt
-PATH=/usr/bin:/bin:/usr/ccs/bin:/usr/ucb:/opt/SUNWspro/bin
-
-XCOMM Try to detect broken versions of c++filt.
-if [ `echo _okay | ${FILTER:-cat}` != "_okay" ]; then
-    if [ -x /opt/SUNWspro/bin/c++filt ]; then
-	echo "# Your $FILTER is broken -- using /opt/SUNWspro/bin/c++filt."
-	FILTER=/opt/SUNWspro/bin/c++filt
-    else
-	echo "# ERROR: no working $FILTER available."
-	exit 1
-    fi;
-fi;
-
-XCOMM Temporary files
-EXPORTLIST=/tmp/elistgen1.$$	# export directives from "libfoo.list"
-NMLIST=/tmp/elistgen2.$$	# name list from libfoo.sl
-FILTLIST=/tmp/elistgen3.$$	# demangled (C++) version of above
-
-XCOMM Print useful information at the top of the output
-echo "#" `date`
-echo "# This scoping mapfile was produced by" $0
-echo "# Export list description taken from:" $2
-echo "# Target library:" $1
-echo "# Target Operating System:" `uname -msrv`
-echo "# "
-
-XCOMM Extract the globally visible symbols from target library
-XCOMM The NMLIST generated here is later used to cross-check the symbols in the
-nm -p $1 | $AWK '/ [ TDBS] /{print $3}' > $NMLIST
-
-XCOMM Extract the globally visible symbols from target library
-XCOMM The NMLIST generated here is later used to cross-check the symbols in the
-${FILTER:-cat} $NMLIST > $FILTLIST
-
-XCOMM Clean up the export-list description file.  Sort the directives.
-$AWK '
-    BEGIN {
-	csyms     = 0;	# C   public symbols in libfoo.list
-	cplusplus = 0;	# C++ public symbols in libfoo.list
-	isyms     = 0;	# C   internal symbols in libfoo.list
-	iplusplus = 0;	# C++ internal symbols in libfoo.list
-	implicit  = "";	# Handling of implicit symbols
-    }
-    $1 == "default" {
-	# A default clause suppresses warnings about implicit symbols.
-	if ($2 != "" && $2 != "force" && $2 != "public" && $2 != "private" && $2 != "internal") {
-	    print "# Warning: illegal default clause:", $2 | "cat 1>&2";
-	    next;
-	}
-	if (implicit != "")
-	    print "# Warning: multiple default clauses." | "cat 1>&2";
-	implicit = $2;
-	next;
-    }
-    $1 == "force" {
-	csyms ++;
-	print $1 ";;" $2;
-	next;
-    }
-    $1 == "public" {
-	csyms ++;
-	print $1 ";;" $2;
-	next;
-    }
-    $1 == "publicC++" {
-	cplusplus ++;
-	string = $2;
-	for (n = 3; n <= NF; n++)
-	    string = string " " $n;
-	print $1 ";;" string;
-	next;
-    }
-    $1 == "private" {
-	csyms ++;
-	print $1 ";;" $2;
-	next;
-    }
-    $1 == "privateC++" {
-	cplusplus ++;
-	string = $2;
-	for (n = 3; n <= NF; n++)
-	    string = string " " $n;
-	print $1 ";;" string;
-	next;
-    }
-    $1 == "internal" {
-	isyms ++;
-	print $1 ";;" $2;
-	next;
-    }
-    $1 == "internalC++" {
-	iplusplus ++;
-	string = $2;
-	for (n = 3; n <= NF; n++)
-	    string = string " " $n;
-	print $1 ";;" string;
-	next;
-    }
-    $1 == "#line" || $1 == "#" {
-	# cpp will have removed comments, but may have added other stuff.
-	next;
-    }
-    NF > 0 {
-	print "# Warning: unrecognized directive:", $0 | "cat 1>&2";
-	next;
-    }
-    END {
-	printf("# Exporting %d C and %d C++ symbols, hiding %d and %d.\n", csyms, cplusplus, isyms, iplusplus) | "cat 1>&2";
-	if (implicit != "") {
-	    print "# Unspecified symbols are " implicit "." | "cat 1>&2";
-	    print "default;;" implicit;
-	}
-    }
-' $2 1>$EXPORTLIST
-
-
-XCOMM Read in the above files and write result to stdout.  The contents
-XCOMM of NMLIST and FILTLIST are used to construct a symbol lookup table.
-XCOMM The contents of EXPORTLIST are converted with the help of this table.
-XCOMM Use ";" as a delimiter in the symbol lookup table.
-(pr -m -s";" -t -w1024 $NMLIST $FILTLIST | expand -1; cat $EXPORTLIST) | $AWK '
-    BEGIN {
-	FS = ";";
-	implicit = 0;
-    }
-    NF == 2 {
-	# This is "pr" output, i.e., symbol translation table
-	syms[$2] = $1;
-	next;
-    }
-    NF == 3 && $1 == "default" {
-	# Treatment of unspecified symbols.
-	if ($3 == "internal" || $3 == "internalC++")
-	    implicit = 1;
-	else if ($3 == "private" || $3 == "privateC++")
-	    implicit = 2;
-	else if ($3 == "public" || $3 == "publicC++")
-	    implicit = 3;
-	else # $3 == "force"
-	    implicit = 4;
-	next;
-    }
-    NF == 3 {
-	# An export directive.  Parse our instructions for this symbol.
-	if ($1 == "internal" || $1 == "internalC++")
-	    export = 1;
-	else if ($3 == "private" || $3 == "privateC++")
-	    export = 2;
-	else if ($3 == "public" || $3 == "publicC++")
-	    export = 3;
-	else # $3 == "force"
-	    export = 4;
-
-	if (length(syms[$3]) > 0) {
-	    if (donelist[$3])
-		print "# Warning: Duplicate entry for", $3, "in export list" | "cat 1>&2";
-	    if (donelist[$3] < export)
-		donelist[$3] = export;
-	} else { 
-	    if (export == 4)
-		donelist[$3] = export;
-	    else
-		print "# Warning:", $3, "was not in the nm list for this library" | "cat 1>&2";
-	}
-	next;
-    }
-    END { 
-	# Ignore magic linker symbols.
-	if (implicit == 0) {
-	    if (!donelist["_DYNAMIC"])
-		donelist["_DYNAMIC"] = 1;
-	    if (!donelist["_GLOBAL_OFFSET_TABLE_"])
-		donelist["_GLOBAL_OFFSET_TABLE_"] = 1;
-	    if (!donelist["_PROCEDURE_LINKAGE_TABLE_"])
-		donelist["_PROCEDURE_LINKAGE_TABLE_"] = 1;
-	    if (!donelist["_edata"])
-		donelist["_edata"] = 1;
-	    if (!donelist["_end"])
-		donelist["_end"] = 1;
-	    if (!donelist["_etext"])
-		donelist["_etext"] = 1;
-        }
-
-	# Process implicit symbols.
-	for (i in syms) {
-	    if (donelist[i] == 0 && length(syms[i]) > 0) {
-		if (implicit == 0) {
-		    # Ignore magic symbols introduced by the C++ compiler.
-		    if ((syms[i] !~ /^__vtbl__[0-9]*_/) && (syms[i] !~ /^__ptbl_vec__/))
-			print "# Warning:", syms[i], "was not in the export list" | "cat 1>&2";
-		} else {
-		    donelist[i] = implicit;
-		}
-	    }
-	}
-
-	# Generate the linker file.
-	print "";
-	print "SUNW.1.1 {";
-	print "    global:";
-	for (i in syms)
-	    if (donelist[i] >= 2 && length(syms[i]) > 0)
-		print "        " syms[i] ";";
-	print "    local:";
-	print "        *;";
-	print "};";
-
-	print "";
-	print "SUNW_private.1.1 {";
-	print "    global:";
-	for (i in syms)
-	    if (donelist[i] == 1 && length(syms[i]) > 0)
-		print "        " syms[i] ";";
-	print "} SUNW.1.1;"
-    }
-'
-
-XCOMM Clean up temporary files
-rm $EXPORTLIST
-rm $NMLIST
-rm $FILTLIST
--- a/Xvnc/config/util/elistgen.usl
+++ /dev/null
@@ -1,219 +0,0 @@
-XCOMM!/bin/sh
-XCOMM $XConsortium: elistgen.usl /main/2 1996/12/04 10:13:26 swick $
-XCOMM
-XCOMM #########################################################################
-XCOMM Construct shared-library export lists for Novell based on standardized
-XCOMM export list description file
-XCOMM
-XCOMM Usage: exportlistgen libFoo.so libFoo.elist > libFoo.lopt
-XCOMM
-XCOMM	libFoo.so    => shared library of interest
-XCOMM	libFoo.elist => Meta description of necessary export list.
-XCOMM
-XCOMM    The output file, "libFoo.lopt" may then be passed to the linker to 
-XCOMM    reconstruct the shared library.
-XCOMM
-XCOMM (c) Copyright 1996 Digital Equipment Corporation.
-XCOMM (c) Copyright 1996 Hewlett-Packard Company.
-XCOMM (c) Copyright 1996 International Business Machines Corp.
-XCOMM (c) Copyright 1996 Sun Microsystems, Inc.
-XCOMM (c) Copyright 1996 Novell, Inc. 
-XCOMM (c) Copyright 1996 FUJITSU LIMITED.
-XCOMM (c) Copyright 1996 Hitachi.
-XCOMM
-XCOMM #########################################################################
-
-XCOMM Utility programs
-FILTER=CXXFILT			# C++ symbol demangler
-AWK=awk				# awk
-
-XCOMM For nm, cat, pr, expand, awk, c++filt
-PATH=/usr/bin:/bin:/usr/ucb:/usr/ccs/bin
-
-XCOMM Temporary files
-EXPORTLIST=/tmp/elistgen1.$$	# list of export symbols from "libfoo.elist"
-NMLIST=/tmp/elistgen2.$$	# name list from libfoo.sl
-FILTLIST=/tmp/elistgen3.$$	# demangled (C++) version of NMLIST
-
-XCOMM Print useful information at the top of the output
-echo "#" `date`
-echo "# This linker options list was produced by" $0
-echo "# Input export list description taken from:" $2
-echo "# Target library:" $1
-echo "# Target Operating System:" `uname -msrv`
-echo "# "
-
-XCOMM Extract the globally visible symbols from target library.
-XCOMM The NMLIST generated here is later used to cross-check the symbols in the
-XCOMM supplied export-list.
-nm -p $1 | $AWK '
-    / [TD] [^\$]/{print $3}   # Text, Data, BSS, or Secondary symbols
-' > $NMLIST
-
-XCOMM Demangle the global library symbols. This operation is necessary to convert
-XCOMM mangled C++ symbols into their C++ notation.
-${FILTER:-cat} $NMLIST > $FILTLIST
-
-XCOMM Clean up the export-list description file.
-XCOMM Note that C++ symbols may have embedded spaces in them.
-cat $2 | $AWK '
-    BEGIN           {
-	csyms     = 0;		# C   language symbols in libfoo.list
-	cplusplus = 0;		# C++ language symbols in libfoo.list
-	isyms     = 0;		# C   internal symbols in libfoo.elist
-	iplusplus = 0;		# C++ internal symbols in libfoo.elist
-	implicit  = "";		# Handling of implicit symbols
-    }
-    $1 == "default" {
-	# A default clause suppresses warnings about implicit symbols.
-	if ($2 != "" && $2 != "force" && $2 != "public" && 
-	    $2 != "private" && $2 != "internal") {
-	    print "# Warning: illegal default clause:", $2 | "cat 1>&2";
-	    next;
-	}
-	if (implicit != "")
-	    print "# Warning: multiple default clauses." | "cat 1>&2";
-        implicit = $2;
-	next;
-    }
-    $1 == "force" || $1 == "public" || $1 == "private" {
-	csyms ++;
-	print $1 ";;" $2;
-	next;
-    }
-    $1 == "publicC++" || $1 == "privateC++" {
-	cplusplus ++;
-	string = $2;
-	for (n = 3; n <= NF; n++) {
-	    string = string " " $n;
-	}
-	print $1 ";;" string;
-	next;
-    }
-    $1 == "internal" {
-	isyms ++;
-	print $1 ";;" $2;
-	next;
-    }
-    $1 == "internalC++" {
-	iplusplus ++;
-	string = $2;
-	for (n = 3; n <= NF; n++) {
-	    string = string " " $n;
-	}
-	print $1 ";;" string;
-	next;
-    }
-    $1 == "#line" || $1 == "#" {
-	# cpp will have removed comments, but may have added other stuff.
-	next;
-    }
-    NF > 0 {
-	print "# Warning: unrecognized directive:", $0 | "cat 1>&2";
-	next;
-    }
-    END  {
-	printf("# Exporting %d C and %d C++ symbols, hiding %d and %d.\n",
-			    csyms, cplusplus, isyms, iplusplus) | "cat 1>&2";
-	if (implicit != "") {
-	    print "# Unspecified symbols are " implicit "." | "cat 1>&2";
-	    print "default;;" implicit;
-	}
-    }
-' > $EXPORTLIST
-
-XCOMM Read in the above files and write result to stdout.  The contents
-XCOMM of NMLIST and FILTLIST are used to construct a symbol lookup table.
-XCOMM The contents of EXPORTLIST are converted with the help of this table.
-XCOMM Use ";" as a delimiter in the symbol lookup table.
-(pr -m -s";" -t -w1024 $NMLIST $FILTLIST | expand -1; cat $EXPORTLIST) | $AWK '
-    BEGIN {
-	FS = ";";
-	implicit = 0;
-    }
-    NF == 2 {
-	# This is "pr" output, i.e., symbol translation table
-	syms[$2] = $1;
-	next;
-    }
-    NF == 3 && $1 == "default" {
-	# Treatment of unspecified symbols.
-	if ($3 == "internal")
-	    implicit = 1;
-	else if ($3 == "private" || $3 == "privateC++")
-	    implicit = 2;
-	else if ($3 == "public" || $3 == "publicC++")
-	    implicit = 3;
-	else # $3 == "force"
-	    implicit = 4;
-        next;
-    }
-    NF == 3 {
-	# Parse our instructions for this symbol.
-	if ($1 == "internal" || $1 == "internalC++")
-	    export = 1;
-	else if ($1 == "private" || $1 == "privateC++")
-	    export = 2;
-	else if ($1 == "public" || $1 == "publicC++")
-	    export = 3;
-	else # $1 == "force"
-	    export = 4;
-
-	# Process it.
-	if (length(syms[$3]) > 0) {
-	    # This symbol is present in the library.
-	    if (donelist[$3])
-		print "# Warning: Duplicate entry for", $3, 
-		    "in export list" | "cat 1>&2";
-	    if (donelist[$3] < export) {
-		if (export > 1)
-		    print syms[$3];
-		donelist[$3] = export;
-	    }
-	} else { 
-	    # Do not complain about unknown forced-export symbols.
-	    if (export == 4) {
-		print $3;
-		donelist[$3] = export;
-	    } else
-		print "# Warning:", $3,
-		    "was not in the nm list for this library" | "cat 1>&2";
-	}
-
-	next;
-    }
-    END { 
-	# Ignore built-in linker symbols.
-	if (implicit == 0) {
-	    if (!donelist["_DYNAMIC"])
-		donelist["_DYNAMIC"] = 1;
-	    if (!donelist["_GLOBAL_OFFSET_TABLE_"])
-		donelist["_GLOBAL_OFFSET_TABLE_"] = 1;
-	    if (!donelist["_edata"])
-		donelist["_edata"] = 1;
-	    if (!donelist["_end"])
-		donelist["_end"] = 1;
-	    if (!donelist["_etext"])
-		donelist["_etext"] = 1;
-	}
-
-	# Process implicit symbols.
-	for (i in syms) {
-	    if (!donelist[i] && (length(syms[i]) > 0)) {
-		# Ignore C++ compiler symbols
-		if (implicit == 0 &&
-		    (syms[i] !~ /^__vtbl__[0-9]*_/) &&
-		    (syms[i] !~ /^__cpp_unixware_[0-9]*$/))
-		    print "# Warning:", syms[i],
-		          "was not in the export list" | "cat 1>&2";
-	        if (implicit > 1)
-		    print syms[i];
-	    }
-	}
-    }
-'
-
-XCOMM Clean up temporary files
-rm $EXPORTLIST
-rm $NMLIST
-rm $FILTLIST
--- a/Xvnc/config/util/gccmdep.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-XCOMM!/bin/sh
-
-XCOMM
-XCOMM makedepend which uses 'gcc -M'
-XCOMM
-XCOMM $XFree86: xc/config/util/gccmdep.cpp,v 3.3 1996/02/25 01:16:15 dawes Exp $
-XCOMM
-XCOMM Based on mdepend.cpp and code supplied by Hongjiu Lu <hjl@nynexst.com>
-XCOMM
-
-TMP=/tmp/mdep$$
-CC=CCCMD
-RM=RMCMD
-LN=LNCMD
-MV=MVCMD
-
-trap "$RM ${TMP}*; exit 1" 1 2 15
-trap "$RM ${TMP}*; exit 0" 1 2 13
-
-files=
-makefile=
-endmarker=
-magic_string='# DO NOT DELETE'
-append=n
-args=
-asmfiles=
-
-while [ $# != 0 ]; do
-    if [ "$endmarker"x != x -a "$endmarker" = "$1" ]; then
-	endmarker=
-    else
-	case "$1" in
-	    -D*|-I*)
-		args="$args '$1'"
-		;;
-	    -g|-o)
-		;;
-	    *)
-		if [ "$endmarker"x = x ]; then
-		    case $1 in
-XCOMM ignore these flags
-			-w|-o|-cc)
-			    shift
-			    ;;
-			-v)
-			    ;;
-			-s)
-			    magic_string="$2"
-			    shift
-			    ;;
-			-f-)
-			    makefile="-"
-			    ;;
-			-f)
-			    makefile="$2"
-			    shift
-			    ;;
-			--*)
-			    endmarker=`echo $1 | sed 's/^\-\-//'`
-			    if [ "$endmarker"x = x ]; then
-				endmarker="--"
-			    fi
-			    ;;
-			-a)
-			    append=y
-			    ;;
-			-*)
-			    echo "Unknown option '$1' ignored" 1>&2
-			    ;;
-			*)
-			    files="$files $1"
-			    ;;
-		    esac
-		fi
-		;;
-	esac
-    fi
-    shift
-done
-
-if [ x"$files" = x ]; then
-XCOMM Nothing to do
-    exit 0
-fi
-
-case "$makefile" in
-    '')
-	if [ -r makefile ]; then
-	    makefile=makefile
-	elif [ -r Makefile ]; then
-	    makefile=Makefile
-	else
-	    echo 'no makefile or Makefile found' 1>&2
-	    exit 1
-	fi
-	;;
-esac
-
-if [ X"$makefile" != X- ]; then
-    if [ x"$append" = xn ]; then
-        sed -e "/^$magic_string/,\$d" < $makefile > $TMP
-        echo "$magic_string" >> $TMP
-    else
-        cp $makefile $TMP
-    fi
-fi
-
-XCOMM need to link .s files to .S
-for i in $files; do
-    case $i in
-	*.s)
-	    dir=`dirname $i`
-	    base=`basename $i .s`
-	    (cd $dir; $RM ${base}.S; $LN ${base}.s ${base}.S)
-	    asmfiles="$asmfiles ${base}.S"
-	    ;;
-    esac
-done
-
-CMD="$CC -M $args `echo $files | sed -e 's,\.s$,\.S,g' -e 's,\.s ,\.S ,g'` | \
-	sed -e 's,\.S$,\.s,g' -e 's,\.S ,\.s ,g'"
-if [ X"$makefile" != X- ]; then
-    CMD="$CMD >> $TMP"
-fi
-eval $CMD
-if [ X"$makefile" != X- ]; then
-    $RM ${makefile}.bak
-    $MV $makefile ${makefile}.bak
-    $MV $TMP $makefile
-fi
-
-if [ x"$asmfiles" != x ]; then
-    $RM $asmfiles
-fi
-$RM ${TMP}*
-exit 0
--- a/Xvnc/config/util/indir.cmd
+++ /dev/null
@@ -1,23 +0,0 @@
-/* OS/2 rexx script to emulate the "cd dir; command" mechanism in make
- * which does not work with stupid CMD.EXE
- *
- * $XFree86: xc/config/util/indir.cmd,v 3.1 1996/01/24 21:56:12 dawes Exp $
- */
-curdir = directory()
-line = fixbadprefix(arg(1))
-new = directory(word(line,1))
-subword(line,2)
-old = directory(curdir)
-exit
-
-/* somehow make or cmd manages to convert a relative path ..\..\. to ..... */
-fixbadprefix:
-count = 1
-str = ARG(1)
-DO WHILE SUBSTR(str,count,2) = '..'
-   count = count+1
-   str = INSERT('\',str,count)
-   count = count+2
-END
-RETURN str
-
--- a/Xvnc/config/util/install.sh
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-
-#
-# install - install a program, script, or datafile
-#
-# $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-#
-
-
-# set DOITPROG to echo to test this script
-
-doit="${DOITPROG:-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG:-mv}"
-cpprog="${CPPROG:-cp}"
-chmodprog="${CHMODPROG:-chmod}"
-chownprog="${CHOWNPROG:-chown}"
-chgrpprog="${CHGRPPROG:-chgrp}"
-stripprog="${STRIPPROG:-strip}"
-rmprog="${RMPROG:-rm}"
-
-instcmd="$mvprog"
-chmodcmd=""
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-src=""
-dst=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:  no input file specified"
-	exit 1
-fi
-
-if [ x"$dst" = x ]
-then
-	echo "install:  no destination specified"
-	exit 1
-fi
-
-
-# if destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-if [ -d $dst ]
-then
-	dst="$dst"/`basename $src`
-fi
-
-
-# get rid of the old one and mode the new one in
-
-$doit $rmcmd $dst
-$doit $instcmd $src $dst
-
-
-# and set any options; do chmod last to preserve setuid bits
-
-if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; fi
-if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; fi
-if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; fi
-if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; fi
-
-exit 0
--- a/Xvnc/config/util/instos2.cmd
+++ /dev/null
@@ -1,13 +0,0 @@
-@echo off
-rem $XFree86: xc/config/util/instos2.cmd,v 3.0 1996/01/24 21:56:14 dawes Exp $
-rem this file is supposed to run from the xc/ dir.
-rem you must copy it manually to there before using. It is just here
-rem in order not to be in the root dir.
-rem
-set GCCOPT=-pipe
-set EMXLOAD=5
-emxload make.exe gcc.exe rm.exe mv.exe
-make SHELL= MFLAGS="CC=gcc" install 2>&1 | tee instxc.log
-rem
-rem
-echo INSTALL OF XFREE86/OS2 IS FINISHED
--- a/Xvnc/config/util/lndir.c
+++ /dev/null
@@ -1,357 +0,0 @@
-/* $XConsortium: lndir.c /main/16 1996/09/28 16:16:40 rws $ */
-/* $XFree86: xc/config/util/lndir.c,v 3.6 1997/01/18 06:51:01 dawes Exp $ */
-/* Create shadow link tree (after X11R4 script of the same name)
-   Mark Reinhold (mbr@lcs.mit.edu)/3 January 1990 */
-
-/* 
-Copyright (c) 1990,  X Consortium
-
-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, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-
-/* From the original /bin/sh script:
-
-  Used to create a copy of the a directory tree that has links for all
-  non-directories (except those named RCS, SCCS or CVS.adm).  If you are
-  building the distribution on more than one machine, you should use
-  this technique.
-
-  If your master sources are located in /usr/local/src/X and you would like
-  your link tree to be in /usr/local/src/new-X, do the following:
-
-   	%  mkdir /usr/local/src/new-X
-	%  cd /usr/local/src/new-X
-   	%  lndir ../X
-*/
-
-#include <X11/Xos.h>
-#include <X11/Xfuncproto.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#if !defined(MINIX) && !defined(Lynx)
-#include <sys/param.h>
-#endif
-#include <errno.h>
-
-#ifndef X_NOT_POSIX
-#include <dirent.h>
-#else
-#ifdef SYSV
-#include <dirent.h>
-#else
-#ifdef USG
-#include <dirent.h>
-#else
-#include <sys/dir.h>
-#ifndef dirent
-#define dirent direct
-#endif
-#endif
-#endif
-#endif
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 2048
-#endif
-
-#if NeedVarargsPrototypes
-#include <stdarg.h>
-#endif
-
-#ifdef X_NOT_STDC_ENV
-extern int errno;
-#endif
-int silent = 0;			/* -silent */
-int ignore_links = 0;		/* -ignorelinks */
-
-char *rcurdir;
-char *curdir;
-
-void
-quit (
-#if NeedVarargsPrototypes
-    int code, char * fmt, ...)
-#else
-    code, fmt, a1, a2, a3)
-    char *fmt;
-#endif
-{
-#if NeedVarargsPrototypes
-    va_list args;
-    va_start(args, fmt);
-    vfprintf (stderr, fmt, args);
-    va_end(args);
-#else
-    fprintf (stderr, fmt, a1, a2, a3);
-#endif
-    putc ('\n', stderr);
-    exit (code);
-}
-
-void
-quiterr (code, s)
-    char *s;
-{
-    perror (s);
-    exit (code);
-}
-
-void
-msg (
-#if NeedVarargsPrototypes
-    char * fmt, ...)
-#else
-    fmt, a1, a2, a3)
-    char *fmt;
-#endif
-{
-#if NeedVarargsPrototypes
-    va_list args;
-#endif
-    if (curdir) {
-	fprintf (stderr, "%s:\n", curdir);
-	curdir = 0;
-    }
-#if NeedVarargsPrototypes
-    va_start(args, fmt);
-    vfprintf (stderr, fmt, args);
-    va_end(args);
-#else
-    fprintf (stderr, fmt, a1, a2, a3);
-#endif
-    putc ('\n', stderr);
-}
-
-void
-mperror (s)
-    char *s;
-{
-    if (curdir) {
-	fprintf (stderr, "%s:\n", curdir);
-	curdir = 0;
-    }
-    perror (s);
-}
-
-
-int equivalent(lname, rname)
-    char *lname;
-    char *rname;
-{
-    char *s;
-
-    if (!strcmp(lname, rname))
-	return 1;
-    for (s = lname; *s && (s = strchr(s, '/')); s++) {
-	while (s[1] == '/')
-	    strcpy(s+1, s+2);
-    }
-    return !strcmp(lname, rname);
-}
-
-
-/* Recursively create symbolic links from the current directory to the "from"
-   directory.  Assumes that files described by fs and ts are directories. */
-
-dodir (fn, fs, ts, rel)
-char *fn;			/* name of "from" directory, either absolute or
-				   relative to cwd */
-struct stat *fs, *ts;		/* stats for the "from" directory and cwd */
-int rel;			/* if true, prepend "../" to fn before using */
-{
-    DIR *df;
-    struct dirent *dp;
-    char buf[MAXPATHLEN + 1], *p;
-    char symbuf[MAXPATHLEN + 1];
-    char basesym[MAXPATHLEN + 1];
-    struct stat sb, sc;
-    int n_dirs;
-    int symlen;
-    int basesymlen = -1;
-    char *ocurdir;
-
-    if ((fs->st_dev == ts->st_dev) && (fs->st_ino == ts->st_ino)) {
-	msg ("%s: From and to directories are identical!", fn);
-	return 1;
-    }
-
-    if (rel)
-	strcpy (buf, "../");
-    else
-	buf[0] = '\0';
-    strcat (buf, fn);
-    
-    if (!(df = opendir (buf))) {
-	msg ("%s: Cannot opendir", buf);
-	return 1;
-    }
-
-    p = buf + strlen (buf);
-    *p++ = '/';
-    n_dirs = fs->st_nlink;
-    while (dp = readdir (df)) {
-	if (dp->d_name[strlen(dp->d_name) - 1] == '~')
-	    continue;
-	strcpy (p, dp->d_name);
-
-	if (n_dirs > 0) {
-	    if (stat (buf, &sb) < 0) {
-		mperror (buf);
-		continue;
-	    }
-
-#ifdef S_ISDIR
-	    if(S_ISDIR(sb.st_mode))
-#else
-	    if (sb.st_mode & S_IFDIR) 
-#endif
-	    {
-		/* directory */
-		n_dirs--;
-		if (dp->d_name[0] == '.' &&
-		    (dp->d_name[1] == '\0' || (dp->d_name[1] == '.' &&
-					       dp->d_name[2] == '\0')))
-		    continue;
-		if (!strcmp (dp->d_name, "RCS"))
-		    continue;
-		if (!strcmp (dp->d_name, "SCCS"))
-		    continue;
-		if (!strcmp (dp->d_name, "CVS"))
-		    continue;
-		if (!strcmp (dp->d_name, "CVS.adm"))
-		    continue;
-		ocurdir = rcurdir;
-		rcurdir = buf;
-		curdir = silent ? buf : (char *)0;
-		if (!silent)
-		    printf ("%s:\n", buf);
-		if ((stat (dp->d_name, &sc) < 0) && (errno == ENOENT)) {
-		    if (mkdir (dp->d_name, 0777) < 0 ||
-			stat (dp->d_name, &sc) < 0) {
-			mperror (dp->d_name);
-			curdir = rcurdir = ocurdir;
-			continue;
-		    }
-		}
-		if (readlink (dp->d_name, symbuf, sizeof(symbuf) - 1) >= 0) {
-		    msg ("%s: is a link instead of a directory", dp->d_name);
-		    curdir = rcurdir = ocurdir;
-		    continue;
-		}
-		if (chdir (dp->d_name) < 0) {
-		    mperror (dp->d_name);
-		    curdir = rcurdir = ocurdir;
-		    continue;
-		}
-		dodir (buf, &sb, &sc, (buf[0] != '/'));
-		if (chdir ("..") < 0)
-		    quiterr (1, "..");
-		curdir = rcurdir = ocurdir;
-		continue;
-	    }
-	}
-
-	/* non-directory */
-	symlen = readlink (dp->d_name, symbuf, sizeof(symbuf) - 1);
-	if (symlen >= 0)
-	    symbuf[symlen] = '\0';
-
-	/* The option to ignore links exists mostly because
-	   checking for them slows us down by 10-20%.
-	   But it is off by default because this really is a useful check. */
-	if (!ignore_links) {
-	    /* see if the file in the base tree was a symlink */
-	    basesymlen = readlink(buf, basesym, sizeof(basesym) - 1);
-	    if (basesymlen >= 0)
-		basesym[basesymlen] = '\0';
-	}
-
-	if (symlen >= 0) {
-	    /* Link exists in new tree.  Print message if it doesn't match. */
-	    if (!equivalent (basesymlen>=0 ? basesym : buf, symbuf))
-		msg ("%s: %s", dp->d_name, symbuf);
-	} else {
-	    if (symlink (basesymlen>=0 ? basesym : buf, dp->d_name) < 0)
-		mperror (dp->d_name);
-	}
-    }
-
-    closedir (df);
-    return 0;
-}
-
-
-main (ac, av)
-int ac;
-char **av;
-{
-    char *prog_name = av[0];
-    char *fn, *tn;
-    struct stat fs, ts;
-
-    while (++av, --ac) {
-	if (strcmp(*av, "-silent") == 0)
-	    silent = 1;
-	else if (strcmp(*av, "-ignorelinks") == 0)
-	    ignore_links = 1;
-	else if (strcmp(*av, "--") == 0) {
-	    ++av, --ac;
-	    break;
-	}
-	else
-	    break;
-    }
-
-    if (ac < 1 || ac > 2)
-	quit (1, "usage: %s [-silent] [-ignorelinks] fromdir [todir]",
-	      prog_name);
-
-    fn = av[0];
-    if (ac == 2)
-	tn = av[1];
-    else
-	tn = ".";
-
-    /* to directory */
-    if (stat (tn, &ts) < 0)
-	quiterr (1, tn);
-#ifdef S_ISDIR
-    if (!(S_ISDIR(ts.st_mode)))
-#else
-    if (!(ts.st_mode & S_IFDIR))
-#endif
-	quit (2, "%s: Not a directory", tn);
-    if (chdir (tn) < 0)
-	quiterr (1, tn);
-
-    /* from directory */
-    if (stat (fn, &fs) < 0)
-	quiterr (1, fn);
-#ifdef S_ISDIR
-    if (!(S_ISDIR(fs.st_mode)))
-#else
-    if (!(fs.st_mode & S_IFDIR))
-#endif
-	quit (2, "%s: Not a directory", fn);
-
-    exit (dodir (fn, &fs, &ts, 0));
-}
--- a/Xvnc/config/util/lndir.man
+++ /dev/null
@@ -1,129 +0,0 @@
-.\" $XConsortium: lndir.man /main/10 1996/09/28 16:16:45 rws $
-.\"
-.\" Copyright (c) 1993, 1994  X Consortium
-.\" 
-.\" 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, sublicense, and/or sell copies of the Software, and to
-.\" permit persons to whom the Software is furnished to do so, subject to
-.\" the following conditions:
-.\" 
-.\" The above copyright notice and this permission notice shall be
-.\" included in all copies or substantial portions of the Software.
-.\" 
-.\" 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.
-.\" IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
-.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-.\" OTHER DEALINGS IN THE SOFTWARE.
-.\" 
-.\" Except as contained in this notice, the name of the X Consortium shall
-.\" not be used in advertising or otherwise to promote the sale, use or
-.\" other dealings in this Software without prior written authorization
-.\" from the X Consortium.
-.\" 
-.TH LNDIR 1 "Release 6.1" "X Version 11"
-.SH NAME
-lndir \- create a shadow directory of symbolic links to another directory tree
-.SH SYNOPSIS
-.B lndir
-[
-.B \-silent
-] [
-.B \-ignorelinks
-]
-.I \|fromdir\|
-[
-.I todir
-]
-.SH DESCRIPTION
-The
-.I lndir
-program makes a shadow copy 
-.I todir 
-of a directory tree
-.I fromdir, 
-except that the shadow is not
-populated with real files but instead with symbolic links pointing at
-the real files in the 
-.I fromdir
-directory tree.  This is usually useful for maintaining source code for
-different machine architectures.  You create a shadow directory
-containing links to the real source, which you will have usually
-mounted from a remote machine.  You can build in the shadow tree, and
-the object files will be in the shadow directory, while the
-source files in the shadow directory are just symlinks to the real
-files.
-.PP
-This scheme has the advantage that if you update the source, you need not 
-propagate the change to the other architectures by hand, since all
-source in all shadow directories are symlinks to the real thing: just cd
-to the shadow directory and recompile away.
-.PP
-The
-.I todir
-argument is optional and defaults to the current directory.  The
-.I fromdir
-argument may be relative (e.g., ../src) and is relative to
-.I todir
-(not the current directory).
-.PP 
-.\" CVS.adm is used by the Concurrent Versions System.
-Note that RCS, SCCS, CVS and CVS.adm directories are not shadowed.
-.PP
-If you add files, simply run
-.I lndir
-again.  New files will be silently added.  Old files will be
-checked that they have the correct link.
-.PP
-Deleting files is a more painful problem; the symlinks will
-just point into never never land.
-.PP
-If a file in \fIfromdir\fP is a symbolic link, \fIlndir\fP will make
-the same link in \fItodir\fP rather than making a link back to the
-(symbolic link) entry in \fIfromdir.\fP  The \fB\-ignorelinks\fP flag
-changes this behavior.
-.SH OPTIONS
-.IP \-silent
-Normally \fIlndir\fP outputs the name of each subdirectory as it
-descends into it.  The \fB\-silent\fP option suppresses these status
-messages.
-.IP \-ignorelinks
-Causes the program to not treat symbolic links in \fIfromdir\fP
-specially.  The link created in \fItodir\fP will point back to the
-corresponding (symbolic link) file in \fIfromdir\fP.
-If the link is to a directory, this is almost certainly the wrong thing.
-.IP
-This option exists mostly to emulate the behavior the C version of
-\fIlndir\fP had in X11R6.  Its use is not recommended.
-.SH DIAGNOSTICS
-The program displays the name of each subdirectory it enters, followed
-by a colon.  The \fB\-silent\fP option suppresses these messages.
-.PP
-A warning message is displayed if the symbolic link cannot be created.
-The usual problem is that a regular file of the same name already
-exists.
-.PP
-If the link already exists but doesn't point to the correct file, the
-program prints the link name and the location where it does point.
-.SH BUGS
-The
-.I patch
-program gets upset if it cannot change the files.  You should never run
-.I patch
-from a shadow directory anyway.
-.PP
-You need to use something like
-.nf
-	find todir \|\-type l \|\-print \||\| xargs rm
-.fi
-to clear out all files before you can relink (if fromdir moved, for instance).
-Something like
-.nf
-	 find . \|\\! \|\-type d \|\-print
-.fi
-will find all files that are not directories.
--- a/Xvnc/config/util/makeg.man
+++ /dev/null
@@ -1,63 +0,0 @@
-.\" $XConsortium: makeg.man /main/1 1996/02/02 18:48:20 gildea $
-.\" Copyright (c) 1996  X Consortium
-.\" 
-.\" 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, sublicense, and/or sell copies of the Software, and to
-.\" permit persons to whom the Software is furnished to do so, subject to
-.\" the following conditions:
-.\" 
-.\" The above copyright notice and this permission notice shall be
-.\" included in all copies or substantial portions of the Software.
-.\" 
-.\" 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.
-.\" IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
-.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-.\" OTHER DEALINGS IN THE SOFTWARE.
-.\" 
-.\" Except as contained in this notice, the name of the X Consortium shall
-.\" not be used in advertising or otherwise to promote the sale, use or
-.\" other dealings in this Software without prior written authorization
-.\" from the X Consortium.
-.\"
-.TH MAKEG 1 "Release 6.1" "X Version 11"
-.SH NAME
-makeg \- make a debuggable executable
-.SH SYNOPSIS
-.B makeg
-[
-.I make-options .\|.\|.
-] [
-.I targets  .\|.\|.
-]
-.SH DESCRIPTION
-The
-.I makeg
-script runs
-.I make,
-passing it variable settings to create a debuggable target when used
-with a Makefile generated by
-.I imake.
-For example, it arranges for the C compiler to be called with the
-.B \-g
-option.
-.SH ENVIRONMENT
-.TP 8
-.B MAKE
-The
-.I make
-program to use.  Default ``make''.
-.TP 8
-.B GDB
-Set to a non-null value if using the
-.I gdb
-debugger on Solaris 2, which requires additional debugging options to
-be passed to the compiler.
-.SH "SEE ALSO"
-.I make (1),
-.I imake (1)
--- a/Xvnc/config/util/makeg.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-# makeg - run "make" with options necessary to make a debuggable executable
-# $XConsortium: makeg.sh /main/4 1996/06/13 11:45:08 ray $
-
-# set GDB=1 in your environment if using gdb on Solaris 2.
-
-make="${MAKE-make}"
-flags="CDEBUGFLAGS=-g CXXDEBUGFLAGS=-g"
-
-# gdb on Solaris needs the stabs included in the executable
-test "${GDB+yes}" = yes && flags="$flags -xs"
-
-exec "$make" $flags LDSTRIPFLAGS= ${1+"$@"}
--- a/Xvnc/config/util/makestrs.c
+++ /dev/null
@@ -1,741 +0,0 @@
-/* $XConsortium: makestrs.c /main/10 1996/11/22 07:27:41 kaleb $ */
-
-/*
-
-Copyright (c) 1991  X Consortium
-
-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, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-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.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-*/
-
-/* Constructs string definitions */
-
-#include <stdio.h>
-#include <X11/Xos.h>
-#ifndef X_NOT_STDC_ENV
-#include <stdlib.h>
-#else
-char *malloc();
-#endif
-#if defined(macII) && !defined(__STDC__)  /* stdlib.h fails to define these */
-char *malloc();
-#endif /* macII */
-
-typedef struct _TableEnt {
-    struct _TableEnt* next;
-    char* left;
-    char* right;
-    int offset;
-} TableEnt;
-
-typedef struct _Table {
-    struct _Table* next;
-    TableEnt* tableent;
-    TableEnt* tableentcurrent;
-    TableEnt** tableenttail;
-    char* name;
-    int offset;
-} Table;
-
-typedef struct _File {
-    struct _File* next;
-    FILE* tmpl;
-    char* name;
-    Table* table;
-    Table* tablecurrent;
-    Table** tabletail;
-} File;
-
-static File* file = NULL;
-static File* filecurrent = NULL;
-static File** filetail = &file;
-static char* conststr;
-static char* prefixstr = NULL;
-static char* featurestr = NULL;
-static char* ctmplstr = NULL;
-static char* fileprotstr;
-static char* externrefstr;
-static char* externdefstr;
-
-#define X_DEFAULT_ABI	0
-#define X_ARRAYPER_ABI	1
-#define X_INTEL_ABI	2
-#define X_INTEL_ABI_BC	3
-#define X_SPARC_ABI	4
-#define X_FUNCTION_ABI	5
-
-#define X_MAGIC_STRING "<<<STRING_TABLE_GOES_HERE>>>"
-
-static void WriteHeaderProlog (f, phile)
-    FILE* f;
-    File* phile;
-{
-    Table* t;
-    TableEnt* te;
-
-    (void) fprintf (f, "#ifdef %s\n", featurestr);
-    for (t = phile->table; t; t = t->next)
-	for (te = t->tableent; te; te = te->next) {
-	    if (strcmp (te->left, "RAtom") == 0) {
-		(void) fprintf (f, 
-			"#ifndef %s%s\n#define %s%s \"%s\"\n#endif\n",
-			prefixstr, te->left, prefixstr, te->left, te->right);
-	    } else {
-		(void) fprintf (f, 
-			"#define %s%s \"%s\"\n",
-			prefixstr, te->left, te->right);
-	    }
-	}
-    (void) fprintf (f, "%s", "#else\n");
-}
-
-static void IntelABIWriteHeader (f, phile)
-    FILE* f;
-    File* phile;
-{
-    Table* t;
-    TableEnt* te;
-
-    WriteHeaderProlog (f, phile);
-
-    for (t = phile->table; t; t = t->next) {
-      (void) fprintf (f, "%s %sConst char %s[];\n", 
-		      externrefstr, conststr ? conststr : fileprotstr, t->name);
-	for (te = t->tableent; te; te = te->next)
-	    (void) fprintf (f, 
-		"#ifndef %s%s\n#define %s%s ((char*)&%s[%d])\n#endif\n",
-		prefixstr, te->left, prefixstr, te->left, t->name, te->offset);
-    }
-
-    (void) fprintf (f, "#endif /* %s */\n", featurestr);
-}
-
-static void SPARCABIWriteHeader (f, phile)
-    FILE* f;
-    File* phile;
-{
-    Table* t;
-    TableEnt* te;
-
-    for (t = phile->table; t; t = t->next)
-	for (te = t->tableent; te; te = te->next)
-	    (void) fprintf (f, "#define %s%s \"%s\"\n",
-			    prefixstr, te->left, te->right);
-}
-
-static void FunctionWriteHeader (f, phile)
-    FILE* f;
-    File* phile;
-{
-    Table* t;
-    TableEnt* te;
-
-    WriteHeaderProlog (f, phile);
-
-    (void) fprintf (f, "%s %sConst char* %s();\n", 
-		    externrefstr, conststr ? conststr : fileprotstr, 
-		    phile->table->name);
-
-    for (t = phile->table; t; t = t->next)
-	for (te = t->tableent; te; te = te->next)
-	    (void) fprintf (f, 
-		"#ifndef %s%s\n#define %s%s (%s(%d))\n#endif\n",
-		prefixstr, te->left, prefixstr, te->left, phile->table->name, 
-		te->offset);
-
-    (void) fprintf (f, "#endif /* %s */\n", featurestr);
-}
-
-static void ArrayperWriteHeader (f, phile)
-    FILE* f;
-    File* phile;
-{
-    Table* t;
-    TableEnt* te;
-
-    WriteHeaderProlog (f, phile);
-
-    for (t = phile->table; t; t = t->next)
-        for (te = t->tableent; te; te = te->next)
-	    (void) fprintf (f, 
-			    "#ifndef %s%s\n%s %sConst char %s%s[];\n#endif\n",
-			    prefixstr, te->left, 
-			    externrefstr, conststr ? conststr : fileprotstr, 
-			    prefixstr, te->left);
-
-    (void) fprintf (f, "#endif /* %s */\n", featurestr);
-}
-
-static void DefaultWriteHeader (f, phile)
-    FILE* f;
-    File* phile;
-{
-    Table* t;
-    TableEnt* te;
-
-    WriteHeaderProlog (f, phile);
-
-    (void) fprintf (f, "%s %sConst char %s[];\n", 
-		    externrefstr, conststr ? conststr : fileprotstr, 
-		    phile->table->name);
-
-    for (t = phile->table; t; t = t->next)
-	for (te = t->tableent; te; te = te->next)
-	    (void) fprintf (f, 
-		"#ifndef %s%s\n#define %s%s ((char*)&%s[%d])\n#endif\n",
-		prefixstr, te->left, prefixstr, te->left, phile->table->name, 
-		te->offset);
-
-    (void) fprintf (f, "#endif /* %s */\n", featurestr);
-}
-
-static void CopyTmplProlog (tmpl, f)
-    FILE* tmpl;
-    FILE* f;
-{
-    char buf[1024];
-    static char* magic_string = X_MAGIC_STRING;
-    int magic_string_len = strlen (magic_string);
-
-    while (fgets (buf, sizeof buf, tmpl)) {
-	if (strncmp (buf, magic_string, magic_string_len) == 0) {
-	    return;
-	}
-	(void) fputs (buf, f);
-    }
-}
-
-static void CopyTmplEpilog (tmpl, f)
-    FILE* tmpl;
-    FILE* f;
-{
-    char buf[1024];
-
-    while (fgets (buf, sizeof buf, tmpl))
-	(void) fputs (buf, f);
-}
-
-static char* abistring[] = {
-    "Default", "Array per string", "Intel", "Intel BC", "SPARC", "Function" };
-
-static void WriteHeader (tagline, phile, abi)
-    char* tagline;
-    File* phile;
-    int abi;
-{
-    FILE* f;
-    char* tmp;
-    Table* t;
-    TableEnt* te;
-    static void (*headerproc[])() = { 
-	DefaultWriteHeader, ArrayperWriteHeader,
-	IntelABIWriteHeader, IntelABIWriteHeader,
-	SPARCABIWriteHeader, FunctionWriteHeader };
-
-    if ((f = fopen (phile->name, "w+")) == NULL) exit (1);
-
-    if (phile->tmpl) CopyTmplProlog (phile->tmpl, f);
-
-    (void) fprintf (f, 
-	"%s\n%s\n/* %s ABI version -- Do not edit */\n", 
-	"/* $XConsortium: makestrs.c /main/10 1996/11/22 07:27:41 kaleb $ */",
-	"/* This file is automatically generated. */",
-	abistring[abi]);
-
-    if (tagline) (void) fprintf (f, "/* %s */\n\n", tagline);
-
-    /* do the right thing for Motif, i.e. avoid _XmXmStrDefs_h_ */
-    if (strcmp (prefixstr, "Xm") == 0) {
-	if ((fileprotstr = malloc (strlen (phile->name) + 3)) == NULL)
-	   exit (1);
-	(void) sprintf (fileprotstr, "_%s_", phile->name);
-    } else {
-	if ((fileprotstr = malloc (strlen (phile->name) + strlen (prefixstr) +  3)) == NULL)
-	   exit (1);
-	(void) sprintf (fileprotstr, "_%s%s_", prefixstr, phile->name);
-    }
-
-    for (tmp = fileprotstr; *tmp; tmp++) if (*tmp == '.') *tmp = '_';
-
-    (*headerproc[abi])(f, phile);
-
-    if (phile->tmpl) CopyTmplEpilog (phile->tmpl, f);
-
-    (void) free (fileprotstr);
-    (void) fclose (phile->tmpl);
-    (void) fclose (f);
-}
-
-static void WriteSourceLine (te, abi, fudge)
-    TableEnt* te;
-    int abi;
-{
-    char* c;
-
-    for (c = te->right; *c; c++) (void) printf ("'%c',", *c);
-    (void) printf ("%c", '0');
-    if (te->next || fudge) (void) printf ("%c", ',');
-    (void) printf ("%s", "\n");
-}
-
-static char* const_string = "%s %sConst char %s[] = {\n";
-
-static void IntelABIWriteSource (abi)
-    int abi;
-{
-    File* phile;
-
-    for (phile = file; phile; phile = phile->next) {
-	Table* t;
-	TableEnt* te;
-
-	for (t = phile->table; t; t = t->next) {
-	    (void) printf (const_string, externdefstr, 
-			   conststr ? conststr : "", t->name);
-	    for (te = t->tableent; te; te = te->next)
-		WriteSourceLine (te, abi, 0);
-	    (void) printf ("%s\n\n", "};");
-	}
-    }
-}
-
-static void IntelABIBCWriteSource (abi)
-    int abi;
-{
-    File* phile;
-
-    for (phile = file; phile; phile = phile->next) {
-	Table* t;
-	TableEnt* te;
-
-	(void) printf (const_string, externdefstr, 
-		       conststr ? conststr : "", phile->table->name);
-
-	for (t = phile->table; t; t = t->next) 
-	    for (te = t->tableent; te; te = te->next)
-		WriteSourceLine (te, abi, t->next ? 1 : 0);
-	(void) printf ("%s\n\n", "};");
-
-	if (phile->table->next) {
-	    (void) printf (const_string, externdefstr, 
-			   conststr ? conststr : "", phile->table->next->name);
-	    for (t = phile->table->next; t; t = t->next) 
-		for (te = t->tableent; te; te = te->next)
-		    WriteSourceLine (te, abi, 0);
-	    (void) printf ("%s\n\n", "};");
-	}
-    }
-}
-
-static void FunctionWriteSource (abi)
-    int abi;
-{
-    File* phile;
-
-    for (phile = file; phile; phile = phile->next) {
-	Table* t;
-	TableEnt* te;
-
-	(void) printf ("static %sConst char _%s[] = {\n", 
-		       conststr ? conststr : "", phile->table->name);
-
-	for (t = phile->table; t; t = t->next) 
-	    for (te = t->tableent; te; te = te->next)
-		WriteSourceLine (te, abi, t->next ? 1 : 0);
-	(void) printf ("%s\n\n", "};");
-
-	(void) printf ("%sConst char* %s(index)\n    int index;\n{\n    return &_%s[index];\n}\n\n",
-		       conststr ? conststr : "", 
-		       phile->table->name, phile->table->name);
-    }
-}
-
-static void ArrayperWriteSource (abi)
-    int abi;
-{
-    File* phile;
-    static int done_atom;
-
-    for (phile = file; phile; phile = phile->next) {
-	Table* t;
-	TableEnt* te;
-
-	for (t = phile->table; t; t = t->next) 
-	    for (te = t->tableent; te; te = te->next) {
-		if (strcmp (te->left, "RAtom") == 0) {
-		    if (done_atom) return;
-		    done_atom = 1;
-		}
-		(void) printf ("%s %sConst char %s%s[] = \"%s\";\n",
-			       externdefstr, conststr ? conststr : "",
-			       prefixstr,  te->left, te->right);
-	    }
-    }
-}
-
-static void DefaultWriteSource (abi)
-    int abi;
-{
-    File* phile;
-
-    for (phile = file; phile; phile = phile->next) {
-	Table* t;
-	TableEnt* te;
-
-	(void) printf (const_string, externdefstr, conststr ? conststr : "",
-		       phile->table->name);
-
-	for (t = phile->table; t; t = t->next) 
-	    for (te = t->tableent; te; te = te->next)
-		WriteSourceLine (te, abi, t->next ? 1 : 0);
-	(void) printf ("%s\n\n", "};");
-    }
-}
-
-static void WriteSource(tagline, abi)
-    char* tagline;
-    int abi;
-{
-    static void (*sourceproc[])() = { 
-	DefaultWriteSource, ArrayperWriteSource,
-	IntelABIWriteSource, IntelABIBCWriteSource,
-	DefaultWriteSource, FunctionWriteSource };
-
-    FILE* tmpl;
-
-    if (ctmplstr) {
-	tmpl = fopen (ctmplstr, "r");
-
-	if (tmpl) CopyTmplProlog (tmpl, stdout);
-	else {
-	    (void) fprintf (stderr, "Expected template %s, not found\n",
-			    ctmplstr);
-	    exit (1);
-	}
-    } else
-	tmpl = NULL;
-
-
-    (void) printf ("%s\n%s\n/* %s ABI version -- Do not edit */\n", 
-		   "/* $XConsortium: makestrs.c /main/10 1996/11/22 07:27:41 kaleb $ */",
-		   "/* This file is automatically generated. */",
-		   abistring[abi]);
-
-    if (tagline) (void) printf ("/* %s */\n\n", tagline);
-
-    (*sourceproc[abi])(abi);
-
-    if (tmpl) CopyTmplEpilog (tmpl, stdout);
-}
-
-static void DoLine(buf)
-    char* buf;
-{
-#define X_NO_TOKEN 0
-#define X_FILE_TOKEN 1
-#define X_TABLE_TOKEN 2
-#define X_PREFIX_TOKEN 3
-#define X_FEATURE_TOKEN 4
-#define X_EXTERNREF_TOKEN 5
-#define X_EXTERNDEF_TOKEN 6
-#define X_CTMPL_TOKEN 7
-#define X_HTMPL_TOKEN 8
-#define X_CONST_TOKEN 9
-
-    int token;
-    char lbuf[1024];
-    static char* file_str = "#file";
-    static char* table_str = "#table";
-    static char* prefix_str = "#prefix";
-    static char* feature_str = "#feature";
-    static char* externref_str = "#externref";
-    static char* externdef_str = "#externdef";
-    static char* ctmpl_str = "#ctmpl";
-    static char* htmpl_str = "#htmpl";
-    static char* const_str = "#const";
-
-    if (strncmp (buf, file_str, strlen (file_str)) == 0) 
-	token = X_FILE_TOKEN;
-    else if (strncmp (buf, table_str, strlen (table_str)) == 0) 
-	token = X_TABLE_TOKEN;
-    else if (strncmp (buf, prefix_str, strlen (prefix_str)) == 0) 
-	token = X_PREFIX_TOKEN;
-    else if (strncmp (buf, feature_str, strlen (feature_str)) == 0) 
-	token = X_FEATURE_TOKEN;
-    else if (strncmp (buf, externref_str, strlen (externref_str)) == 0) 
-	token = X_EXTERNREF_TOKEN;
-    else if (strncmp (buf, externdef_str, strlen (externdef_str)) == 0) 
-	token = X_EXTERNDEF_TOKEN;
-    else if (strncmp (buf, ctmpl_str, strlen (ctmpl_str)) == 0) 
-	token = X_CTMPL_TOKEN;
-    else if (strncmp (buf, htmpl_str, strlen (htmpl_str)) == 0) 
-	token = X_HTMPL_TOKEN;
-    else if (strncmp (buf, const_str, strlen (const_str)) == 0) 
-	token = X_CONST_TOKEN;
-    else
-        token = X_NO_TOKEN;
-
-    switch (token) {
-    case X_FILE_TOKEN:
-	{
-	    File* phile;
-
-	    if ((phile = (File*) malloc (sizeof(File))) == NULL) 
-		exit(1);
-	    if ((phile->name = malloc (strlen (buf + strlen (file_str)) + 1)) == NULL) 
-		exit(1);
-	    (void) strcpy (phile->name, buf + strlen (file_str) + 1);
-	    phile->table = NULL;
-	    phile->tablecurrent = NULL;
-	    phile->tabletail = &phile->table;
-	    phile->next = NULL;
-	    phile->tmpl = NULL;
-
-	    *filetail = phile;
-	    filetail = &phile->next;
-	    filecurrent = phile;
-	}
-	break;
-    case X_TABLE_TOKEN:
-	{
-	    Table* table;
-	    if ((table = (Table*) malloc (sizeof(Table))) == NULL) 
-		exit(1);
-	    if ((table->name = malloc (strlen (buf + strlen (table_str)) + 1)) == NULL) 
-		exit(1);
-	    (void) strcpy (table->name, buf + strlen (table_str) + 1);
-	    table->tableent = NULL;
-	    table->tableentcurrent = NULL;
-	    table->tableenttail = &table->tableent;
-	    table->next = NULL;
-	    table->offset = 0;
-
-	    *filecurrent->tabletail = table;
-	    filecurrent->tabletail = &table->next;
-	    filecurrent->tablecurrent = table;
-	}
-	break;
-    case X_PREFIX_TOKEN:
-	if ((prefixstr = malloc (strlen (buf + strlen (prefix_str)) + 1)) == NULL) 
-	    exit(1);
-	(void) strcpy (prefixstr, buf + strlen (prefix_str) + 1);
-	break;
-    case X_FEATURE_TOKEN:
-	if ((featurestr = malloc (strlen (buf + strlen (feature_str)) + 1)) == NULL) 
-	    exit(1);
-	(void) strcpy (featurestr, buf + strlen (feature_str) + 1);
-	break;
-    case X_EXTERNREF_TOKEN:
-	if ((externrefstr = malloc (strlen (buf + strlen (externref_str)) + 1)) == NULL) 
-	    exit(1);
-	(void) strcpy (externrefstr, buf + strlen (externref_str) + 1);
-	break;
-    case X_EXTERNDEF_TOKEN:
-	if ((externdefstr = malloc (strlen (buf + strlen (externdef_str)) + 1)) == NULL) 
-	    exit(1);
-	(void) strcpy (externdefstr, buf + strlen (externdef_str) + 1);
-	break;
-    case X_CTMPL_TOKEN:
-	if ((ctmplstr = malloc (strlen (buf + strlen (ctmpl_str)) + 1)) == NULL) 
-	    exit(1);
-	(void) strcpy (ctmplstr, buf + strlen (ctmpl_str) + 1);
-	break;
-    case X_HTMPL_TOKEN:
-	if ((filecurrent->tmpl = fopen (buf + strlen (htmpl_str) + 1, "r")) == NULL) {
-	    (void) fprintf (stderr, 
-			    "Expected template %s, not found\n", htmpl_str);
-	    exit (1);
-	}
-	break;
-    case X_CONST_TOKEN:
-	if ((conststr = malloc (strlen (buf + strlen (const_str)) + 1)) == NULL)
-	    exit(1);
-	(void) strcpy (conststr, buf + strlen (const_str) + 1);
-	break;
-    default:
-	{
-	    char* right;
-	    TableEnt* tableent;
-	    int llen;
-	    int rlen;
-	    int len;
-
-	    if (right = index(buf, ' '))
-		*right++ = 0;
-	    else
-		right = buf + 1;
-	    if (buf[0] == 'H') {
-		strcpy (lbuf, prefixstr);
-		strcat (lbuf, right);
-		right = lbuf;
-	    }
-
-	    llen = len = strlen(buf) + 1;
-	    rlen = strlen(right) + 1;
-	    if (right != buf + 1) len += rlen;
-	    if ((tableent = (TableEnt*)malloc(sizeof(TableEnt) + len)) == NULL)
-		exit(1);
-	    tableent->left = (char *)(tableent + 1);
-	    strcpy(tableent->left, buf);
-	    if (llen != len) {
-		tableent->right = tableent->left + llen;
-		strcpy(tableent->right, right);
-	    } else {
-		tableent->right = tableent->left + 1;
-	    }
-	    tableent->next = NULL;
-
-	    *filecurrent->tablecurrent->tableenttail = tableent;
-	    filecurrent->tablecurrent->tableenttail = &tableent->next;
-	    filecurrent->tablecurrent->tableentcurrent = tableent;
-	}
-	break;
-    }
-}
-
-static void IntelABIIndexEntries (file)
-    File* file;
-{
-    Table* t;
-    TableEnt* te;
-
-    for (t = file->table; t; t = t->next)
-	for (te = t->tableent; te; te = te->next) {
-	    te->offset = t->offset;
-	    t->offset += strlen (te->right);
-	    t->offset++;
-    }
-}
-
-static void DefaultIndexEntries (file)
-    File* file;
-{
-    Table* t;
-    TableEnt* te;
-    int offset = 0;
-
-    for (t = file->table; t; t = t->next)
-	for (te = t->tableent; te; te = te->next) {
-	    te->offset = offset;
-	    offset += strlen (te->right);
-	    offset++;
-    }
-}
-
-static void IndexEntries (file,abi)
-    File* file;
-    int abi;
-{
-    switch (abi) {
-    case X_SPARC_ABI:
-	break;
-    case X_INTEL_ABI:
-    case X_INTEL_ABI_BC:
-	IntelABIIndexEntries (file);
-	break;
-    default:
-	DefaultIndexEntries (file);
-	break;
-    }
-}
-
-static char* DoComment (line)
-    char* line;
-{
-    char* tag;
-    char* eol;
-    char* ret;
-    int len;
-
-    /* assume that the first line with two '$' in it is the RCS tag line */
-    if ((tag = index (line, '$')) == NULL) return NULL;
-    if ((eol = index (tag + 1, '$')) == NULL) return NULL;
-    len = eol - tag;
-    if ((ret = malloc (len)) == NULL)
-	exit (1);
-    (void) strncpy (ret, tag + 1, len - 1);
-    ret[len - 2] = 0;
-    return ret;
-}
-
-int main(argc, argv)
-    int argc;
-    char** argv;
-{
-    int len, i;
-    char* tagline = NULL;
-    File* phile;
-    FILE *f;
-    char buf[1024];
-    int abi = 
-#ifndef ARRAYPERSTR
-	X_DEFAULT_ABI;
-#else
-	X_ARRAYPER_ABI;
-#endif
-
-    f = stdin;
-    if (argc > 1) {
-	for (i = 1; i < argc; i++) {
-	    if (strcmp (argv[i], "-f") == 0) {
-		if (++i < argc)
-		    f = fopen (argv[i], "r");
-		else
-		    return 1;
-	    }
-	    if (strcmp (argv[i], "-sparcabi") == 0)
-		abi = X_SPARC_ABI;
-	    if (strcmp (argv[i], "-intelabi") == 0)
-		abi = X_INTEL_ABI;
-	    if (strcmp (argv[i], "-functionabi") == 0)
-		abi = X_FUNCTION_ABI;
-	    if (strcmp (argv[i], "-earlyR6bc") == 0 && abi == X_INTEL_ABI)
-		abi = X_INTEL_ABI_BC;
-	    if (strcmp (argv[i], "-arrayperabi") == 0)
-		abi = X_ARRAYPER_ABI;
-#ifdef ARRAYPERSTR
-	    if (strcmp (argv[i], "-defaultabi") == 0)
-		abi = X_DEFAULT_ABI;
-#endif
-	}
-    }
-
-    if (f == NULL) return 1;
-    while (fgets(buf, sizeof buf, f)) {
-	if (!buf[0] || buf[0] == '\n') 
-	    continue;
-	if (buf[0] == '!') {
-	    if (tagline) continue;
-	    tagline = DoComment (buf);
-	    continue;
-	}
-	if (buf[(len = strlen (buf) - 1)] == '\n') buf[len] = '\0';
-	DoLine(buf);
-    }
-    for (phile = file; phile; phile = phile->next) {
-	if (abi != X_ARRAYPER_ABI) IndexEntries (phile, abi);
-	WriteHeader (tagline, phile, abi);
-    }
-    WriteSource(tagline, abi);
-    return 0;
-}
-
--- a/Xvnc/config/util/makestrs.man
+++ /dev/null
@@ -1,213 +0,0 @@
-.\" $XConsortium: makestrs.man /main/3 1996/09/28 16:16:52 rws $
-.\" Copyright (c) 1993, 1994  X Consortium
-.\" 
-.\" 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, sublicense, 
-.\" and/or sell copies of the Software, and to permit persons to whom the 
-.\" Software furnished to do so, subject to the following conditions:
-.\" 
-.\" The above copyright notice and this permission notice shall be included in
-.\" all copies or substantial portions of the Software.
-.\" 
-.\" 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.  IN NO EVENT SHALL 
-.\" THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
-.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF 
-.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-.\" SOFTWARE.
-.\" 
-.\" Except as contained in this notice, the name of the X Consortium shall not 
-.\" be used in advertising or otherwise to promote the sale, use or other 
-.\" dealing in this Software without prior written authorization from the 
-.\" X Consortium.
-.TH MAKESTRS 1 "Release 6.1" "X Version 11"
-.SH NAME
-makestrs \- makes string table C source and header(s)
-.SH SYNOPSIS
-.B makestrs [-f source] [-abioptions ...]
-.SH DESCRIPTION
-The
-.I makestrs
-command creates string table C source files and headers.
-If
-.I -f
-.I source
-is not specified
-.I makestrs
-will read from
-.I stdin.
-The C source file is always written to
-.I stdout.
-.I makestrs
-creates one or more C header files as specified in the source file.
-The following options may be specified:
-.I -sparcabi,
-.I -intelabi,
-.I -functionabi,
-.I -arrayperabi,
-and
-.I -defaultabi.
-.LP
-.I -sparcabi 
-is used on SPARC platforms conforming to the SPARC 
-Compliance Definition, i.e. SVR4/Solaris.
-.LP
-.I -intelabi 
-is used on Intel platforms conforming to the System 
-V Application Binary Interface, i.e. SVR4.
-.LP
-.I -earlyR6abi 
-may be used in addition to 
-.I -intelabi 
-for situations 
-where the vendor wishes to maintain binary compatiblity between 
-X11R6 public-patch 11 (and earlier) and X11R6 public-patch 12 (and later).
-.LP
-.I -functionabi 
-generates a functional abi to the string table. This 
-mechanism imposes a severe performance penalty and it's recommended 
-that you not use it.
-.LP
-.I -arrayperabi 
-results in a separate array for each string. This is 
-the default behavior if makestrs was compiled with -DARRAYPERSTR 
-(it almost never is).
-.LP
-.I -defaultabi 
-forces the generation of the "normal" string table even 
-if makestrs was compiled with -DARRAYPERSTR. Since makestrs is almost 
-never compiled with -DARRAYPERSTR this is the default behavior if 
-no abioptions are specified.
-.SH SYNTAX
-The syntax for string-list file is (items in square brackets are optional):
-.RS 4
-#prefix <text>
-.RE
-.RS 4
-#feature <text>
-.RE
-.RS 4
-#externref <text>
-.RE
-.RS 4
-#externdef [<text>]
-.RE
-.RS 4
-[#ctempl <text>]
-.RE
-.LP
-.RS 4
-#file <filename>
-.RE
-.RS 4
-#table <tablename>
-.RE
-.RS 4
-[#htempl]
-.RE
-.RS 4
-<text>
-.RE
-.RS 4
-...
-.RE
-.RS 4
-<text>
-.RE
-.RS 4
-[#table <tablename>
-.RE
-.RS 4
-<text>
-.RE
-.RS 4
-...
-.RE
-.RS 4
-<text>
-.RE
-.RS 4
-...
-.RE
-.RS 4
-#table <tablename>
-.RE
-.RS 4
-...]
-.RE
-.RS 4
-[#file <filename>
-.RE
-.RS 4
-...]
-.RE
-.LP
-In words you may have one or more #file directives. Each #file may have
-one or more #table directives.
-.LP
-The #prefix directive determines the string that makestr will prefix
-to each definition.
-.LP
-The #feature directive determines the string that makestr will use
-for the feature-test macro, e.g. X[TM]STRINGDEFINES.
-.LP
-The #externref directive determines the string that makestr will use
-for the extern clause, typically this will be "extern" but Motif wants
-it to be "externalref"
-.LP
-The #externdef directive determines the string that makestr will use
-for the declaration, typically this will be the null string (note that
-makestrs requires a trailing space in this case, i.e. "#externdef "),
-and Motif will use "externaldef(_xmstrings).
-.LP
-The #ctmpl directive determines the name of the file used as a template
-for the C source file that is generated
-.LP
-Each #file <filename> directive will result in a corresponding header 
-file by that name containing the appropriate definitions as specified
-by command line options. A single C source file containing the
-declarations for the definitions in all the headers will be printed
-to stdout.
-.LP
-The #htmpl directive determines the name of the file used as a template
-for the C header file that is generated.
-.LP
-Each #table <tablename> directive will be processed in accordance with
-the ABI. On most platforms all tables will be catenated into a single
-table with the name of the first table for that file. To conform to
-the Intel ABI separate tables will be generated with the names indicated.
-.LP
-The template files specified by the #ctmpl and #htmpl directives
-are processed by copying line for line from the template file to
-the appropriate output file. The line containing the string
-.I <<<STRING_TABLE_GOES_HERE>>>
-is not copied to the output file. The appropriate data is then
-copied to the output file and then the remainder of the template
-file is copied to the output file.
-.SH BUGS
-makestrs is not very forgiving of syntax errors. Sometimes you need
-a trailing space after # directives, other times they will mess you
-up. No warning messages are emitted.
-.SH SEE ALSO
-SPARC Compliance Definition 2.2., SPARC International Inc.,
-535 Middlefield Road, Suite 210, Menlo Park, CA  94025
-.LP
-System V Application Binary Interface, Third Edition, 
-ISBN 0-13-100439-5
-UNIX Press, PTR Prentice Hall, 113 Sylvan Avenue, Englewood Cliffs, 
-NJ  07632
-.LP
-System V Application Binary Interface, Third Edition, Intel386
-Architecture Processor Supplement
-ISBN 0-13-104670-5
-UNIX Press, PTR Prentice Hall, 113 Sylvan Avenue, Englewood Cliffs, 
-NJ  07632
-.LP
-System V Application Binary Interface, Third Edition, SPARC
-Architecture Processor Supplement
-ISBN 0-13-104696-9
-UNIX Press, PTR Prentice Hall, 113 Sylvan Avenue, Englewood Cliffs, 
-NJ  07632
--- a/Xvnc/config/util/mdepend.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-XCOMM!/bin/sh
-XCOMM
-XCOMM $TOG: mdepend.cpp /main/13 1997/06/20 21:12:18 kaleb $
-XCOMM
-XCOMM	Do the equivalent of the 'makedepend' program, but do it right.
-XCOMM
-XCOMM	Usage:
-XCOMM
-XCOMM	makedepend [cpp-flags] [-w width] [-s magic-string] [-f makefile]
-XCOMM	  [-o object-suffix]
-XCOMM
-XCOMM	Notes:
-XCOMM
-XCOMM	The C compiler used can be overridden with the environment
-XCOMM	variable "CC".
-XCOMM
-XCOMM	The "-v" switch of the "makedepend" program is not supported.
-XCOMM
-XCOMM
-XCOMM	This script should
-XCOMM	work on both USG and BSD systems.  However, when System V.4 comes out,
-XCOMM	USG users will probably have to change "silent" to "-s" instead of
-XCOMM	"-" (at least, that is what the documentation implies).
-XCOMM
-XCOMM $XFree86: xc/config/util/mdepend.cpp,v 3.1.8.1 1997/06/29 08:43:27 dawes Exp $
-XCOMM
-
-CC=PREPROC
-
-silent='-'
-
-TMP=/tmp/mdep$$
-CPPCMD=${TMP}a
-DEPENDLINES=${TMP}b
-TMPMAKEFILE=${TMP}c
-MAGICLINE=${TMP}d
-ARGS=${TMP}e
-
-trap "rm -f ${TMP}*; exit 1" 1 2 15
-trap "rm -f ${TMP}*; exit 0" 1 2 13
-
-echo " \c" > $CPPCMD
-if [ `wc -c < $CPPCMD` -eq 1 ]
-then
-    c="\c"
-    n=
-else
-    c=
-    n="-n"
-fi
-
-echo $n "$c" >$ARGS
-
-files=
-makefile=
-magic_string='# DO NOT DELETE'
-objsuffix='.o'
-width=78
-endmarker=""
-verbose=n
-append=n
-
-while [ $# != 0 ]
-do
-    if [ "$endmarker"x != x ] && [ "$endmarker" = "$1" ]; then
-	endmarker=""
-    else
-	case "$1" in
-	    -D*|-I*)
-		echo $n " '$1'$c" >> $ARGS
-		;;
-
-	    -g|-O)	# ignore so we can just pass $(CFLAGS) in
-		;;
-
-	    *)
-		if [ "$endmarker"x = x ]; then
-		    case "$1" in 	
-			-w)
-			    width="$2"
-			    shift
-			    ;;
-			-s)
-			    magic_string="$2"
-			    shift
-			    ;;
-			-f*)
-			    if [ "$1" = "-f-" ]; then
-				makefile="-"
-			    else
-				makefile="$2"
-				shift
-			    fi
-			    ;;
-			-o)
-			    objsuffix="$2"
-			    shift
-			    ;;
-			
-			--*)
-			    echo "$1" | sed 's/^\-\-//' >${TMP}end
-			    endmarker="`cat ${TMP}end`"
-			    rm -f ${TMP}end
-			    if [ "$endmarker"x = x ]; then
-				endmarker="--"
-			    fi
-			    ;;
-			-v)
-			    verbose="y"
-			    ;;
-
-			-a)
-			    append="y"
-			    ;;
-
-			-cc)
-			    CC="$2"
-			    shift
-			    ;;
-
-			-*)
-			    echo "Unknown option '$1' ignored" 1>&2
-			    ;;
-			*)
-			    files="$files $1"
-			    ;;
-		    esac
-		fi
-		;;
-	esac
-    fi
-    shift
-done
-echo ' $*' >> $ARGS
-
-echo "#!/bin/sh" > $CPPCMD
-echo "exec $CC `cat $ARGS`" >> $CPPCMD
-chmod +x $CPPCMD
-rm $ARGS
-
-case "$makefile" in
-    '')
-	if [ -r makefile ]
-	then
-	    makefile=makefile
-	elif [ -r Makefile ]
-	then
-	    makefile=Makefile
-	else
-	    echo 'no makefile or Makefile found' 1>&2
-	    exit 1
-	fi
-	;;
-    -)
-	makefile=$TMPMAKEFILE
-	;;
-esac
-
-if [ "$verbose"x = "y"x ]; then 
-    cat $CPPCMD
-fi
-
-echo '' > $DEPENDLINES
-for i in $files
-do
-    $CPPCMD $i \
-      | sed -n "/^#/s;^;$i ;p"
-done \
-  | sed -e 's|/[^/.][^/]*/\.\.||g' -e 's|/\.[^.][^/]*/\.\.||g' \
-    -e 's|"||g' -e 's| \./| |' \
-  | awk '{
-	if ($1 != $4  &&  $2 != "#ident" && $2 != "#pragma")
-	    {
-	    ofile = substr ($1, 1, length ($1) - 2) "'"$objsuffix"'"
-	    print ofile, $4
-	    }
-	}' \
-  | sort -u \
-  | awk '
-	    {
-	    newrec = rec " " $2
-	    if ($1 != old1)
-		{
-		old1 = $1
-		if (rec != "")
-		    print rec
-		rec = $1 ": " $2
-		}
-	    else if (length (newrec) > '"$width"')
-		{
-		print rec
-		rec = $1 ": " $2
-		}
-	    else
-		rec = newrec
-	    }
-	END \
-	    {
-	    if (rec != "")
-		print rec
-	    }' \
-  | egrep -v '^[^:]*:[ 	]*$' >> $DEPENDLINES
-
-trap "" 1 2 13 15	# Now we are committed
-case "$makefile" in
-    $TMPMAKEFILE)
-	;;
-    *)
-	rm -f $makefile.bak
-	cp $makefile $makefile.bak
-	echo "Appending dependencies to $makefile"
-	;;
-esac
-
-XCOMM
-XCOMM If not -a, append the magic string and a blank line so that
-XCOMM /^$magic_string/+1,\$d can be used to delete everything from after
-XCOMM the magic string to the end of the file.  Then, append a blank
-XCOMM line again and then the dependencies.
-XCOMM
-if [ "$append" = "n" ]
-then
-    cat >> $makefile << END_OF_APPEND
-
-$magic_string
-
-END_OF_APPEND
-    ed $silent $makefile << END_OF_ED_SCRIPT
-/^$magic_string/+1,\$d
-w
-q
-END_OF_ED_SCRIPT
-    echo '' >>$makefile
-fi
-
-cat $DEPENDLINES >>$makefile
-
-case "$makefile" in
-    $TMPMAKEFILE)
-	cat $TMPMAKEFILE
-	;;
-
-esac
-
-rm -f ${TMP}*
-exit 0
--- a/Xvnc/config/util/mergelib.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-XCOMM!/bin/sh
-XCOMM
-XCOMM $XConsortium: mergelib.cpp,v 1.4 94/04/17 20:10:43 rws Exp $
-XCOMM 
-XCOMM Copyright (c) 1989  X Consortium
-XCOMM 
-XCOMM Permission is hereby granted, free of charge, to any person obtaining a copy
-XCOMM of this software and associated documentation files (the "Software"), to deal
-XCOMM in the Software without restriction, including without limitation the rights
-XCOMM to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-XCOMM copies of the Software, and to permit persons to whom the Software is
-XCOMM furnished to do so, subject to the following conditions:
-XCOMM 
-XCOMM The above copyright notice and this permission notice shall be included in
-XCOMM all copies or substantial portions of the Software.
-XCOMM 
-XCOMM THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-XCOMM IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-XCOMM FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-XCOMM X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-XCOMM AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-XCOMM CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-XCOMM 
-XCOMM Except as contained in this notice, the name of the X Consortium shall not be
-XCOMM used in advertising or otherwise to promote the sale, use or other dealings
-XCOMM in this Software without prior written authorization from the X Consortium.
-XCOMM 
-XCOMM Author:  Jim Fulton, MIT X Consortium
-XCOMM 
-XCOMM mergelib - merge one library into another; this is commonly used by X
-XCOMM     to add the extension library into the base Xlib.
-XCOMM
-
-usage="usage:  $0  to-library from-library [object-filename-prefix]"
-objprefix=_
-
-case $# in
-    2) ;;
-    3) objprefix=$3 ;;
-    *) echo "$usage" 1>&2; exit 1 ;;
-esac
-
-tolib=$1
-fromlib=$2
-
-if [ ! -f $fromlib ]; then
-    echo "$0:  no such from-library $fromlib" 1>&2
-    exit 1
-fi
-
-if [ ! -f $tolib ]; then
-    echo "$0:  no such to-library $tolib" 1>&2
-    exit 1
-fi
-
-
-XCOMM
-XCOMM Create a temp directory, and figure out how to reference the 
-XCOMM object files from it (i.e. relative vs. absolute path names).
-XCOMM
-
-tmpdir=tmp.$$
-origdir=..
-
-mkdir $tmpdir
-
-if [ ! -d $tmpdir ]; then
-    echo "$0:  unable to create temporary directory $tmpdir" 1>&2
-    exit 1
-fi
-
-case "$fromlib" in
-    /?*) upfrom= ;;
-    *)  upfrom=../ ;;
-esac
-
-case "$tolib" in
-    /?*) upto= ;;
-    *)  upto=../ ;;
-esac
-
-
-XCOMM
-XCOMM In the temp directory, extract all of the object files and prefix
-XCOMM them with some symbol to avoid name clashes with the base library.
-XCOMM
-cd $tmpdir
-ar x ${upfrom}$fromlib
-for i in *.o; do
-    mv $i ${objprefix}$i
-done
-
-
-XCOMM
-XCOMM Merge in the object modules, ranlib (if appropriate) and cleanup
-XCOMM
-ARCMD ${upto}$tolib *.o
-RANLIB ${upto}$tolib
-cd $origdir
-rm -rf $tmpdir
-
-
-
--- a/Xvnc/config/util/mkdirhier.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* $TOG: mkdirhier.c /main/2 1997/06/05 18:09:26 kaleb $ */
-/*
-
-Copyright (C) 1996 X Consortium
-
-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, sublicense, and sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-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.
-IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from the X Consortium.
-
-*/
-
-/*
- * Simple mkdirhier program for Windows NT
- */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <direct.h>
-#include <stdlib.h>
-#include <string.h>
-
-char *
-next_sep(char *path)
-{
-    while (*path)
-	if (*path == '/' || *path == '\\')
-	    return path;
-	else
-	    path++;
-    return NULL;
-}
-
-int
-main(int argc, char *argv[])
-{
-    char *dirname, *next, *prev;
-    char buf[1024];
-    struct _stat sb;
-
-    if (argc < 2)
-	exit(1);
-    dirname = argv[1];
-
-    prev = dirname;
-    while (next = next_sep(prev)) {
-	strncpy(buf, dirname, next - dirname);
-	buf[next - dirname] = '\0';
-	/* if parent dir doesn't exist yet create it */
-	if (_stat(buf, &sb))
-	    _mkdir(buf);	/* no error checking to avoid barfing on C: */
-	prev = next + 1;
-    }
-    if (_mkdir(dirname) == -1) {
-	perror("mkdirhier failed");
-	exit(1);
-    }
-    exit(0);
-}
--- a/Xvnc/config/util/mkdirhier.cmd
+++ /dev/null
@@ -1,54 +0,0 @@
-/* OS/2 REXX SCRIPT */
-/* $XFree86: xc/config/util/mkdirhier.cmd,v 3.2 1996/02/19 12:16:51 dawes Exp $ */
-
-CALL RxFuncAdd 'SysMkDir', 'RexxUtil', 'SysMkDir'
-
-IF ARG() = 0 THEN DO
-	SAY "mkdirhier: usage: mkdirhier directory ..."
-	EXIT 1
-END
-
-curdir=DIRECTORY()
-drive=DELSTR(curdir,3)
-
-status=""
-PARSE ARG all
-
-DO i=1 TO WORDS(all)
-	direc = TRANSLATE(WORD(all,i),'/','\')
-	SELECT
-	WHEN direc = "" THEN DO
-		SAY "mkdirhier: empty directory name"
-		status=1
-		ITERATE
-		END
-	WHEN POS('0a'x,direc) > 0 THEN DO
-		SAY "mkdirhier: directory name contains a newline: '" direc "'"
-		status=1
-		ITERATE
-		END
-	OTHERWISE NOP
-	END
-	IF POS(":",direc) = 0 THEN direc = INSERT(drive,direc)
-
-	dirbuf.0 = direc
-	DO k=1 TO 1000
-		direc1 = STRIP(direc,"t","/")
-		dpath1 = FILESPEC("path",direc1)
-		dirbuf.k=FILESPEC("drive",direc1)||STRIP(dpath1,"t","/")
-		IF POS("/",dirbuf.k) = 0 THEN LEAVE k
-		direc=dirbuf.k
-	END
-	DO m=k-1 TO 0 BY -1
-		dospath = TRANSLATE(dirbuf.m,'\','/')
-		targetdir=DIRECTORY(dospath)
-		IF targetdir = dospath THEN
-			NOP
-		ELSE
-			CALL SysMkDir(dospath)
-		CALL DIRECTORY curdir
-	END
-END
-
-
-EXIT status
--- a/Xvnc/config/util/mkdirhier.man
+++ /dev/null
@@ -1,40 +0,0 @@
-.\" $XConsortium: mkdirhier.man /main/9 1996/09/28 16:17:00 rws $
-.\" Copyright (c) 1993, 1994  X Consortium
-.\" 
-.\" 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, sublicense, 
-.\" and/or sell copies of the Software, and to permit persons to whom the 
-.\" Software furnished to do so, subject to the following conditions:
-.\" 
-.\" The above copyright notice and this permission notice shall be included in
-.\" all copies or substantial portions of the Software.
-.\" 
-.\" 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.  IN NO EVENT SHALL 
-.\" THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
-.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF 
-.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-.\" SOFTWARE.
-.\" 
-.\" Except as contained in this notice, the name of the X Consortium shall not 
-.\" be used in advertising or otherwise to promote the sale, use or other 
-.\" dealing in this Software without prior written authorization from the 
-.\" X Consortium.
-.TH MKDIRHIER 1 "Release 6.1" "X Version 11"
-.SH NAME
-mkdirhier \- makes a directory hierarchy
-.SH SYNOPSIS
-.B mkdirhier
-directory ...
-.SH DESCRIPTION
-The
-.I mkdirhier
-command creates the specified directories. Unlike
-.I mkdir
-if any of the parent directories of the specified directory
-do not exist, it creates them as well.
-.SH "SEE ALSO"
-mkdir(1)
--- a/Xvnc/config/util/mkdirhier.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-# $XConsortium: mkdirhier.sh,v 1.7 94/03/24 15:46:34 gildea Exp $
-# Courtesy of Paul Eggert
-
-newline='
-'
-IFS=$newline
-
-case ${1--} in
--*) echo >&2 "mkdirhier: usage: mkdirhier directory ..."; exit 1
-esac
-
-status=
-
-for directory
-do
-	case $directory in
-	'')
-		echo >&2 "mkdirhier: empty directory name"
-		status=1
-		continue;;
-	*"$newline"*)
-		echo >&2 "mkdirhier: directory name contains a newline: \`\`$directory''"
-		status=1
-		continue;;
-	///*) prefix=/;; # See Posix 2.3 "path".
-	//*) prefix=//;;
-	/*) prefix=/;;
-	-*) prefix=./;;
-	*) prefix=
-	esac
-
-	IFS=/
-	set x $directory
-	case $2 in
-	    */*)	# IFS parsing is broken
-		IFS=' '
-		set x `echo $directory | tr / ' '`
-		;;
-	esac
-	IFS=$newline
-	shift
-
-	for filename
-	do
-		path=$prefix$filename
-		prefix=$path/
-		shift
-
-		test -d "$path" || {
-			paths=$path
-			for filename
-			do
-				if [ "$filename" != "." ]; then
-					path=$path/$filename
-					paths=$paths$newline$path
-				fi
-			done
-
-			mkdir $paths || status=$?
-
-			break
-		}
-	done
-  done
-
-exit $status
--- a/Xvnc/config/util/mkshadow/Imakefile
+++ /dev/null
@@ -1,5 +0,0 @@
-XCOMM $XConsortium: Imakefile,v 1.1 94/04/13 18:44:40 rws Exp $
-           SRCS = mkshadow.c savedir.c wildmat.c
-           OBJS = mkshadow.o savedir.o wildmat.o
-
-ComplexProgramTarget(mkshadow)
--- a/Xvnc/config/util/mkshadow/README
+++ /dev/null
@@ -1,38 +0,0 @@
-The mkshadow programs makes a "shadow tree" of a directory tree.
-It logically copies all of the "MASTER" directory into ".".
-However, ordinary files, and RCS/SCCS directories are "copied"
-by creating a sybolic link to the corresponding file in MASTER.
-
-The wildmat.c file is by Rich Salz, and from comp.sources.misc, volume 17.
-The savedir.c file is lightly modified from the version written
-by David MacKenzie for GNU fileutils; the Free Software Foundation
-has graciously agreed to waive their usual copyright so this
-program can be distributed by the X Consortium.
-
-If you have problems compiling savedir.c, try setting the DIRENT make
-variable as suggested in the Makefile.
-
- * Usage: mkshadow [-X exclude_file] [-x exclude_pattern] ... MASTER
- * Makes the current directory be a "shadow copy" of MASTER.
- * Sort of like a recursive copy of MASTER to .
- * However, symbolic links are used instead of actually
- * copying (non-directory) files.
- * Also, directories named RCS or SCCS are shared (with a symbolic link).
- * Warning messages are printed for files (and directories) in .
- * that don't match a corresponding file in MASTER (though
- * symbolic links are silently removed).
- * Also, a warning message is printed for non-directory files
- * under . that are  not symbolic links.
- *
- * Files and directories can be excluded from the sharing
- * with the -X and -x flags. The flag `-x pattern' (or `-xpattern')
- * means that mkshadow should ignore any file whose name matches
- * the pattern. The pattern is a "globbing" pattern, i.e. the
- * characters *?[^-] are interpreted as by the shell.
- * If the pattern contains a '/' is is matched against the complete
- * current path (relative to '.'); otherwise, it is matched
- * against the last component of the path.
- * A `-X filename' flag means to read a set of exclusion patterns
- * from the named file, one pattern to a line.
-
-Author: Per Bothner. bothner@cygnus.com. November 1990, 1993.
--- a/Xvnc/config/util/mkshadow/mkshadow.c
+++ /dev/null
@@ -1,378 +0,0 @@
-/* $XConsortium: mkshadow.c /main/2 1996/12/04 10:11:51 swick $ */
-/* mkshadow.c - make a "shadow copy" of a directory tree with symlinks.
-   Copyright 1990, 1993 Free Software Foundation, Inc.
-
-   Permission to use, copy, modify, and distribute this program for
-   any purpose and without fee is hereby granted, provided that this
-   copyright and permission notice appear on all copies, and that
-   notice be given that copying and distribution is by permission of
-   the Free Software Foundation.  The Free Software Foundation makes
-   no representations about the suitability of this software for any
-   purpose.  It is provided "as is" without expressed or implied
-   warranty.
-
-   (The FSF has modified its usual distribution terms, for this file,
-   as a courtesy to the X project.)  */
-
-/*
- * Usage: mkshadow [-X exclude_file] [-x exclude_pattern] ... MASTER [SHADOW]
- * Makes SHADOW be a "shadow copy" of MASTER.  SHADOW defaults to the current
- * directory. Sort of like a recursive copy of MASTER to SHADOW.
- * However, symbolic links are used instead of actually
- * copying (non-directory) files.
- * Also, directories named RCS or SCCS are shared (with a symbolic link).
- * Warning messages are printed for files (and directories) in .
- * that don't match a corresponding file in MASTER (though
- * symbolic links are silently removed).
- * Also, a warning message is printed for non-directory files
- * under SHADOW that are not symbolic links.
- *
- * Files and directories can be excluded from the sharing
- * with the -X and -x flags. The flag `-x pattern' (or `-xpattern')
- * means that mkshadow should ignore any file whose name matches
- * the pattern. The pattern is a "globbing" pattern, i.e. the
- * characters *?[^-] are interpreted as by the shell.
- * If the pattern contains a '/' is is matched against the complete
- * current path (relative to '.'); otherwise, it is matched
- * against the last component of the path.
- * A `-X filename' flag means to read a set of exclusion patterns
- * from the named file, one pattern to a line.
- *
- * Originally written by Per Bothner at University of Wisconsin-Madison,
- * inspired by the lndir script distributed with X11.
- * Modified by Per Bothner <bothner@cygnus.com> November 1993
- * to more-or-less follow Posix.
- */
-
-#include <sys/types.h>
-#include <stdio.h>
-#ifdef BSD
-#include <strings.h>
-#define strchr index
-#else
-#include <string.h>
-#endif
-#include <sys/stat.h>
-#if defined(S_IFDIR) && !defined(S_ISDIR)
-#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
-#endif
-#if defined(S_IFLNK) && !defined(S_ISLNK)
-#define S_ISLNK(mode) (((mode) & S_IFMT) == S_IFLNK)
-#endif
-#ifndef S_ISLNK
-#define lstat stat
-#endif
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
-#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-
-extern char * savedir();
-
-fatal(msg)
-     char *msg;
-{
-    if (errno) perror(msg ? msg : "");
-    else if (msg) fprintf(stderr, "mkshadow: %s\n", msg);
-    exit(-1);
-}
-
-/* When handling symbolic links to relative directories,
- * we need to prepend "../" to the "source".
- * We preallocate MAX_DEPTH repetations of "../" using a simple trick.
- */
-#define MAX_DEPTH 20
-#define PREPEND_BUFFER_SIZE (MAX_DEPTH*3)
-char master_buffer[MAXPATHLEN+PREPEND_BUFFER_SIZE] =
-    "../../../../../../../../../../../../../../../../../../../../";
-/* The logical start of the master_buffer is defined by
- * master_start, which skips the fixed prepend area.
- */
-#define master_start (master_buffer+PREPEND_BUFFER_SIZE)
-char shadow_buffer[MAXPATHLEN];
-
-void bad_args(msg)
-{
-    if (msg) fprintf(stderr, "%s\n", msg);
-    fprintf (stderr, "usage: mkshadow [-X exclude_file] [-x exclude_pattern]");
-    fprintf (stderr, " master [shadow]\n");
-    exit(-1);
-}
-
-int exclude_count = 0;
-char **exclude_patterns = NULL;
-int exclude_limit = 0;
-
-void add_exclude(pattern)
-    char *pattern;
-{
-    if (exclude_limit == 0) {
-	exclude_limit = 100;
-	exclude_patterns = (char**)malloc(exclude_limit * sizeof(char*));
-    } else if (exclude_count + 1 >= exclude_limit) {
-	exclude_limit += 100;
-	exclude_patterns = (char**)realloc(exclude_patterns, 
-					   exclude_limit * sizeof(char*));
-    }
-    exclude_patterns[exclude_count] = pattern;
-    exclude_count++;
-}
-
-void add_exclude_file(name)
-     char *name;
-{
-    char buf[MAXPATHLEN];
-    FILE *file = fopen(name, "r");
-    if (file == NULL) fatal("failed to find -X (exclude) file");
-    for (;;) {
-	int len;
-	char *str = fgets(buf, MAXPATHLEN, file);
-	if (str == NULL) break;
-	len = strlen(str);
-	if (len && str[len-1] == '\n') str[--len] = 0;
-	if (!len) continue;
-	str = (char*)malloc(len+1);
-	strcpy(str, buf);
-	add_exclude(str);
-    }
-    fclose(file);
-}
-
-main(argc, argv)
-     char **argv;
-{
-    char *master_name = NULL;
-    char *shadow_name = NULL;
-    int i;
-    for (i = 1; i < argc; i++) {
-	if (argv[i][0] == '-') {
-	    switch(argv[i][1]) {
-	      case 'X':
-		if (argv[i][2]) add_exclude_file(&argv[i][2]);
-		else if (++i >= argc) bad_args(NULL);
-		else add_exclude_file(argv[i]);
-		break;
-	      case 'x':
-		if (argv[i][2]) add_exclude(&argv[i][2]);
-		else if (++i >= argc) bad_args(NULL);
-		else add_exclude(argv[i]);
-		break;
-	      default:
-		bad_args(NULL);
-	    }
-	} else if (master_name == NULL)
-	    master_name = argv[i];
-	else if (shadow_name == NULL)
-	    shadow_name = argv[i];
-	else bad_args (NULL);
-    }
-
-    if (master_name == NULL) bad_args(NULL);
-    if (shadow_name == NULL)
-	shadow_name = ".";
-    else if ((shadow_name[0] != '.' || shadow_name[1])
-	     && master_name[0] != '/') {
-	fprintf(stderr, "Shadowing a relative directory pathname to a \n");
-	fprintf(stderr, "shadow other than '.' is not supported!\n");
-	exit(-1);
-    }
-    strcpy(shadow_buffer, shadow_name);
-    strcpy(master_start, master_name);
-    DoCopy(master_start, shadow_buffer, 0);
-    return 0;
-}
-
-int compare_strings(ptr1, ptr2)
-     char **ptr1, **ptr2;
-{
-    return strcmp(*ptr1, *ptr2);
-}
-
-void MakeLink(master, current, depth)
-     char *master;
-     char *current;
-     int depth;
-{
-    if (master[0] != '/') {
-	/* Source directory was specified with a relative pathname. */
-	if (master != master_start) {
-	    fatal("Internal bug: bad string buffer use");
-	}
-	/* Pre-pend "../" depth times. This compensates for
-	 * the directories we've entered. */
-	master -= 3 * depth;
-    }
-    if (symlink(master, current)) {
-	fprintf(stderr, "Failed to create symbolic link %s->%s\n",
-		current, master);
-	exit (-1);
-    }
-}
-
-
-/* Get a sorted NULL_terminator array of (char*) using 'names'
- * (created by save_dir) as data.
- */
-char ** get_name_pointers(names)
-     char *names;
-{
-    int n_names = 0;
-    int names_buf_size = 64;
-    char *namep;
-    char ** pointers = (char**)malloc(names_buf_size * sizeof(char*));
-    if (!names || !pointers) fatal("virtual memory exhausted");
-
-    for (namep = names; *namep; namep += strlen(namep) + 1) {
-	if (n_names + 1 >= names_buf_size) {
-	    names_buf_size *= 2;
-	    pointers = (char**)realloc(pointers,
-				       names_buf_size * sizeof(char*));
-	    if (!pointers) fatal("virtual memory exhausted");
-	}
-	pointers[n_names++] = namep;
-    }
-    pointers[n_names] = 0;
-    qsort(pointers, n_names, sizeof(char*), compare_strings);
-    return pointers;
-}
-
-/* Recursively shadow the directory whose name is in MASTER
- * (which is == MASTER_START) into the destination directory named CURRENT.
- */
-
-DoCopy(master, current, depth)
-     char *master; /* The source directory. */
-     char *current; /* The destination directory. */
-     int depth;
-{
-    struct stat stat_master, stat_current;
-    char **master_pointer, **current_pointer;
-    char **master_names, **current_names;
-    char *master_end, *current_end;
-    char *master_name_buf, *current_name_buf;
-    master_end = master + strlen(master);
-    current_end = current + strlen(current);
-
-    /* Get rid of terminal '/' */
-    if (master_end[-1] == '/' && master != master_end - 1)
-	*--master_end = 0;
-    if (current_end[-1] == '/' && current != current_end - 1)
-	*--current_end = 0;
-
-    if (depth >= MAX_DEPTH) {
-	fprintf(stderr,
-		"Nesting too deep (depth %d at %s). Probable circularity.\n",
-		depth, master);
-	exit(-1);
-    }
-
-    master_name_buf = savedir(master, 500);
-    if (master_name_buf == NULL) {
-	fprintf(stderr, "Not enough memory or no such directory: %s\n",
-		master);
-	exit(-1);
-    }
-    current_name_buf = savedir(current, 500);
-    if (current_name_buf == NULL) {
-	fprintf(stderr, "Not enough memory or no such directory: %s\n",
-		current);
-	exit(-1);
-    }
-
-    master_names = get_name_pointers(master_name_buf);
-    current_names = get_name_pointers(current_name_buf);
-
-    master_pointer = master_names;
-    current_pointer = current_names;
-    for (;;) {
-	int cmp, ipat;
-	int in_master, in_current;
-	char *cur_name;
-	if (*master_pointer == NULL && *current_pointer == NULL)
-	    break;
-	if (*master_pointer == NULL) cmp = 1;
-	else if (*current_pointer == NULL) cmp = -1;
-	else cmp = strcmp(*master_pointer, *current_pointer);
-	if (cmp < 0) { /* file only exists in master directory */
-	    in_master = 1; in_current = 0;
-	} else if (cmp == 0) { /* file exists in both directories */
-	    in_master = 1; in_current = 1;
-	} else { /* file only exists in current directory */
-	    in_current = 1; in_master = 0;
-	}
-	cur_name = in_master ? *master_pointer : *current_pointer;
-	sprintf(master_end, "/%s", cur_name);
-	sprintf(current_end, "/%s", cur_name);
-	for (ipat = 0; ipat < exclude_count; ipat++) {
-	    char *pat = exclude_patterns[ipat];
-	    char *cur;
-	    if (strchr(pat, '/')) cur = current + 2; /* Skip initial "./" */
-	    else cur = cur_name;
-	    if (wildmat(cur, pat)) goto skip;
-	}
-	if (in_master)
-	    if (lstat(master, &stat_master) != 0) fatal("stat failed");
-	if (in_current)
-	    if (lstat(current, &stat_current) != 0) fatal("stat failed");
-	if (in_current && !in_master) {
-	    if (S_ISLNK(stat_current.st_mode))
-		if (unlink(current)) {
-		    fprintf(stderr, "Failed to remove symbolic link %s.\n",
-			    current);
-		}
-		else
-		    fprintf(stderr, "Removed symbolic link %s.\n",
-			    current);
-	    else {
-		fprintf(stderr,
-			"The file %s does not exist in the master tree.\n",
-			current);
-	    }
-	}
-	else if (S_ISDIR(stat_master.st_mode)
-		 && strcmp(cur_name, "RCS") != 0
-		 && strcmp(cur_name, "SCCS") != 0) {
-	    if (!in_current) {
-		if (mkdir(current, 0775)) fatal("mkdir failed");
-	    }
-	    else if (stat(current, &stat_current)) fatal("stat failed");
-	    if (!in_current || stat_current.st_dev != stat_master.st_dev
-		|| stat_current.st_ino != stat_master.st_ino)
-		DoCopy(master, current, depth+1);
-	    else
-		fprintf(stderr, "Link %s is the same as directory %s.\n",
-			current, master);
-	}
-	else {
-	    if (!in_current)
-		MakeLink(master, current, depth);
-	    else if (!S_ISLNK(stat_current.st_mode)) {
-		fprintf(stderr, "Existing file %s is not a symbolc link.\n",
-			current);
-	    } else {
-		if (stat(current, &stat_current) || stat(master, &stat_master))
-		    fatal("stat failed");
-		if (stat_current.st_dev != stat_master.st_dev
-		    || stat_current.st_ino != stat_master.st_ino) {
-		    fprintf(stderr, "Fixing incorrect symbolic link %s.\n",
-			    current);
-		    if (unlink(current)) {
-			fprintf(stderr, "Failed to remove symbolic link %s.\n",
-				current);
-		    }
-		    else
-			MakeLink(master, current, depth);
-		}
-	    }
-	}
-      skip:
-	if (in_master) master_pointer++;
-	if (in_current) current_pointer++;
-    }
-
-    free(master_names); free(current_names);
-    free(master_name_buf); free(current_name_buf);
-}
--- a/Xvnc/config/util/mkshadow/savedir.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/* $XConsortium: savedir.c,v 1.1 94/04/13 18:26:54 rws Exp $ */
-/* savedir.c -- save the list of files in a directory in a string
-   Copyright 1990, 1993 Free Software Foundation, Inc.
-
-   Permission to use, copy, modify, and distribute this program for
-   any purpose and without fee is hereby granted, provided that this
-   copyright and permission notice appear on all copies, and that
-   notice be given that copying and distribution is by permission of
-   the Free Software Foundation.  The Free Software Foundation makes
-   no representations about the suitability of this software for any
-   purpose.  It is provided "as is" without expressed or implied
-   warranty.
-
-   (The FSF has modified its usual distribution terms, for this file,
-   as a courtesy to the X project.)  */
-
-/* Written by David MacKenzie <djm@ai.mit.edu>.
-   Modified to use <dirent.h> by default.  Per Bothner <bothner@cygnus.com>. */
-
-#include <sys/types.h>
-#if !defined(DIRECT) && !defined(BSD)
-#include <dirent.h>
-#define NLENGTH(direct) (strlen((direct)->d_name))
-#else
-#undef dirent
-#define dirent direct
-#define NLENGTH(direct) ((direct)->d_namlen)
-#ifdef BSD
-#include <sys/dir.h>
-#else
-#ifdef SYSNDIR
-#include <sys/ndir.h>
-#else
-#include <ndir.h>
-#endif
-#endif
-#endif
-
-#if defined(VOID_CLOSEDIR) || defined(BSD)
-/* Fake a return value. */
-#define CLOSEDIR(d) (closedir (d), 0)
-#else
-#define CLOSEDIR(d) closedir (d)
-#endif
-
-#ifdef STDC_HEADERS
-#include <stdlib.h>
-#include <string.h>
-#else
-char *malloc ();
-char *realloc ();
-int strlen ();
-#ifndef NULL
-#define NULL 0
-#endif
-#endif
-
-char *stpcpy ();
-
-/* Return a freshly allocated string containing the filenames
-   in directory DIR, separated by '\0' characters;
-   the end is marked by two '\0' characters in a row.
-   NAME_SIZE is the number of bytes to initially allocate
-   for the string; it will be enlarged as needed.
-   Return NULL if DIR cannot be opened or if out of memory. */
-
-char *
-savedir (dir, name_size)
-     char *dir;
-     unsigned name_size;
-{
-  DIR *dirp;
-  struct dirent *dp;
-  char *name_space;
-  char *namep;
-
-  dirp = opendir (dir);
-  if (dirp == NULL)
-    return NULL;
-
-  name_space = (char *) malloc (name_size);
-  if (name_space == NULL)
-    {
-      closedir (dirp);
-      return NULL;
-    }
-  namep = name_space;
-
-  while ((dp = readdir (dirp)) != NULL)
-    {
-      /* Skip "." and ".." (some NFS filesystems' directories lack them). */
-      if (dp->d_name[0] != '.'
-	  || (dp->d_name[1] != '\0'
-	      && (dp->d_name[1] != '.' || dp->d_name[2] != '\0')))
-	{
-	  unsigned size_needed = (namep - name_space) + NLENGTH (dp) + 2;
-
-	  if (size_needed > name_size)
-	    {
-	      char *new_name_space;
-
-	      while (size_needed > name_size)
-		name_size += 1024;
-
-	      new_name_space = realloc (name_space, name_size);
-	      if (new_name_space == NULL)
-		{
-		  closedir (dirp);
-		  return NULL;
-		}
-	      namep += new_name_space - name_space;
-	      name_space = new_name_space;
-	    }
-	  strcpy (namep, dp->d_name);
-	  namep += strlen (namep) + 1;
-	}
-    }
-  *namep = '\0';
-  if (CLOSEDIR (dirp))
-    {
-      free (name_space);
-      return NULL;
-    }
-  return name_space;
-}
--- a/Xvnc/config/util/mkshadow/wildmat.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/* $XConsortium: wildmat.c,v 1.2 94/04/13 18:40:59 rws Exp $ */
-/*
-**
-**  Do shell-style pattern matching for ?, \, [], and * characters.
-**  Might not be robust in face of malformed patterns; e.g., "foo[a-"
-**  could cause a segmentation violation.  It is 8bit clean.
-**
-**  Written by Rich $alz, mirror!rs, Wed Nov 26 19:03:17 EST 1986.
-**  Rich $alz is now <rsalz@bbn.com>.
-**  April, 1991:  Replaced mutually-recursive calls with in-line code
-**  for the star character.
-**
-**  Special thanks to Lars Mathiesen <thorinn@diku.dk> for the ABORT code.
-**  This can greatly speed up failing wildcard patterns.  For example:
-**	pattern: -*-*-*-*-*-*-12-*-*-*-m-*-*-*
-**	text 1:	 -adobe-courier-bold-o-normal--12-120-75-75-m-70-iso8859-1
-**	text 2:	 -adobe-courier-bold-o-normal--12-120-75-75-X-70-iso8859-1
-**  Text 1 matches with 51 calls, while text 2 fails with 54 calls.  Without
-**  the ABORT, then it takes 22310 calls to fail.  Ugh.  The following
-**  explanation is from Lars:
-**  The precondition that must be fulfilled is that DoMatch will consume
-**  at least one character in text.  This is true if *p is neither '*' nor
-**  '\0'.)  The last return has ABORT instead of FALSE to avoid quadratic
-**  behaviour in cases like pattern "*a*b*c*d" with text "abcxxxxx".  With
-**  FALSE, each star-loop has to run to the end of the text; with ABORT
-**  only the last one does.
-**
-**  Once the control of one instance of DoMatch enters the star-loop, that
-**  instance will return either TRUE or ABORT, and any calling instance
-**  will therefore return immediately after (without calling recursively
-**  again).  In effect, only one star-loop is ever active.  It would be
-**  possible to modify the code to maintain this context explicitly,
-**  eliminating all recursive calls at the cost of some complication and
-**  loss of clarity (and the ABORT stuff seems to be unclear enough by
-**  itself).  I think it would be unwise to try to get this into a
-**  released version unless you have a good test data base to try it out
-**  on.
-*/
-
-#define TRUE			1
-#define FALSE			0
-#define ABORT			-1
-
-
-    /* What character marks an inverted character class? */
-#define NEGATE_CLASS		'^'
-    /* Is "*" a common pattern? */
-#define OPTIMIZE_JUST_STAR
-    /* Do tar(1) matching rules, which ignore a trailing slash? */
-#undef MATCH_TAR_PATTERN
-
-
-/*
-**  Match text and p, return TRUE, FALSE, or ABORT.
-*/
-static int
-DoMatch(text, p)
-    register char	*text;
-    register char	*p;
-{
-    register int	last;
-    register int	matched;
-    register int	reverse;
-
-    for ( ; *p; text++, p++) {
-	if (*text == '\0' && *p != '*')
-	    return ABORT;
-	switch (*p) {
-	case '\\':
-	    /* Literal match with following character. */
-	    p++;
-	    /* FALLTHROUGH */
-	default:
-	    if (*text != *p)
-		return FALSE;
-	    continue;
-	case '?':
-	    /* Match anything. */
-	    continue;
-	case '*':
-	    while (*++p == '*')
-		/* Consecutive stars act just like one. */
-		continue;
-	    if (*p == '\0')
-		/* Trailing star matches everything. */
-		return TRUE;
-	    while (*text)
-		if ((matched = DoMatch(text++, p)) != FALSE)
-		    return matched;
-	    return ABORT;
-	case '[':
-	    reverse = p[1] == NEGATE_CLASS ? TRUE : FALSE;
-	    if (reverse)
-		/* Inverted character class. */
-		p++;
-	    for (last = 0400, matched = FALSE; *++p && *p != ']'; last = *p)
-		/* This next line requires a good C compiler. */
-		if (*p == '-' ? *text <= *++p && *text >= last : *text == *p)
-		    matched = TRUE;
-	    if (matched == reverse)
-		return FALSE;
-	    continue;
-	}
-    }
-
-#ifdef	MATCH_TAR_PATTERN
-    if (*text == '/')
-	return TRUE;
-#endif	/* MATCH_TAR_ATTERN */
-    return *text == '\0';
-}
-
-
-/*
-**  User-level routine.  Returns TRUE or FALSE.
-*/
-int
-wildmat(text, p)
-    char	*text;
-    char	*p;
-{
-#ifdef	OPTIMIZE_JUST_STAR
-    if (p[0] == '*' && p[1] == '\0')
-	return TRUE;
-#endif	/* OPTIMIZE_JUST_STAR */
-    return DoMatch(text, p) == TRUE;
-}
-
-
-
-#ifdef	TEST
-#include <stdio.h>
-
-/* Yes, we use gets not fgets.  Sue me. */
-extern char	*gets();
-
-
-main()
-{
-    char	 p[80];
-    char	 text[80];
-
-    printf("Wildmat tester.  Enter pattern, then strings to test.\n");
-    printf("A blank line gets prompts for a new pattern; a blank pattern\n");
-    printf("exits the program.\n");
-
-    for ( ; ; ) {
-	printf("\nEnter pattern:  ");
-	(void)fflush(stdout);
-	if (gets(p) == NULL || p[0] == '\0')
-	    break;
-	for ( ; ; ) {
-	    printf("Enter text:  ");
-	    (void)fflush(stdout);
-	    if (gets(text) == NULL)
-		exit(0);
-	    if (text[0] == '\0')
-		/* Blank line; go back and get a new pattern. */
-		break;
-	    printf("      %s\n", wildmat(text, p) ? "YES" : "NO");
-	}
-    }
-
-    exit(0);
-    /* NOTREACHED */
-}
-#endif	/* TEST */
--- a/Xvnc/config/util/os2inst.cmd
+++ /dev/null
@@ -1,50 +0,0 @@
-/* OS/2 REXX SCRIPT */
-
-/* $XFree86: xc/config/util/os2inst.cmd,v 3.1 1996/02/19 12:16:52 dawes Exp $
- *
- * This is a wrapper for the install command. As any utility, 
- * install could have been lifted from the BSD sources, but I just wanted
- * to play with Rexx a bit :-)  (hv)
- * Note the similarity to the Unix shell scripts
- */
-
-dst=""
-src=""
-
-'@ECHO OFF'
-PARSE ARG all
-DO i=1 TO WORDS(all)
-	w = WORD(all,i)
-	SELECT
-	WHEN w = "-c" THEN NOP
-	WHEN w = "-m" THEN
-		i = i + 1
-		/* ignore mode */
-	WHEN w = "-o" THEN
-		i = i + 1
-		/* ignore owner */
-	WHEN w = "-g" THEN
-		i = i + 1
-		/* ignore group */
-	WHEN w = "-s" THEN NOP
-	OTHERWISE
-		IF src = "" THEN
-			src = w
-		ELSE
-			dst = w
-	END
-END
-
-IF src = "" THEN DO
-	SAY "os2inst:  no input file specified"
-	EXIT 1
-END
-
-IF dst = "" THEN DO
-	SAY "os2inst:  no destination specified"
-	EXIT 1
-END
-
-ADDRESS CMD 'copy' src dst '> nul'
-
-EXIT
--- a/Xvnc/config/util/remove.cmd
+++ /dev/null
@@ -1,14 +0,0 @@
-/* OS/2 REXX script to remove cleaned files
- * run with 'remove dirlist_file'
- * where dirlist_file is be a XFree86 removed-* file
- *
- * $XFree86: xc/config/util/remove.cmd,v 3.0 1994/10/20 06:01:04 dawes Exp $
- */
-'@echo off'
-file = arg(1)
-linein(file,1,0)
-curdir = directory()
-do while lines(file)=1
-  fs = translate(linein(file),'\','/')
-  del fs
-end
--- a/Xvnc/config/util/syminst.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-#
-# syminst - install with a symbolic link back to the build tree
-#
-
-# set DOITPROG to echo to test this script
-
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-lnprog="${LNPROG-ln -s}"
-rmprog="${RMPROG-rm}"
-
-instcmd="$lnprog"
-rmcmd="$rmprog -f"
-srcdir=`pwd`/
-src=""
-dst=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) shift
-	    continue;;
-
-	-m) shift
-	    shift
-	    continue;;
-
-	-o) shift
-	    shift
-	    continue;;
-
-	-g) shift
-	    shift
-	    continue;;
-
-	-s) shift
-	    continue;;
-
-	-DIR) srcdir=`echo $2 | sed 's;/\./;/;g'`/
-	      shift
-              shift
-              continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "syminst:  no input file specified"
-	exit 1
-fi
-
-if [ x"$dst" = x ]
-then
-	echo "syminst:  no destination specified"
-	exit 1
-fi
-
-
-# if destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-if [ -d $dst ]
-then
-	dst="$dst"/`basename $src`
-fi
-
-case $src in
-    /*) srcdir=""
-	instcmd=cp;;
-esac
-
-# get rid of the old one and mode the new one in
-
-$doit $rmcmd $dst
-$doit $instcmd $srcdir$src $dst
-
-exit 0
--- a/Xvnc/config/util/x11mf.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# 
-# generate a Makefile within the build tree
-# 
-# usage:  x11mf [treedir]
-# 
-
-if [ x$1 != x ]; then
-	tree=$1
-else
-	tree=/x11
-fi
-
-dir=`pwd`
-top=`(cd $tree; /bin/pwd)`
-intree=no
-
-case $dir in
-	$top*)	intree=yes;;
-esac
-
-if [ $intree != yes ]; then
-	echo "$0:  Must be underneath $tree"
-	exit 1
-fi
-
-(cd ..; make SUBDIRS=`basename $dir` Makefiles)
--- a/Xvnc/config/util/xmake.cmd
+++ /dev/null
@@ -1,5 +0,0 @@
-/* REXX */
-/* $XFree86: xc/config/util/xmake.cmd,v 3.1 1996/03/10 11:50:47 dawes Exp $ */
-'@echo off'
-PARSE ARG a1 a2 a3 a4 a5 a6 a7 a8 a9 a10
-x11make.exe 'MAKE=x11make.exe SHELL=' a1 a2 a3 a4 a5 a6 a7 a8 a9 a10
--- a/Xvnc/config/util/xmkmf.cmd
+++ /dev/null
@@ -1,81 +0,0 @@
-/* OS/2 REXX */
-/* make a Makefile from an Imakefile from inside or outside the sources
- * 
- * $XFree86: xc/config/util/xmkmf.cmd,v 3.1 1996/04/15 11:14:27 dawes Exp $
- */
-'@ECHO OFF'
-
-/* this is actually used here */
-x11root = getenv('X11ROOT')
-
-/* these ones are checked only, because later scripts rely on their existance */
-libpath = getenv('LIBRARY_PATH')
-incpath = getenv('C_INCLUDE_PATH')
-
-/* get args */
-PARSE ARG arg0 arg1 arg2 arg3
-
-/* from here almost everything is the same as in the xmkmf sh script */
-topdir = ''
-curdir = '.'
-do_all = 0
-
-IF arg0 = '-a' THEN DO
-	do_all = 1
-	arg0 = arg1
-	arg1 = arg2
-	arg2 = arg3
-END
-ELSE DO
-	do_all = 0
-END
-
-IF \(arg0 = '') THEN DO
-	IF \(arg1 = '') THEN
-		curdir = arg1
-	topdir = arg0
-END
-IF \(arg2 = '') | SUBSTR(topdir,1,1) = '-' THEN DO
-	SAY 'usage:  xmkmf [-a] [top_of_sources_pathname [current_directory]]'
-	EXIT
-END
-
-IF exists('Makefile') THEN DO
-	SAY 'mv -f Makefile Makefile.bak'
-	'COPY Makefile Makefile.bak >nul 2>&1'
-	'DEL Makefile >nul 2>&1'
-END
-
-IF topdir = '' THEN
-	iargs = '-DUseInstalled -I'x11root'/XFree86/lib/X11/config'
-ELSE
-	iargs = '-I'topdir'/config/cf -DTOPDIR='topdir' -DCURDIR='curdir
-
-SAY 'imake 'iargs
-IF do_all = 1 THEN DO
-	'imake 'iargs
-	SAY 'make Makefiles'
-	CALL make 'Makefiles'
-	SAY 'make includes'
-	CALL make 'includes'
-	SAY 'make depend'
-	CALL make 'depend'
-END
-ELSE
-	'imake 'iargs
-
-EXIT
-
-exists:
-'DIR "'ARG(1)'" > nul 2>nul'
-IF rc = 0 THEN RETURN 1
-RETURN 0
-
-getenv:
-x = VALUE(ARG(1),,'OS2ENVIRONMENT')
-
-IF x = '' THEN DO
-	SAY 'No 'ARG(1)' environment variable set!'
-	EXIT
-END
-RETURN x
--- a/Xvnc/config/util/xmkmf.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-XCOMM!/bin/sh
-
-XCOMM
-XCOMM make a Makefile from an Imakefile from inside or outside the sources
-XCOMM 
-XCOMM $XConsortium: xmkmf.cpp /main/22 1996/09/28 16:17:05 rws $
-
-usage="usage:  $0 [-a] [top_of_sources_pathname [current_directory]]"
-
-configdirspec=CONFIGDIRSPEC
-topdir=
-curdir=.
-do_all=
-
-case "$1" in
--a)
-    do_all="yes"
-    shift
-    ;;
-esac
-
-case $# in 
-    0) ;;
-    1) topdir=$1 ;;
-    2) topdir=$1  curdir=$2 ;;
-    *) echo "$usage" 1>&2; exit 1 ;;
-esac
-
-case "$topdir" in
-    -*) echo "$usage" 1>&2; exit 1 ;;
-esac
-
-if [ -f Makefile ]; then 
-    echo mv -f Makefile Makefile.bak
-    mv -f Makefile Makefile.bak
-fi
-
-if [ "$topdir" = "" ]; then
-    args="-DUseInstalled "$configdirspec
-else
-    args="-I$topdir/config/cf -DTOPDIR=$topdir -DCURDIR=$curdir"
-fi
-
-echo imake $args
-case "$do_all" in
-yes)
-    imake $args && 
-    echo "make Makefiles" &&
-    make Makefiles &&
-    echo "make includes" &&
-    make includes &&
-    echo "make depend" &&
-    make depend
-    ;;
-*)
-    imake $args
-    ;;
-esac
--- a/Xvnc/config/util/xmkmf.man
+++ /dev/null
@@ -1,87 +0,0 @@
-.\" $XConsortium: xmkmf.man /main/8 1996/09/28 16:17:10 rws $
-.\" Copyright (c) 1993, 1994  X Consortium
-.\" 
-.\" 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, sublicense, 
-.\" and/or sell copies of the Software, and to permit persons to whom the 
-.\" Software furnished to do so, subject to the following conditions:
-.\" 
-.\" The above copyright notice and this permission notice shall be included in
-.\" all copies or substantial portions of the Software.
-.\" 
-.\" 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.  IN NO EVENT SHALL 
-.\" THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
-.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF 
-.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-.\" SOFTWARE.
-.\" 
-.\" Except as contained in this notice, the name of the X Consortium shall not 
-.\" be used in advertising or otherwise to promote the sale, use or other 
-.\" dealing in this Software without prior written authorization from the 
-.\" X Consortium.
-.TH XMKMF 1 "Release 6.1" "X Version 11"
-.SH NAME
-xmkmf \- create a Makefile from an Imakefile
-.SH SYNOPSIS
-.B xmkmf
-[ -a ] [
-.I topdir
-[
-.I curdir
-] ]
-.SH DESCRIPTION
-The
-.I xmkmf
-command is the normal way to create a
-.I Makefile 
-from an
-.I Imakefile
-shipped with third-party software.
-.PP
-When invoked with no arguments in a directory containing an
-.I Imakefile,
-the
-.I imake
-program is run with arguments appropriate for your system
-(configured into
-.I xmkmf
-when X was built) and generates a
-.I Makefile.
-.PP
-When invoked with the
-.I \-a
-option,
-.I xmkmf
-builds the
-.I Makefile
-in the current directory, and then automatically executes
-``make Makefiles'' (in case there are subdirectories),
-``make includes'',
-and ``make depend'' for you.
-This is the normal way to configure software that is outside
-the X Consortium build tree.
-.PP
-If working inside the X Consortium build tree (unlikely unless you 
-are an X developer, and even then this option is never really used), the
-.I topdir
-argument should be specified as the relative pathname from the
-current directory to the top of the build tree.  Optionally,
-.I curdir
-may be specified as a relative pathname from the top of the build
-tree to the current directory.  It is necessary to supply
-.I curdir
-if the current directory has subdirectories, or the
-.I Makefile
-will not be able to build the subdirectories.
-If a
-.I topdir
-is given,
-.I xmkmf
-assumes nothing is installed on your system and looks for files in
-the build tree instead of using the installed versions.
-.SH "SEE ALSO"
-imake(1)
--- a/Xvnc/configure
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-# configure
-#
-# This script sets up for a build.  It has been tested on the following
-# Operating System versions (uname outputs):
-#
-#    Solaris 7 & 8 (SunOS, 5.7 or 5.8)
-#    Tru64 4.0F & 5.1 (OSF1, V4.0 or V5.1)
-#    Linux 2.4 (Linux, 2.4.0-4GB)
-#    Irix 6.2 (IRIX, 6.2)
-
-SYSNAME=`uname -s`
-
-if [ "$SYSNAME" = AIX ]
-then
-    MAJOR=`uname -v`
-    MINOR=`uname -r`
-    TEENY=0
-else
-    REV=`uname -r`
-
-    if [ "$SYSNAME" = HP-UX ]
-    then
-        REV=`echo $REV | sed -e 's/^[^.]*\.//'`
-    else
-        if [ "$SYSNAME" != Darwin ]
-        then
-            REV=`echo $REV | sed -e 's/^V//' -e 's/-.*$//'`
-        fi
-    fi
-
-    MAJOR=`echo $REV | awk -F. 'NF < 1 {print "0"} {print $1}'`
-    MINOR=`echo $REV | awk -F. 'NF < 2 {print "0"} {print $2}'`
-    TEENY=`echo $REV | awk -F. 'NF < 3 {print "0"} {print $3}'`
-fi
-
-echo "#define OSName $SYSNAME" > config/cf/platform.def
-echo "#define OSMajorVersion $MAJOR" >> config/cf/platform.def
-echo "#define OSMinorVersion $MINOR" >> config/cf/platform.def
-echo "#define OSTeenyVersion $TEENY" >> config/cf/platform.def
-echo "#define LinuxCLibMajorVersion 6" >> config/cf/platform.def
-
-if [ "$SYSNAME" = AIX ]
-then
-#  xmkmf and imake are broken on AIX
-    cd config/imake
-    imake -I../cf -DTOPDIR=../.. -DCURDIR=.
-    make Makefiles
-    make includes
-    make depend
-    make
-    cd ../..
-    imake -I./config/cf -DTOPDIR=./ -DCURDIR=.
-    make Makefiles
-    make includes
-    make depend
-else
-    cd config/imake
-    xmkmf ../../
-    make
-    cd ../..
-    xmkmf -a ./
-fi
-
-exit 0
--- a/Xvnc/include/Imakefile
+++ /dev/null
@@ -1,57 +0,0 @@
-XCOMM $TOG: Imakefile /main/93 1997/06/13 15:34:58 kaleb $
-
-
-
-
-XCOMM $XFree86: xc/include/Imakefile,v 3.9.2.1 1997/06/15 07:25:25 dawes Exp $
-#define IHaveSubdirs
-#define PassCDebugFlags /**/
-
-SUBDIRS = bitmaps extensions fonts
-
-#ifdef Win32Architecture
-EXTRA_HEADERS = Xw32defs.h Xwinsock.h
-#endif
-
-HEADERS = DECkeysym.h \
-	HPkeysym.h \
-	Sunkeysym.h \
-	X.h \
-	XWDFile.h \
-	Xalloca.h \
-	Xatom.h \
-	Xfuncproto.h \
-	Xfuncs.h \
-	Xmd.h \
-	Xos.h \
-	Xos_r.h \
-	Xosdefs.h \
-	Xpoll.h \
-	Xproto.h \
-	Xprotostr.h \
-	Xthreads.h \
-	ap_keysym.h \
-	keysym.h \
-	keysymdef.h \
-	$(EXTRA_HEADERS)
-
-all::
-
-BuildIncludes($(HEADERS),X11,..)
-
-InstallMultipleFlags($(HEADERS),$(INCDIR)/X11,$(INSTINCFLAGS))
-MakeSubdirs($(SUBDIRS))
-
-InstallLinkKitNonExecFile(X.h,$(LINKKITDIR)/include/X11)
-InstallLinkKitNonExecFile(Xalloca.h,$(LINKKITDIR)/include/X11)
-InstallLinkKitNonExecFile(Xfuncproto.h,$(LINKKITDIR)/include/X11)
-InstallLinkKitNonExecFile(Xfuncs.h,$(LINKKITDIR)/include/X11)
-InstallLinkKitNonExecFile(Xmd.h,$(LINKKITDIR)/include/X11)
-InstallLinkKitNonExecFile(Xos.h,$(LINKKITDIR)/include/X11)
-InstallLinkKitNonExecFile(Xosdefs.h,$(LINKKITDIR)/include/X11)
-InstallLinkKitNonExecFile(Xproto.h,$(LINKKITDIR)/include/X11)
-InstallLinkKitNonExecFile(Xprotostr.h,$(LINKKITDIR)/include/X11)
-
-depend::
-
-clean::
--- a/Xvnc/include/bitmaps/Imakefile
+++ /dev/null
@@ -1,79 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/32 1996/09/28 16:17:53 rws $
-
-HEADERS = \
-	1x1 \
-	2x2 \
-	black \
-	boxes \
-	calculator \
-	cntr_ptr \
-	cntr_ptrmsk \
-	cross_weave \
-	dimple1 \
-	dimple3 \
-	dot \
-	dropbar7 \
-	dropbar8 \
-	escherknot \
-	flagdown \
-	flagup \
-	flipped_gray \
-	gray \
-	gray1 \
-	gray3 \
-	grid2 \
-	grid4 \
-	grid8 \
-	grid16 \
-	hlines2 \
-	hlines3 \
-	icon \
-	keyboard16 \
-	left_ptr \
-	left_ptrmsk \
-	letters \
-	light_gray \
-	mailempty \
-	mailemptymsk \
-	mailfull \
-	mailfullmsk \
-	mensetmanus \
-	menu6 \
-	menu8 \
-	menu10 \
-	menu12 \
-	menu16 \
-	noletters \
-	opendot \
-	opendotMask \
-	plaid \
-	right_ptr \
-	right_ptrmsk \
-	root_weave \
-	scales \
-	sipb \
-	star \
-	starMask \
-	stipple \
-	target \
-	terminal \
-	tie_fighter \
-	vlines2 \
-	vlines3 \
-	weird_size \
-	wide_weave \
-	wingdogs \
-	woman \
-	xfd_icon \
-	xlogo11 \
-	xlogo16 \
-	xlogo32 \
-	xlogo64 \
-	xsnow
-
-
-all::
-
-BuildIncludes($(HEADERS),X11/bitmaps,../..)
-
-InstallMultipleFlags($(HEADERS),$(INCDIR)/X11/bitmaps,$(INSTINCFLAGS))
--- a/Xvnc/include/extensions/Imakefile
+++ /dev/null
@@ -1,42 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/46 1996/09/28 16:17:59 rws $
-XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.13 1997/01/12 10:39:14 dawes Exp $
-
-#if BuildScreenSaverLibrary
-SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h
-#endif
-
-#if BuildXF86MiscLibrary
-XF86MISCHEADERS = xf86misc.h xf86mscstr.h
-#endif
-#if BuildXF86VidModeLibrary
-XF86VIDMODEHEADERS = xf86vmode.h xf86vmstr.h
-#endif
-#if BuildXF86DGALibrary
-XF86DGAHEADERS = xf86dga.h xf86dgastr.h
-#endif
-#if BuildLBX
-LBXHEADERS = lbxbuf.h lbxbufstr.h lbxdeltastr.h lbximage.h lbxopts.h lbxstr.h lbxzlib.h
-#endif
-#if BuildDPMSLibrary
-DPMSHEADERS = dpms.h dpmsstr.h
-#endif
-
-EXTRAHEADERS = $(SCREENSAVERHEADERS) $(XF86VIDMODEHEADERS) $(XF86DGAHEADERS) $(XF86MISCHEADERS) $(LBXHEADERS) $(DPMSHEADERS)
-
-
-
-HEADERS = Xext.h multibuf.h shape.h XShm.h MITMisc.h XI.h XInput.h XIproto.h \
-	XTest.h xtestext1.h XIE.h XIEproto.h XIEprotost.h sync.h \
-	XKB.h XKBgeom.h XKBproto.h XKBstr.h XKBsrv.h Xdbe.h Xdbeproto.h \
-	Xag.h Xagstr.h Xagsrv.h \
-	record.h recordstr.h \
-        lbxbuf.h lbxbufstr.h lbxdeltastr.h lbximage.h \
-        lbxopts.h lbxstr.h lbxzlib.h \
-	security.h securstr.h \
-	Print.h Printstr.h $(EXTRAHEADERS)
-
-all::
-
-BuildIncludes($(HEADERS),X11/extensions,../..)
-InstallMultipleFlags($(HEADERS),$(INCDIR)/X11/extensions,$(INSTINCFLAGS))
-InstallLinkKitMultipleDestFlags($(EXTRAHEADERS),$(LINKKITDIR)/include/X11/extensions,$(INSTDATFLAGS))
--- a/Xvnc/include/fonts/Imakefile
+++ /dev/null
@@ -1,14 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/6 1996/09/28 16:32:27 rws $
-XCOMM $XFree86: xc/include/fonts/Imakefile,v 3.3 1996/12/23 05:58:37 dawes Exp $
-
-    HEADERS = FS.h FSproto.h fsmasks.h
-
-all::
-    
-BuildIncludes($(HEADERS),X11/fonts,../..)
-InstallMultipleFlags($(HEADERS),$(INCDIR)/X11/fonts,$(INSTINCFLAGS))
-
-InstallLinkKitNonExecFile(fontstruct.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(font.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(fsmasks.h,$(LINKKITDIR)/include)
-
--- a/Xvnc/lib/Imakefile
+++ /dev/null
@@ -1,80 +0,0 @@
-XCOMM $TOG: Imakefile /main/39 1997/02/26 18:09:44 kaleb $
-XCOMM $XFree86: xc/lib/Imakefile,v 3.17.2.2 1997/07/05 15:55:33 dawes Exp $
-#define IHaveSubdirs
-#define PassCDebugFlags
-
-#ifndef NeedBerklib
-#define NeedBerklib NO
-#endif
-
-#if NeedBerklib
-BERKDIR = Xbsd
-#endif
-
-#if BuildXKBlib
-XKBLIBDIR = xkbfile
-#endif
-
-#if BuildXKBuilib
-XKBUILIBDIR = xkbui
-#endif
-
-#if BuildThreadStubLibrary
-THRSTUBLIB = XThrStub
-#endif
-
-#if BuildScreenSaverLibrary
-SSLIB = Xss
-#endif
-
-#if BuildXF86MiscLibrary
-XF86MISCLIB = Xxf86misc
-#endif
-
-#if BuildXF86VidModeLibrary
-XF86VMLIB = Xxf86vm
-#endif
-
-#if BuildXF86DGALibrary
-XF86DGALIB = Xxf86dga
-#endif
-
-XF86EXTLIBS = $(XF86MISCLIB) $(XF86VMLIB) $(XF86DGALIB)
-
-#if BuildDPMSLibrary
-XDPMSLIBDIR = Xdpms
-#endif
-
-#if BuildLBX
-LBXUTILDIR = lbxutil
-#endif
-
-#if BuildXAudio
-XALIBDIR = Xa
-#endif
-
-FONTSUBDIR = font
-
-#if !BuildServersOnly
-LINTSUBDIRS = Xau Xdmcp $(THRSTUBLIB) X11 oldX ICE SM Xext Xt \
-	     $(SSLIB) $(XF86MISCLIB) $(XF86VMLIB) $(XF86DGALIB) \
-	     Xmu Xaw XIE Xi Xtst FS \
-	     PEX5 $(XKBLIBDIR) $(XKBUILIBDIR) $(LBXUTILDIR) $(XALIBDIR) \
-	     $(XDPMSLIBDIR) \
-	     Xp
-#else
-#if XnestServer
-XEXTDIR = Xext
-#endif
-
-LINTSUBDIRS = Xau Xdmcp X11 $(XEXTDIR) $(XKBLIBDIR) $(XKBUILIBDIR) \
-	      $(LBXUTILDIR) $(XF86EXTLIBS)
-#endif
-
-SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS) $(FONTSUBDIR)
-
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-MakeLintLibSubdirs($(LINTSUBDIRS))
-MakeLintSubdirs($(LINTSUBDIRS),install.ln,install.ln)
-
--- a/Xvnc/lib/X11/Imakefile
+++ /dev/null
@@ -1,989 +0,0 @@
-XCOMM $TOG: Imakefile /main/196 1997/05/20 10:06:09 kaleb $
-
-
-
-
-XCOMM $XFree86: xc/lib/X11/Imakefile,v 3.19.2.2 1997/05/21 15:02:16 dawes Exp $
-#define DoNormalLib NormalLibX11
-#define DoSharedLib SharedLibX11
-#define DoDebugLib DebugLibX11
-#define DoProfileLib ProfileLibX11
-#define LibName X11
-#define SoRev SOXLIBREV
-#define HugeLibrary YES
-#define IncSubdir X11
-
-#include <Threads.tmpl>
-
-#ifndef MotifBC
-#define MotifBC NO
-#endif
-
-#ifdef SharedX11Reqs
-REQUIREDLIBS = SharedX11Reqs
-#endif
-#if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture)
-XBSDLIB = /**/
-#endif
-#if defined(LunaArchitecture) && defined(Mc88000Architecture)
-EXTRA_LIBRARIES = /**/
-#endif
-#if Malloc0ReturnsNull
-     MALLOC_DEFINES = XMalloc0ReturnsNullDefines
-#endif
-#if HasXdmAuth
-        XDMAUTHDEFS = -DHASXDMAUTH
-        XDMAUTHOBJS = Wrap.o Wraphelp.o
-        XDMAUTHSRCS = Wrap.c Wraphelp.c
-#endif
-#if BuildXKBlib
-    XKB_DEFINES = -DXKB 
-        XKBSRCS = XKB.c XKBBind.c XKBCompat.c XKBCtrls.c XKBCvt.c XKBGetMap.c \
-	          XKBGetByName.c XKBNames.c XKBRdBuf.c XKBSetMap.c XKBUse.c \
-		  XKBleds.c XKBBell.c XKBGeom.c XKBSetGeom.c XKBExtDev.c \
-		  XKBList.c XKBMisc.c \
-		  XKBMAlloc.c XKBGAlloc.c XKBAlloc.c
-        XKBOBJS = XKB.o XKBBind.o XKBCompat.o XKBCtrls.o XKBCvt.o XKBGetMap.o \
-		  XKBGetByName.o XKBNames.o XKBRdBuf.o XKBSetMap.o XKBUse.o \
-		  XKBleds.o XKBBell.o XKBGeom.o XKBSetGeom.o XKBExtDev.o \
-		  XKBList.o XKBMisc.o \
-		  XKBMAlloc.o XKBGAlloc.o XKBAlloc.o
-#endif
-#if HasSecureRPC
-        RPCDEFS = -DSECURE_RPC
-#endif
-#if HasPoll
-   POLL_DEFINES = -DUSE_POLL
-#endif
-   CONN_DEFINES = ConnectionFlags
-   XTRANS_X_DEFINES = -DX11_t -DTRANS_CLIENT
-   XTRANS_XIM_DEFINES = -DXIM_t -DTRANS_CLIENT
-#if HasBSD44Sockets
-   SOCK_DEFINES = -DBSD44SOCKETS
-#endif
-     EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/XErrorDB\"
-     KDB_DEFINES = -DKEYSYMDB=\"$(LIBDIR)/XKeysymDB\"
-     CMS_DEFINES = -DXCMSDB=\"$(LIBDIR)/Xcms.txt\"
-#if HasSnprintf
-    MISC_DEFINES = -DHAS_SNPRINTF -DLIBX11
-#endif
-#if MotifBC
-      BC_DEFINES = -DMOTIFBC
-#endif
-#if NoRConst
- RCONST_DEFINES = -DNORCONST
-#endif
-    XLC_DEFINES = -DXLOCALEDIR=\"$(XLOCALEDIR)\"
-#if HasKrb5
-         K5OBJS = k5encode.o
-         K5SRCS = k5encode.c
-         K5INCL = Krb5Includes
-         K5DEFS = Krb5Defines
-#endif
-#if !HasSnprintf
-       MISCSRCS = snprintf.c
-       MISCOBJS = snprintf.o
-#endif
-#if NeedLibInsideFlag
-    LIB_DEFINES = -D_XLIBINT_
-#endif
-        DEFINES = $(MALLOC_DEFINES) $(LIB_DEFINES)
-   OPEN_DEFINES = -I$(EXTINCSRC) $(K5INCL) $(K5DEFS)
- DEPEND_DEFINES = $(OPEN_DEFINES) $(TRANS_INCLUDES) $(CONN_DEFINES) $(THREADS_DEFINES)
-       AUTHOBJS = AuDispose.o AuGetBest.o AuFileName.o AuRead.o
-       AUTHSRCS = AuDispose.c AuGetBest.c AuFileName.c AuRead.c
-           SRCS = $(SRCS1) $(SRCS2) $(SRCS3) /* try *.c if you have trouble */
-        HEADERS = Xlib.h Xresource.h Xutil.h cursorfont.h Xlibint.h \
-			Xcms.h Xlocale.h XKBlib.h
-       LINTLIBS =
-
-SRCS1 = \
-	Context.c \
-	Depths.c \
-	ParseCmd.c \
-	Quarks.c \
-	AllCells.c \
-	AllPlanes.c \
-	AllowEv.c \
-	AutoRep.c \
-	Backgnd.c \
-	BdrWidth.c \
-	Bell.c \
-	Border.c \
-	ChAccCon.c \
-	ChClMode.c \
-	ChActPGb.c \
-	ChCmap.c \
-	ChGC.c \
-	ChKeyCon.c \
-	ChPntCon.c \
-	ChProp.c \
-	ChSaveSet.c \
-	ChWAttrs.c \
-	ChWindow.c \
-	ChkIfEv.c \
-	ChkMaskEv.c \
-	ChkWinEv.c \
-	ChkTypEv.c \
-	ChkTypWEv.c \
-	CirWin.c \
-	CirWinDn.c \
-	CirWinUp.c \
-	ClDisplay.c \
-	Clear.c \
-	ClearArea.c \
-	ConfWind.c \
-	ConnDis.c \
-	ConvSel.c \
-	CopyArea.c \
-	CopyCmap.c \
-	CopyGC.c \
-	CopyPlane.c \
-	CrBFData.c \
-	CrCmap.c \
-	CrCursor.c \
-	CrGC.c \
-	CrGlCur.c \
-	CrPFBData.c \
-	CrPixmap.c \
-	CrWindow.c \
-	Cursor.c \
-	DefCursor.c \
-	DelProp.c \
-	DestSubs.c \
-	DestWind.c \
-	DisName.c \
-	DrArc.c \
-	DrArcs.c \
-	DrLine.c \
-	DrLines.c \
-	DrPoint.c \
-	DrPoints.c \
-	DrRect.c \
-	DrRects.c \
-	DrSegs.c \
-	ErrDes.c \
-	ErrHndlr.c \
-	EvToWire.c \
-	FetchName.c \
-	FillArc.c \
-	FillArcs.c \
-	FillPoly.c \
-	FillRct.c \
-	FillRcts.c \
-	Flush.c \
-	Font.c \
-	FontNames.c \
-	FontInfo.c \
-	FreeCmap.c \
-	FreeCols.c \
-	FreeCurs.c \
-	FreeEData.c \
-	FreeGC.c \
-	FreePix.c \
-	FSSaver.c \
-	GCMisc.c \
-	Geom.c \
-	GetAtomNm.c \
-	GetColor.c \
-	GetDflt.c \
-	GetFPath.c \
-	GetFProp.c \
-	GetGeom.c \
-	GetHColor.c \
-	GetHints.c \
-	GetIFocus.c \
-	GetImage.c \
-	GetKCnt.c \
-	GetMoEv.c \
-	GetPCnt.c \
-	GetPntMap.c \
-	GetProp.c \
-	GetSOwner.c \
-	GetSSaver.c \
-	GetStCmap.c \
-	GetWAttrs.c \
-	GrButton.c \
-	GrKey.c \
-	GrKeybd.c \
-	GrPointer.c \
-	GrServer.c \
-	Host.c \
-	IfEvent.c \
-	ImUtil.c \
-	ImText.c \
-	ImText16.c \
-	InitExt.c \
-	InsCmap.c \
-	IntAtom.c \
-	KeyBind.c \
-	KeysymStr.c \
-	KillCl.c \
-	LiHosts.c \
-	LiICmaps.c \
-	LiProps.c \
-	ListExt.c \
-	LoadFont.c \
-	LookupCol.c \
-	LowerWin.c 
-
-OBJS1 = \
-	Context.o \
-	Depths.o \
-	ParseCmd.o \
-	Quarks.o \
-	AllCells.o \
-	AllPlanes.o \
-	AllowEv.o \
-	AutoRep.o \
-	Backgnd.o \
-	BdrWidth.o \
-	Bell.o \
-	Border.o \
-	ChAccCon.o \
-	ChClMode.o \
-	ChActPGb.o \
-	ChCmap.o \
-	ChGC.o \
-	ChKeyCon.o \
-	ChPntCon.o \
-	ChProp.o \
-	ChSaveSet.o \
-	ChWAttrs.o \
-	ChWindow.o \
-	ChkIfEv.o \
-	ChkMaskEv.o \
-	ChkWinEv.o \
-	ChkTypEv.o \
-	ChkTypWEv.o \
-	CirWin.o \
-	CirWinDn.o \
-	CirWinUp.o \
-	ClDisplay.o \
-	Clear.o \
-	ClearArea.o \
-	ConfWind.o \
-	ConnDis.o \
-	ConvSel.o \
-	CopyArea.o \
-	CopyCmap.o \
-	CopyGC.o \
-	CopyPlane.o \
-	CrBFData.o \
-	CrCmap.o \
-	CrCursor.o \
-	CrGC.o \
-	CrGlCur.o \
-	CrPFBData.o \
-	CrPixmap.o \
-	CrWindow.o \
-	Cursor.o \
-	DefCursor.o \
-	DelProp.o \
-	DestSubs.o \
-	DestWind.o \
-	DisName.o \
-	DrArc.o \
-	DrArcs.o \
-	DrLine.o \
-	DrLines.o \
-	DrPoint.o \
-	DrPoints.o \
-	DrRect.o \
-	DrRects.o \
-	DrSegs.o \
-	ErrDes.o \
-	ErrHndlr.o \
-	EvToWire.o \
-	FetchName.o \
-	FillArc.o \
-	FillArcs.o \
-	FillPoly.o \
-	FillRct.o \
-	FillRcts.o \
-	Flush.o \
-	Font.o \
-	FontNames.o \
-	FontInfo.o \
-	FreeCmap.o \
-	FreeCols.o \
-	FreeCurs.o \
-	FreeEData.o \
-	FreeGC.o \
-	FreePix.o \
-	FSSaver.o \
-	GCMisc.o \
-	Geom.o \
-	GetAtomNm.o \
-	GetColor.o \
-	GetDflt.o \
-	GetFPath.o \
-	GetFProp.o \
-	GetGeom.o \
-	GetHColor.o \
-	GetHints.o \
-	GetIFocus.o \
-	GetImage.o \
-	GetKCnt.o \
-	GetMoEv.o \
-	GetPCnt.o \
-	GetPntMap.o \
-	GetProp.o \
-	GetSOwner.o \
-	GetSSaver.o \
-	GetStCmap.o \
-	GetWAttrs.o \
-	GrButton.o \
-	GrKey.o \
-	GrKeybd.o \
-	GrPointer.o \
-	GrServer.o \
-	Host.o \
-	IfEvent.o \
-	ImUtil.o \
-	ImText.o \
-	ImText16.o \
-	InitExt.o \
-	InsCmap.o \
-	IntAtom.o \
-	KeyBind.o \
-	KeysymStr.o \
-	KillCl.o \
-	LiHosts.o \
-	LiICmaps.o \
-	LiProps.o \
-	ListExt.o \
-	LoadFont.o \
-	LookupCol.o \
-	LowerWin.o 
-
-SRCS2 = \
-	Macros.c \
-	MapRaised.c \
-	MapSubs.c \
-	MapWindow.c \
-	MaskEvent.c \
-	Misc.c \
-	ModMap.c \
-	MoveWin.c \
-	NextEvent.c \
-	OpenDis.c \
-	ParseCol.c \
-	ParseGeom.c \
-	PeekEvent.c \
-	PeekIfEv.c \
-	Pending.c \
-	PmapBgnd.c \
-	PmapBord.c \
-	PolyReg.c \
-	PolyTxt.c \
-	PolyTxt16.c \
-	PutBEvent.c \
-	PutImage.c \
-	QuBest.c \
-	QuColor.c \
-	QuColors.c \
-	QuCurShp.c \
-	QuExt.c \
-	QuKeybd.c \
-	QuPntr.c \
-	QuStipShp.c \
-	QuTextE16.c \
-	QuTextExt.c \
-	QuTileShp.c \
-	QuTree.c \
-	RaiseWin.c \
-	RdBitF.c \
-	RecolorC.c \
-	ReconfWin.c \
-	Region.c \
-	RepWindow.c \
-	RestackWs.c \
-	RotProp.c \
-	ScrResStr.c \
-	SelInput.c \
-	SendEvent.c \
-	SetBack.c \
-	SetCRects.c \
-	SetClMask.c \
-	SetClOrig.c \
-	SetDashes.c \
-	SetFPath.c \
-	SetFont.c \
-	SetFore.c \
-	SetFunc.c \
-	SetHints.c \
-	SetIFocus.c \
-	SetLStyle.c \
-	SetPMask.c \
-	SetPntMap.c \
-	SetSOwner.c \
-	SetSSaver.c \
-	SetState.c \
-	SetStip.c \
-	SetStCmap.c \
-	SetTile.c \
-	SetTSOrig.c \
-	StBytes.c \
-	StColor.c \
-	StColors.c \
-	StNColor.c \
-	StName.c \
-	StrKeysym.c \
-	Sync.c \
-	Synchro.c \
-	Text.c \
-	Text16.c \
-	TextExt.c \
-	TextExt16.c \
-	TrCoords.c \
-	UndefCurs.c \
-	UngrabBut.c \
-	UngrabKbd.c \
-	UngrabKey.c \
-	UngrabPtr.c \
-	UngrabSvr.c \
-	UninsCmap.c \
-	UnldFont.c \
-	UnmapSubs.c \
-	UnmapWin.c \
-	VisUtil.c \
-	WarpPtr.c \
-	WinEvent.c \
-	Window.c \
-	WrBitF.c \
-	XlibAsync.c \
-	XlibInt.c \
-	Xrm.c \
-	evtomask.c \
-	globals.c \
-	GetGCVals.c \
-	GetNrmHint.c \
-	GetRGBCMap.c \
-	GetTxtProp.c \
-	GetWMCMapW.c \
-	GetWMProto.c \
-	Iconify.c \
-	PixFormats.c \
-	PropAlloc.c \
-	ReconfWM.c \
-	SetNrmHint.c \
-	SetRGBCMap.c \
-	SetTxtProp.c \
-	SetWMCMapW.c \
-	SetWMProto.c \
-	StrToText.c \
-	TextToStr.c \
-	Withdraw.c \
-	WMGeom.c \
-	WMProps.c \
-	$(AUTHSRCS) $(XDMAUTHSRCS) $(K5SRCS)
-
-OBJS2 = \
-	Macros.o \
-	MapRaised.o \
-	MapSubs.o \
-	MapWindow.o \
-	MaskEvent.o \
-	Misc.o \
-	ModMap.o \
-	MoveWin.o \
-	NextEvent.o \
-	OpenDis.o \
-	ParseCol.o \
-	ParseGeom.o \
-	PeekEvent.o \
-	PeekIfEv.o \
-	Pending.o \
-	PmapBgnd.o \
-	PmapBord.o \
-	PolyReg.o \
-	PolyTxt.o \
-	PolyTxt16.o \
-	PutBEvent.o \
-	PutImage.o \
-	QuBest.o \
-	QuColor.o \
-	QuColors.o \
-	QuCurShp.o \
-	QuExt.o \
-	QuKeybd.o \
-	QuPntr.o \
-	QuStipShp.o \
-	QuTextE16.o \
-	QuTextExt.o \
-	QuTileShp.o \
-	QuTree.o \
-	RaiseWin.o \
-	RdBitF.o \
-	RecolorC.o \
-	ReconfWin.o \
-	Region.o \
-	RepWindow.o \
-	RestackWs.o \
-	RotProp.o \
-	ScrResStr.o \
-	SelInput.o \
-	SendEvent.o \
-	SetBack.o \
-	SetCRects.o \
-	SetClMask.o \
-	SetClOrig.o \
-	SetDashes.o \
-	SetFPath.o \
-	SetFont.o \
-	SetFore.o \
-	SetFunc.o \
-	SetHints.o \
-	SetIFocus.o \
-	SetLStyle.o \
-	SetPMask.o \
-	SetPntMap.o \
-	SetSOwner.o \
-	SetSSaver.o \
-	SetState.o \
-	SetStip.o \
-	SetStCmap.o \
-	SetTile.o \
-	SetTSOrig.o \
-	StBytes.o \
-	StColor.o \
-	StColors.o \
-	StNColor.o \
-	StName.o \
-	StrKeysym.o \
-	Sync.o \
-	Synchro.o \
-	Text.o \
-	Text16.o \
-	TextExt.o \
-	TextExt16.o \
-	TrCoords.o \
-	UndefCurs.o \
-	UngrabBut.o \
-	UngrabKbd.o \
-	UngrabKey.o \
-	UngrabPtr.o \
-	UngrabSvr.o \
-	UninsCmap.o \
-	UnldFont.o \
-	UnmapSubs.o \
-	UnmapWin.o \
-	VisUtil.o \
-	WarpPtr.o \
-	WinEvent.o \
-	Window.o \
-	WrBitF.o \
-	XlibAsync.o \
-	XlibInt.o \
-	Xrm.o \
-	evtomask.o \
-	globals.o \
-	GetGCVals.o \
-	GetNrmHint.o \
-	GetRGBCMap.o \
-	GetTxtProp.o \
-	GetWMCMapW.o \
-	GetWMProto.o \
-	Iconify.o \
-	PixFormats.o \
-	PropAlloc.o \
-	ReconfWM.o \
-	SetNrmHint.o \
-	SetRGBCMap.o \
-	SetTxtProp.o \
-	SetWMCMapW.o \
-	SetWMProto.o \
-	StrToText.o \
-	TextToStr.o \
-	Withdraw.o \
-	WMGeom.o \
-	WMProps.o \
-	$(AUTHOBJS) \
-	$(XDMAUTHOBJS) \
-	$(K5OBJS)
-
-SRCS3 = \
-	Lab.c \
-	LabGcC.c \
-	LabGcL.c \
-	LabGcLC.c \
-	LabMnL.c \
-	LabMxC.c \
-	LabMxL.c \
-	LabMxLC.c \
-	LabWpAj.c \
-	Luv.c \
-	LuvGcC.c \
-	LuvGcL.c \
-	LuvGcLC.c \
-	LuvMnL.c \
-	LuvMxC.c \
-	LuvMxL.c \
-	LuvMxLC.c \
-	LuvWpAj.c \
-	XYZ.c \
-	uvY.c \
-	xyY.c \
-	HVC.c \
-	HVCGcC.c \
-	HVCGcV.c \
-	HVCGcVC.c \
-	HVCMnV.c \
-	HVCMxC.c \
-	HVCMxV.c \
-	HVCMxVC.c \
-	HVCMxVs.c \
-	HVCWpAj.c \
-	UNDEFINED.c \
-	AddDIC.c \
-	AddSF.c \
-	cmsAllNCol.c \
-	cmsAllCol.c \
-	CCC.c \
-	cmsCmap.c \
-	cmsColNm.c \
-	CvColW.c \
-	CvCols.c \
-	cmsGlobls.c \
-	IdOfPr.c \
-	cmsInt.c \
-	LRGB.c \
-	cmsLkCol.c \
-	cmsMath.c \
-	OfCCC.c \
-	PrOfId.c \
-	cmsProp.c \
-	QBlack.c \
-	QBlue.c \
-	QGreen.c \
-	QRed.c \
-	QWhite.c \
-	QuCol.c \
-	QuCols.c \
-	SetCCC.c \
-	SetGetCols.c \
-	StCol.c \
-	StCols.c \
-	cmsTrig.c \
-	XRGB.c \
-	FSWrap.c \
-	ICWrap.c \
-	IMWrap.c \
-	OCWrap.c \
-	OMWrap.c \
-	lcWrap.c \
-	mbWMProps.c \
-	mbWrap.c \
-	wcWrap.c \
-	FilterEv.c \
-	RegstFlt.c \
-	locking.c \
-	LockDis.c \
-	x11trans.c \
-	ximtrans.c \
-	$(XKBSRCS) $(LCSRCS) $(MISCSRCS)
-
-OBJS3 = \
-	Lab.o \
-	LabGcC.o \
-	LabGcL.o \
-	LabGcLC.o \
-	LabMnL.o \
-	LabMxC.o \
-	LabMxL.o \
-	LabMxLC.o \
-	LabWpAj.o \
-	Luv.o \
-	LuvGcC.o \
-	LuvGcL.o \
-	LuvGcLC.o \
-	LuvMnL.o \
-	LuvMxC.o \
-	LuvMxL.o \
-	LuvMxLC.o \
-	LuvWpAj.o \
-	XYZ.o \
-	uvY.o \
-	xyY.o \
-	HVC.o \
-	HVCGcC.o \
-	HVCGcV.o \
-	HVCGcVC.o \
-	HVCMnV.o \
-	HVCMxC.o \
-	HVCMxV.o \
-	HVCMxVC.o \
-	HVCMxVs.o \
-	HVCWpAj.o \
-	UNDEFINED.o \
-	AddDIC.o \
-	AddSF.o \
-	cmsAllNCol.o \
-	cmsAllCol.o \
-	CCC.o \
-	cmsCmap.o \
-	cmsColNm.o \
-	CvColW.o \
-	CvCols.o \
-	cmsGlobls.o \
-	IdOfPr.o \
-	cmsInt.o \
-	LRGB.o \
-	cmsLkCol.o \
-	cmsMath.o \
-	OfCCC.o \
-	PrOfId.o \
-	cmsProp.o \
-	QBlack.o \
-	QBlue.o \
-	QGreen.o \
-	QRed.o \
-	QWhite.o \
-	QuCol.o \
-	QuCols.o \
-	SetCCC.o \
-	SetGetCols.o \
-	StCol.o \
-	StCols.o \
-	cmsTrig.o \
-	XRGB.o \
-	FSWrap.o \
-	ICWrap.o \
-	IMWrap.o \
-	OCWrap.o \
-	OMWrap.o \
-	lcWrap.o \
-	mbWMProps.o \
-	mbWrap.o \
-	wcWrap.o \
-	FilterEv.o \
-	RegstFlt.o \
-	locking.o \
-	LockDis.o \
-	x11trans.o \
-	ximtrans.o \
-	$(XKBOBJS) $(LCOBJS) $(MISCOBJS)
-
-#ifdef RsArchitecture
-LCDEPSYMSRCS = aixlcLoad.c
-#endif
-#ifdef OS2Architecture
-LCDEPSYMSRCS = os2Stubs.c
-#endif
-
-LCSRCS = \
-	SetLocale.c \
-	$(LCDEPSYMSRCS) \
-	imCallbk.c \
-	imConv.c \
-	imDefFlt.c \
-	imDefIc.c \
-	imDefIm.c \
-	imDefLkup.c \
-	imDispch.c \
-	imEvToWire.c \
-	imExten.c \
-	imImSw.c \
-	imInsClbk.c \
-	imInt.c \
-	imLcFlt.c \
-	imLcGIc.c \
-	imLcIc.c \
-	imLcIm.c \
-	imLcLkup.c \
-	imLcPrs.c \
-	imLcSIc.c \
-	imRm.c \
-	imRmAttr.c \
-	imThaiFlt.c \
-	imThaiIc.c \
-	imThaiIm.c \
-	imTrX.c \
-	imTransR.c \
-	imTrans.c \
-	lcCT.c \
-	lcCharSet.c \
-	lcConv.c \
-	lcDB.c \
-	lcDefConv.c \
-	lcEuc.c \
-	lcFile.c \
-	lcGenConv.c \
-	lcGeneric.c \
-	lcInit.c \
-	lcJis.c \
-	lcPrTxt.c \
-	lcPubWrap.c \
-	lcPublic.c \
-	lcRM.c \
-	lcSjis.c \
-	lcStd.c \
-	lcTxtPr.c \
-	lcUTF.c \
-	lcUtil.c \
-	omDefault.c \
-	omGeneric.c \
-	omImText.c \
-	omText.c \
-	omTextEsc.c \
-	omTextExt.c \
-	omTextPer.c \
-	omXChar.c
-
-/*
-#if defined(SunArchitecture) && defined(HasSharedLibraries)
-LCDEPOBJS = XsunDL.o
-#endif
-*/
-#ifdef RsArchitecture
-LCDEPOBJS = aixlcLoad.o
-#endif
-#ifdef OS2Architecture
-LCDEPOBJS = os2Stubs.o
-#endif
-
-LCOBJS = \
-	SetLocale.o \
-	$(LCDEPOBJS) \
-	imCallbk.o \
-	imConv.o \
-	imDefFlt.o \
-	imDefIc.o \
-	imDefIm.o \
-	imDefLkup.o \
-	imDispch.o \
-	imEvToWire.o \
-	imExten.o \
-	imImSw.o \
-	imInsClbk.o \
-	imInt.o \
-	imLcFlt.o \
-	imLcGIc.o \
-	imLcIc.o \
-	imLcIm.o \
-	imLcLkup.o \
-	imLcPrs.o \
-	imLcSIc.o \
-	imRm.o \
-	imRmAttr.o \
-	imThaiFlt.o \
-	imThaiIc.o \
-	imThaiIm.o \
-	imTrX.o \
-	imTransR.o \
-	imTrans.o \
-	lcCT.o \
-	lcCharSet.o \
-	lcConv.o \
-	lcDB.o \
-	lcDefConv.o \
-	lcEuc.o \
-	lcFile.o \
-	lcGenConv.o \
-	lcGeneric.o \
-	lcInit.o \
-	lcJis.o \
-	lcPrTxt.o \
-	lcPubWrap.o \
-	lcPublic.o \
-	lcRM.o \
-	lcSjis.o \
-	lcStd.o \
-	lcTxtPr.o \
-	lcUTF.o \
-	lcUtil.o \
-	omDefault.o \
-	omGeneric.o \
-	omImText.o \
-	omText.o \
-	omTextEsc.o \
-	omTextExt.o \
-	omTextPer.o \
-	omXChar.o
-
-OBJS = $(OBJS1) $(OBJS2) $(OBJS3)
-
-#if !BuildServersOnly || XnestServer
-#include <Library.tmpl>
-
-SpecialCLibObjectRule(ErrDes,$(ICONFIGFILES),$(EDB_DEFINES))
-SpecialCLibObjectRule(StrKeysym,$(ICONFIGFILES),$(KDB_DEFINES))
-SpecialCLibObjectRule(ConnDis,$(ICONFIGFILES),$(XDMAUTHDEFS) $(RPCDEFS) $(CONN_DEFINES) $(SOCK_DEFINES) $(POLL_DEFINES) $(XTRANS_X_DEFINES) $(K5INCL) $(K5DEFS))
-SpecialCLibObjectRule(x11trans,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_X_DEFINES) $(POLL_DEFINES))
-LinkFile(x11trans.c,$(TRANSCOMMSRC)/transport.c)
-SpecialCLibObjectRule(ximtrans,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_XIM_DEFINES) $(POLL_DEFINES))
-LinkFile(ximtrans.c,$(TRANSCOMMSRC)/transport.c)
-SpecialCLibObjectRule(OpenDis,$(ICONFIGFILES),$(BC_DEFINES) $(OPEN_DEFINES) $(XTRANS_X_DEFINES) $(XKB_DEFINES))
-SpecialCLibObjectRule(Wrap,$(ICONFIGFILES),$(XDMAUTHDEFS))
-SpecialCLibObjectRule(XlibInt,$(ICONFIGFILES),-I$(EXTINCSRC) $(CONN_DEFINES) $(POLL_DEFINES) $(XTRANS_X_DEFINES))
-SpecialCLibObjectRule(cmsColNm,$(ICONFIGFILES),$(CMS_DEFINES))
-SpecialCLibObjectRule(globals,$(ICONFIGFILES),$(CONN_DEFINES))
-SpecialCLibObjectRule(Context,$(ICONFIGFILES),$(BC_DEFINES))
-SpecialCLibObjectRule(Xrm,$(_NOOP_),$(RCONST_DEFINES))
-SpecialCLibObjectRule(imTransR,$(ICONFIGFILES),$(CONN_DEFINES) $(XTRANS_XIM_DEFINES))
-SpecialCLibObjectRule(imTrans,$(ICONFIGFILES),$(CONN_DEFINES) $(XTRANS_XIM_DEFINES))
-SpecialCLibObjectRule(lcFile,$(ICONFIGFILES),$(XLC_DEFINES))
-#if BuildXKBlib
-SpecialCLibObjectRule(XKBCvt,$(_NOOP_),$(RCONST_DEFINES))
-SpecialCLibObjectRule(KeyBind,$(ICONFIGFILES),$(XKB_DEFINES))
-SpecialCLibObjectRule(XKBBind,$(ICONFIGFILES),$(XKB_DEFINES))
-SpecialCLibObjectRule(imConv,$(ICONFIGFILES),$(XKB_DEFINES))
-#endif
-#if HasKrb5
-SpecialCLibObjectRule(k5encode,$(_NOOP_),$(K5INCL))
-#endif
-#ifdef MinixArchitecture
-SpecialCLibObjectRule(IMWrap,$(ICONFIGFILES),-DX11_TINY_IM)
-SpecialCLibObjectRule(lcInit,$(ICONFIGFILES),-DX11_TINY_LC)
-#endif
-
-#if InstallXcmsTxt
-InstallNonExecFile(Xcms.txt,$(LIBDIR))
-#endif
-InstallNonExecFile(XErrorDB,$(LIBDIR))
-InstallNonExecFile(XKeysymDB,$(LIBDIR))
-InstallLintLibrary(X11,$(LINTLIBDIR))
-
-
-LinkSourceFile(AuDispose.c,$(XAUTHSRC))
-LinkSourceFile(AuGetBest.c,$(XAUTHSRC))
-LinkSourceFile(AuFileName.c,$(XAUTHSRC))
-LinkSourceFile(AuRead.c,$(XAUTHSRC))
-#if HasKrb5
-LinkSourceFile(k5encode.c,$(XAUTHSRC))
-#endif
-#if HasXdmAuth
-LinkSourceFile(Wrap.h,$(XDMCPLIBSRC))
-LinkSourceFile(Wrap.c,$(XDMCPLIBSRC))
-LinkSourceFile(Wraphelp.c,$(XDMCPLIBSRC))
-#endif
-
-#if !HasSnprintf
-LinkSourceFile(snprintf.c,../misc)
-SpecialCLibObjectRule(snprintf,$(ICONFIGFILES),-DLIBX11)
-#endif
-LinkSourceFile(snprintf.h,../misc)
-
-MAKEKEYS = ./makekeys
-
-ks_tables.h: $(XINCLUDESRC)/keysymdef.h util/makekeys.c
-	RemoveFiles($@ ProgramTargetName(makekeys) makekeys.Osuf)
-	-HostLinkRule(ProgramTargetName(makekeys),$(CFLAGS) $(LOCAL_LDFLAGS),util/makekeys.c,$(LDLIBS))
-	RunProgram(MAKEKEYS,< $(XINCLUDESRC)/keysymdef.h > ks_tables_h)
-	$(MV) ks_tables_h $@
-	RemoveFiles(ProgramTargetName(makekeys) makekeys.Osuf ks_tables_h)
-
-includes:: ks_tables.h
-
-depend:: ks_tables.h
-
-clean::
-	RemoveFiles(ks_tables_h ks_tables.h ProgramTargetName(makekeys))
-
-DependTarget3($(SRCS1),$(SRCS2),$(SRCS3))
-#else
-all::
-
-BuildIncludes($(HEADERS),IncSubdir,..)
-#endif
--- a/Xvnc/lib/Xau/Imakefile
+++ /dev/null
@@ -1,38 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/27 1996/09/28 16:43:28 rws $
-XCOMM $XFree86: xc/lib/Xau/Imakefile,v 3.3 1996/12/23 06:00:28 dawes Exp $
-#define DoNormalLib NormalLibXau
-#define DoSharedLib SharedLibXau
-#define DoDebugLib DebugLibXau
-#define DoProfileLib ProfileLibXau
-#define LibName Xau
-#define SoRev SOXAUTHREV
-#define IncSubdir X11
-
-#include <Threads.tmpl>
-
-       LINTLIBS = $(LINTXLIB)
-
-#if HasKrb5
-K5ENCSRC = k5encode.c
-K5ENCOBJ = k5encode.o
-INCLUDES = Krb5Includes
-#else
-K5ENCSRC =
-K5ENCOBJ =
-INCLUDES =
-#endif
-
-HEADERS = \
-	Xauth.h
-
-SRCS =	AuDispose.c AuFileName.c AuGetAddr.c AuGetBest.c AuLock.c \
-	AuRead.c AuUnlock.c AuWrite.c $(K5ENCSRC)
-
-OBJS =	AuDispose.o AuFileName.o AuGetAddr.o AuGetBest.o AuLock.o \
-	AuRead.o AuUnlock.o AuWrite.o $(K5ENCOBJ)
-
-#include <Library.tmpl>
-
-InstallLinkKitLibrary(Xau,$(LINKKITDIR)/lib)
-
-DependTarget()
--- a/Xvnc/lib/Xdmcp/Imakefile
+++ /dev/null
@@ -1,113 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/25 1996/09/28 16:43:40 rws $
-XCOMM $XFree86: xc/lib/Xdmcp/Imakefile,v 3.2 1996/12/23 06:00:48 dawes Exp $
-#define DoNormalLib NormalLibXdmcp
-#define DoSharedLib SharedLibXdmcp
-#define DoDebugLib DebugLibXdmcp
-#define DoProfileLib ProfileLibXdmcp
-#define LibName Xdmcp
-#define SoRev SOXDMCPREV
-#define IncSubdir X11
-
-#if HasXdmAuth
-AUTHDEFS = -DHASXDMAUTH
-AUTHSRCS = Wrap.c Unwrap.c Wraphelp.c
-AUTHOBJS = Wrap.o Unwrap.o Wraphelp.o
-#endif
-
-DEFINES = $(AUTHDEFS)
-
-HEADERS = Xdmcp.h
-
-SRCS = \
-	A8Eq.c \
-	AA8.c \
-	AA16.c \
-	AA32.c \
-	AofA8.c \
-	CA8.c \
-	DA8.c \
-	DA16.c \
-	DA32.c \
-	DAofA8.c \
-	Fill.c \
-	Flush.c \
-	RA8.c \
-	RA16.c \
-	RA32.c \
-	RAofA8.c \
-	RC8.c \
-	RC16.c \
-	RC32.c \
-	RHead.c \
-	RR.c \
-	RaA8.c \
-	RaA16.c \
-	RaA32.c \
-	RaAoA8.c \
-	WA8.c \
-	WA16.c \
-	WA32.c \
-	WAofA8.c \
-	WC8.c \
-	WC16.c \
-	WC32.c \
-	Whead.c \
-	Alloc.c \
-	CmpKey.c \
-	DecKey.c \
-	GenKey.c \
-	IncKey.c \
-	$(AUTHSRCS)
-
-OBJS = \
-	A8Eq.o \
-	AA8.o \
-	AA16.o \
-	AA32.o \
-	AofA8.o \
-	CA8.o \
-	DA8.o \
-	DA16.o \
-	DA32.o \
-	DAofA8.o \
-	Fill.o \
-	Flush.o \
-	RA8.o \
-	RA16.o \
-	RA32.o \
-	RAofA8.o \
-	RC8.o \
-	RC16.o \
-	RC32.o \
-	RHead.o \
-	RR.o \
-	RaA8.o \
-	RaA16.o \
-	RaA32.o \
-	RaAoA8.o \
-	WA8.o \
-	WA16.o \
-	WA32.o \
-	WAofA8.o \
-	WC8.o \
-	WC16.o \
-	WC32.o \
-	Whead.o \
-	Alloc.o \
-	CmpKey.o \
-	DecKey.o \
-	GenKey.o \
-	IncKey.o \
-	$(AUTHOBJS)
-
-#include <Library.tmpl>
-
-#ifdef WraphelpSourceRule
-WraphelpSourceRule()
-#endif
-SpecialCLibObjectRule(Fill,$(ICONFIGFILES),ConnectionFlags)
-SpecialCLibObjectRule(Flush,$(ICONFIGFILES),ConnectionFlags)
-
-InstallLinkKitLibrary(Xdmcp,$(LINKKITDIR)/lib)
-
-DependTarget()
--- a/Xvnc/lib/font/Imakefile
+++ /dev/null
@@ -1,35 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/12 1995/12/07 21:15:22 gildea $
-XCOMM $XFree86: xc/lib/font/Imakefile,v 3.5.4.2 1997/05/11 05:04:09 dawes Exp $
-#include <Server.tmpl>
-
-#define	IHaveSubdirs
-
-SUBDIRS = bitmap fontfile fc Speedo Type1 util
-OBJS = bitmap/?*.o fontfile/?*.o fc/?*.o Speedo/?*.o Type1/?*.o util/?*.o
-DONES = bitmap/DONE fontfile/DONE fc/DONE Speedo/DONE Type1/DONE util/DONE
-
-#if HasParallelMake
-MakeMutex($(SUBDIRS) $(DONES))
-#endif
-
-#if HasGnuMake || HasBsdMake
-$(DONES): $(SUBDIRS)
-#endif
-
-#undef _LinkBuildLibrary
-#define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)
-
-#ifndef OS2Architecture
-NormalDepLibraryTarget(font,$(SUBDIRS) $(DONES),$(OBJS))
-#else
-all:: DONE
-	cp $(OBJS) .
-
-NormalDepLibraryTarget(font,$(DONES),?*.o)
-#endif
-
-InstallLinkKitLibrary(font,$(LINKKITDIR)/lib)
-
-ForceSubdirs($(SUBDIRS))
-
-DependSubdirs($(SUBDIRS))
--- a/Xvnc/lib/font/Speedo/Imakefile
+++ /dev/null
@@ -1,22 +0,0 @@
-XCOMM $XConsortium: Imakefile,v 1.10 93/09/04 16:42:59 rws Exp $
-#include <Server.tmpl>
-
-        INCLUDES = -I$(FONTINCSRC) -I../include -I$(SERVERSRC)/include
-         HEADERS = 
-      SPEEDOSRCS = do_char.c do_trns.c out_bl2d.c out_blk.c \
-		   out_scrn.c out_util.c reset.c set_spcs.c set_trns.c 
-      SPEEDOOBJS = do_char.o do_trns.o out_bl2d.o out_blk.o \
-		   out_scrn.o out_util.o reset.o set_spcs.o set_trns.o
-
-            SRCS = spfuncs.c spfile.c spinfo.c sperr.c spfont.c spglyph.c \
-		spencode.c \
-	    	$(SPEEDOSRCS)
-            OBJS = spfuncs.o spfile.o spinfo.o sperr.o spfont.o spglyph.o \
-		spencode.o \
-		$(SPEEDOOBJS)
-
-SubdirLibraryRule($(OBJS))
-NormalLibraryObjectRule()
-NormalLintTarget($(SRCS))
-
-DependTarget()
--- a/Xvnc/lib/font/Type1/Imakefile
+++ /dev/null
@@ -1,53 +0,0 @@
-XCOMM $XConsortium: Imakefile,v 1.5 93/09/04 16:43:32 rws Exp $
-
-#include <Server.tmpl>
-
-INCLUDES = -I$(FONTINCSRC) -I../include
-
-SRCS =          \
-       arith.c         \
-       curves.c        \
-       fontfcn.c       \
-       hints.c         \
-       lines.c         \
-       objects.c       \
-       paths.c         \
-       regions.c       \
-       scanfont.c      \
-       spaces.c        \
-       t1funcs.c       \
-       t1info.c        \
-       t1io.c          \
-       t1malloc.c      \
-       t1snap.c        \
-       t1stub.c       \
-       token.c         \
-       type1.c         \
-       util.c
-
-OBJS =          \
-       arith.o         \
-       curves.o        \
-       fontfcn.o       \
-       hints.o         \
-       lines.o         \
-       objects.o       \
-       paths.o         \
-       regions.o       \
-       scanfont.o      \
-       spaces.o        \
-       t1funcs.o       \
-       t1info.o        \
-       t1io.o          \
-       t1malloc.o      \
-       t1snap.o        \
-       t1stub.o       \
-       token.o         \
-       type1.o         \
-       util.o
-
-SubdirLibraryRule($(OBJS))
-NormalLibraryObjectRule()
-NormalLintTarget($(SRCS))
-
-DependTarget()
--- a/Xvnc/lib/font/bitmap/Imakefile
+++ /dev/null
@@ -1,28 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/9 1996/11/03 19:31:58 kaleb $
-#include <Server.tmpl>
-
-        INCLUDES = -I$(FONTINCSRC) -I../include
-         HEADERS = 
-#ifdef FontFormatDefines
-     FORMAT_DEFS = FontFormatDefines
-#endif
-#if GzipFontCompression
-       GZIP_DEFS = -DX_GZIP_FONT_COMPRESSION
-#endif
-
-            SRCS = bdfread.c bdfutils.c bitmap.c bitmaputil.c bitscale.c \
-		   bitmapfunc.c pcfread.c pcfwrite.c snfread.c \
-		   fontink.c
-
-            OBJS = bdfread.o bdfutils.o bitmap.o bitmaputil.o bitscale.o \
-		   bitmapfunc.o pcfread.o pcfwrite.o snfread.o \
-		   fontink.o
-
-SpecialCObjectRule(bitmapfunc,$(ICONFIGFILES),$(GZIP_DEFS))
-
-SubdirLibraryRule($(OBJS))
-NormalLibraryObjectRule()
-NormalLintTarget($(SRCS))
-
-DependTarget()
-
--- a/Xvnc/lib/font/fc/Imakefile
+++ /dev/null
@@ -1,26 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/20 1995/12/13 18:07:57 kaleb $
-XCOMM
-XCOMM Make file for font handling routines
-XCOMM
-#include <Server.tmpl>
-
-        INCLUDES = -I$(FONTINCSRC) -I../include
-         HEADERS = 
-            SRCS = fsconvert.c fserve.c fsio.c transport.c
-            OBJS = fsconvert.o fserve.o fsio.o transport.o
-         DEFINES = $(SIGNAL_DEFINES)
-    CONN_DEFINES = ConnectionFlags -DFONT_t -DTRANS_CLIENT -DTRANS_SERVER -DTRANS_REOPEN
-#if HasBSD44Sockets
-    SOCK_DEFINES = -DBSD44SOCKETS
-#endif
-  DEPEND_DEFINES = $(TRANS_INCLUDES) $(CONN_DEFINES)
-
-SubdirLibraryRule($(OBJS))
-NormalLibraryObjectRule()
-SpecialCObjectRule(fsio,$(ICONFIGFILES),$(CONN_DEFINES) $(SOCK_DEFINES))
-SpecialCObjectRule(transport,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES))
-LinkSourceFile(transport.c,$(TRANSCOMMSRC))
-
-NormalLintTarget($(SRCS))
-
-DependTarget()
--- a/Xvnc/lib/font/fontfile/Imakefile
+++ /dev/null
@@ -1,40 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/14 1996/11/03 19:58:41 kaleb $
-XCOMM $XFree86: xc/lib/font/fontfile/Imakefile,v 3.4 1996/12/26 03:41:32 dawes Exp $
-#include <Server.tmpl>
-
-#if !HasZlib
-    ZLIBINC = /usr/local/include
-#endif
-   INCLUDES = -I$(FONTINCSRC) -I../include -I$(SERVERSRC)/include -I$(ZLIBINC)
-    HEADERS = 
-#ifdef FontFormatDefines
-FORMAT_DEFS = FontFormatDefines
-#endif
-
-#if GzipFontCompression
- GUNZIP_SRC = gunzip.c
- GUNZIP_OBJ = gunzip.o
-  GZIP_DEFS = -DX_GZIP_FONT_COMPRESSION
-#endif
-
- ATTRIBDEFS = -DFONTDIRATTRIB
-
-    DEFINES = $(ATTRIBDEFS)
-
-
-
-       SRCS = dirfile.c fontdir.c fontfile.c fileio.c fontscale.c \
-              defaults.c bitsource.c register.c renderers.c bufio.c \
-              decompress.c filewr.c printerfont.c ffcheck.c $(GUNZIP_SRC)
-       OBJS = dirfile.o fontdir.o fontfile.o fileio.o fontscale.o \
-              defaults.o bitsource.o register.o renderers.o bufio.o \
-              decompress.o filewr.o printerfont.o ffcheck.o $(GUNZIP_OBJ)
-
-SpecialCObjectRule(fileio,$(ICONFIGFILES),$(GZIP_DEFS))
-
-SubdirLibraryRule($(OBJS))
-NormalLibraryObjectRule()
-NormalLintTarget($(SRCS))
-
-DependTarget()
-
--- a/Xvnc/lib/font/util/Imakefile
+++ /dev/null
@@ -1,20 +0,0 @@
-XCOMM $XConsortium: Imakefile,v 1.11 94/02/07 16:07:31 gildea Exp $
-#include <Server.tmpl>
-
-        INCLUDES = -I$(FONTINCSRC) -I../include
-         HEADERS = 
-#ifdef FontFormatDefines
-     FORMAT_DEFS = FontFormatDefines
-#endif
-            SRCS = utilbitmap.c fontnames.c fontutil.c fontxlfd.c format.c \
-		   fontaccel.c atom.c miscutil.c private.c patcache.c
-
-            OBJS = utilbitmap.o fontnames.o fontutil.o fontxlfd.o format.o \
-		   fontaccel.o atom.o miscutil.o private.o patcache.o
-
-SubdirLibraryRule($(OBJS))
-NormalLibraryObjectRule()
-NormalLintTarget($(SRCS))
-
-DependTarget()
-
--- a/Xvnc/lib/xtrans/Imakefile
+++ /dev/null
@@ -1,8 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/12 1996/09/28 16:50:08 rws $
-
-#define IncSubdir X11
-
-all::
-
-DependTarget()
-BuildIncludes(Xtrans.h,IncSubdir,..)
--- a/Xvnc/programs/Imakefile
+++ /dev/null
@@ -1,72 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/83 1996/12/18 16:29:30 lehors $
-XCOMM $XFree86: xc/programs/Imakefile,v 3.15.2.2 1998/02/15 16:08:40 hohndel Exp $
-#define IHaveSubdirs
-#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
-
-#if BuildServer
-       RGBSRCDIR = rgb
-        XSSRCDIR = Xserver
-#endif
-#ifndef Win32Architecture
-#if HasXServer
-     XINITSRCDIR = xinit
-#endif
-#if BuildFontServer
-       XFSSRCDIR = xfs
-#endif
-#if BuildXKBlib
-      XKBSRCDIRS = setxkbmap xkbcomp xkbevd xkbprint xkbutils
-#endif
-#if BuildScreenSaverExt
-SCREENSAVESRCDIR = beforelight
-#endif
-#if BuildXF86VidModeExt
-  XVIDTUNESRCDIR = xvidtune
-#endif
-#if BuildXF86DGA
-   XF86DGASRCDIR = xf86dga
-#endif
-#if BuildXAServer
-       XASSRCDIR = Xaserver
-#endif
-#if BuildLBX
-  LBXPROXYSRCDIR = lbxproxy
-#endif
-  PROXYMGRSRCDIR = proxymngr
-    RSTARTSRCDIR = rstart
-   SMPROXYSRCDIR = smproxy
-       TWMSRCDIR = twm
-  XCONSOLESRCDIR = xconsole
-       XDMSRCDIR = xdm
-XFINDPROXYSRCDIR = xfindproxy
-      XFWPSRCDIR = xfwp
-     XHOSTSRCDIR = xhost
-       XMHSRCDIR = xmh
-       XRXSRCDIR = xrx
-       XSMSRCDIR = xsm
-     XTERMSRCDIR = xterm
-      SCRIPTSDIR = scripts
-#endif
-
-#if BuildServersOnly
-SUBDIRS = $(XSSRCDIR)
-#else
-SUBDIRS = \
-	appres bdftopcf bitmap $(SCREENSAVESRCDIR) editres fsinfo \
-	fslsfonts fstobdf \
-	iceauth mkfontdir oclock $(PROXYMGRSRCDIR) \
-	$(RGBSRCDIR) $(RSTARTSRCDIR) $(SMPROXYSRCDIR) $(TWMSRCDIR) x11perf \
-	xauth xclipboard xclock xcmsdb $(XCONSOLESRCDIR) $(XDMSRCDIR) \
-	xdpyinfo $(XF86DGASRCDIR) xfd $(XFSSRCDIR) $(XFINDPROXYSRCDIR) \
-	$(XFWPSRCDIR) \
-	$(XHOSTSRCDIR) xieperf $(XINITSRCDIR) $(XKBSRCDIRS) xkill xlogo \
-	xlsatoms xlsclients xlsfonts xmag $(XMHSRCDIR) xmodmap xprop \
-	xrdb xrefresh $(XRXSRCDIR) xset xsetroot $(XSMSRCDIR) xstdcmap \
-	xsetmode xsetpointer \
-	$(XTERMSRCDIR) $(XVIDTUNESRCDIR) xwd xwininfo xwud \
-	$(XSSRCDIR) $(XASSRCDIR) \
-	$(LBXPROXYSRCDIR) $(SCRIPTSDIR)
-#endif
-
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
--- a/Xvnc/programs/Xserver/Imakefile
+++ /dev/null
@@ -1,1743 +0,0 @@
-XCOMM $TOG: Imakefile /main/235 1997/05/25 15:12:21 kaleb $
-/*
- * Server Master Makefile
- */
-XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.85.2.8 1998/02/07 00:44:33 dawes Exp $
-
-#include <Server.tmpl>
-
-#ifdef XFree86Version
-/* Don't strip server binaries */
-INSTPGMFLAGS = 
-#endif
-
-#define PreFbLibs $(DIX) $(OS) $(FONT) $(XPDDX)
-#define BarePostFbLibs $(MFB) $(XPFBLIBS) $(MI)
-#define PostFbLibs BarePostFbLibs $(EXTENSIONS)
-#define NoMfbBarePostFbLibs $(XPFBLIBS) $(MI)
-#define NoMfbPostFbLibs NoMfbBarePostFbLibs $(EXTENSIONS)
-
-#define MFBBareLibs PreFbLibs BarePostFbLibs
-#define NoMFBBareLibs PreFbLibs NoMfbBarePostFbLibs
-#define MFBLibs PreFbLibs PostFbLibs
-#define NoMFBLibs PreFbLibs NoMfbPostFbLibs
-#define CFBLibs PreFbLibs $(CFB) PostFbLibs
-#define CFB4Libs PreFbLibs $(CFB4) PostFbLibs
-#define CFB8Libs PreFbLibs $(CFB8) PostFbLibs
-#define CFB16Libs PreFbLibs $(CFB16) PostFbLibs
-#define CFB24Libs PreFbLibs $(CFB24) PostFbLibs
-#define CFB32Libs PreFbLibs $(CFB32) PostFbLibs
-
-#if BuildPexExt
-         PEXLIBS = PEX5/dipex/dispatch/LibraryTargetName(didipex) \
-                   PEX5/dipex/swap/LibraryTargetName(diswapex) \
-                   PEX5/dipex/objects/LibraryTargetName(diobpex) \
-                   PEX5/dipex/dispatch/LibraryTargetName(didipex) \
-                   PEX5/ddpex/mi/level4/LibraryTargetName(ddpex4) \
-                   PEX5/ddpex/mi/level3/LibraryTargetName(ddpex3) \
-                   PEX5/ddpex/mi/shared/LibraryTargetName(ddpexs) \
-                   PEX5/ddpex/mi/level2/LibraryTargetName(ddpex2) \
-                   PEX5/ddpex/mi/level1/LibraryTargetName(ddpex1) \
-		   PEX5/ospex/LibraryTargetName(ospex) 
-          PEXDIR = PEX5
-#endif
- 
-#if BuildGlxExt /* && !GlxModule */
-#if GlxStubLib 
-        GLXLIB = glxStub/LibraryTargetName(ServerGlx) 
-        GLXDIR = glxStub 
-#else
-        GLXLIB = GlxStaticServerLib
-        GLXDIR = 
-#endif
-#endif
-
-#if BuildXInputExt
-      XINPUTEXT = Xi/LibraryTargetName(xinput)
-          XIDIR = Xi
-#endif
-#if BuildXIE
-      XIEEXT = XIE/dixie/LibraryTargetName(dixie) XIE/mixie/LibraryTargetName(mixie)
-#endif
-#if BuildXIE || BuildXIElib
-      XIEDIR = XIE
-#endif
-#if BuildXKB
-      XKBEXT = xkb/LibraryTargetName(xkb)
-      XKBDIR = xkb
-#endif
-#if BuildLBX
-         LBXEXT = lbx/LibraryTargetName(lbx) \
-                  $(TOP)/lib/lbxutil/LibraryTargetName(lbxutil)
-        LBXDIRS = lbx
-#endif
-#if BuildDBE
-         DBEEXT = dbe/LibraryTargetName(dbe)
-#endif
-#if BuildDBE || BuildDBElib
-         DBEDIR = dbe
-#endif
-#if BuildRECORD
-         RECORDEXT = record/LibraryTargetName(record)
-#endif
-#if BuildRECORD || BuildRECORDlib
-         RECORDDIR = record
-#endif
-#ifdef SiteExtensionLibs
-     SITEEXTS = SiteExtensionLibs
-#endif
-#ifdef SiteExtensionDirs
-     SITEEXTDIRS = SiteExtensionDirs
-#endif
-
-#if BuildXprint
-
-#ifndef XpRasterDDX
-#define XpRasterDDX NO
-#endif
-#ifndef XpColorPclDDX
-#define XpColorPclDDX YES
-#endif
-#ifndef XpMonoPclDDX
-#define XpMonoPclDDX NO
-#endif
-#ifndef XpPostScriptDDX
-#define XpPostScriptDDX YES
-#endif
-
-#if XpRasterDDX
-XPRASTLIB = Xprint/raster/LibraryTargetName(raster)
-#endif
-#if XpColorPclDDX
-XPPCLLIB = Xprint/pcl/LibraryTargetName(pcl)
-#endif
-#if XpMonoPclDDX
-XPMPCLLIB = Xprint/pcl-mono/LibraryTargetName(pcl)
-#endif
-#if XpPostScriptDDX
-XPPSLIB = Xprint/ps/LibraryTargetName(ps)
-#endif
-
-XPDDXLIBS = Xprint/LibraryTargetName(printer) $(XPRASTLIB) $(XPPCLLIB) $(XPMPCLLIB) $(XPPSLIB)
-XPDDXFBLIBS = $(MFB) $(CFB32)
-#if !PrintOnlyServer
-      XPFBLIBS = $(XPDDXFBLIBS)
-      XPDDX = $(XPDDXLIBS)
-#endif
-      XPDDXDIR = Xprint
-#endif
-#if !BuildXprint || PrintOnlyServer
-XPFBLIBS = dix/LibraryTargetName(xpstubs)
-#endif
-
-      OTHEREXTS = Xext/LibraryTargetName(ext) $(XKBEXT) $(XINPUTEXT) \
-                  $(XIEEXT) $(LBXEXT) $(DBEEXT) $(RECORDEXT) $(SITEEXTS)
-        EXTDIRS = Xext $(XKBDIR) $(XIDIR) $(XIEDIR) $(PEXDIR) $(GLXDIR) \
-                  $(LBXDIRS) $(DBEDIR) $(RECORDDIR) $(SITEEXTDIRS)
-     EXTENSIONS = $(OTHEREXTS) $(PEXLIBS) $(GLXLIB)
-         XAULIB = $(XAUTHSRC)/LibraryTargetName(Xau)
-       XDMCPLIB = $(XDMCPLIBSRC)/LibraryTargetName(Xdmcp)
-#if BuildLBX || GzipFontCompression
-           ZLIB = GzipLibrary
-#endif
-             OS = os/LibraryTargetName(os) $(XAULIB) $(XDMCPLIB)
-        BSDEMUL = $(DEPXBSDLIB)
-            MFB = mfb/LibraryTargetName(mfb)
-            CFB = cfb/LibraryTargetName(cfb) cfb16/LibraryTargetName(cfb) cfb24/LibraryTargetName(cfb) cfb32/LibraryTargetName(cfb)
-           CFB8 = cfb/LibraryTargetName(cfb)
-          CFB4  = cfb/LibraryTargetName(cfb) cfb4/LibraryTargetName(cfb)
-          CFB16 = cfb/LibraryTargetName(cfb) cfb16/LibraryTargetName(cfb)
-          CFB24 = cfb/LibraryTargetName(cfb) cfb24/LibraryTargetName(cfb)
-          CFB32 = cfb/LibraryTargetName(cfb) cfb32/LibraryTargetName(cfb)
-             MI = mi/LibraryTargetName(mi)
-            DIX = dix/LibraryTargetName(dix)
-           FONT = $(DEPFONTLIB)
-#ifdef ServerExtraSysLibs
-   EXTRASYSLIBS = ServerExtraSysLibs
-#endif
-#if SystemV4 || defined(SGIArchitecture) || UseRgbTxt
-        SYSLIBS = $(ZLIB) MathLibrary Krb5Libraries $(EXTRASYSLIBS)
-#else
-        SYSLIBS = $(ZLIB) MathLibrary Krb5Libraries DBMLibrary $(EXTRASYSLIBS)
-#endif
-           CBRT = mi/LibraryTargetName(cbrt)
-        STDDIRS = include dix os mi $(XPDDXDIR) $(EXTDIRS)
-
-XCOMM
-XCOMM This turns off the default rule for compiling .c files because
-XCOMM this makefile does not really know how to build it.  This is really
-XCOMM just a hack because of the Sun version of make and nfs.
-XCOMM
-.c.o:
-
-/*  		  Build rule blocks, add one for each server
- *  
- *  If a server needs mfb, its build block should have a line like:
- *  MFBDIR = mfb
- *  Similarly, its build block should have:
- *  CFB4DIR  = cfb4  (if the server needs 4 bit cfb)
- *  CFB8DIR  = cfb   (8 bit cfb)
- *  CFB16DIR = cfb16 (16 bit cfb)
- *  CFB24DIR = cfb24 (24 bit cfb)
- *  CFB32DIR = cfb32 (32 bit cfb)
- *  
- *  If a server does not need all of the above components, simply
- *  omit the relevant lines from the build block.
- *  
- *  Additional ddx directories can be split across three variables:
- *  DDXDIR1, DDXDIR2, and DDXDIR3.  Most servers only use DDXDIR1,
- *  but if two servers can be built on a platform then DDXDIR1 is
- *  typically set to the ddx directories that are shared by both
- *  servers, DDXDIR2 is the directories unique to one of the servers,
- *  and DDXDIR3 is the directories unique to the other server.
- *  
- *  If these guidelines are followed, a make at the top of the server
- *  tree should result in each subdirectory being built only once,
- *  even if multiple servers that share subdirectories are being built.
- */
-
-#if XdecServer
-XCOMM
-XCOMM Digital MIPS based WS server (ultrix 4.2 and beyond)
-XCOMM
-MFBDIR  = mfb
-CFB8DIR = cfb
-DDXDIR1 = hw/dec/ws
-DECDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
-DECOBJS = hw/dec/ws/init.o hw/dec/ws/sdepthinit.o
-DECLIBS = hw/dec/ws/LibraryTargetName(dec) CFB8Libs
-ServerTarget(Xdec,$(DECDIRS),$(DECOBJS),$(DECLIBS),$(SYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall Xdec
-#endif
-#endif /* XdecServer */
-
-
-#if XdecMultiDepthServer
-XCOMM
-XCOMM Digital MIPS based WS server (ultrix 4.2 and beyond)
-XCOMM Supports 8, 12, and 24 bit pixmaps
-XCOMM
-MFBDIR   = mfb
-CFB8DIR  = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR1  = hw/dec/ws
-DECDIRS1 = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
-DECOBJS1 = hw/dec/ws/init.o hw/dec/ws/mdepthinit.o
-DECLIBS1 = hw/dec/ws/LibraryTargetName(dec) CFBLibs
-ServerTarget(Xdec_md,$(DECDIRS1),$(DECOBJS1),$(DECLIBS1),$(SYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall Xdec_md
-#endif
-#endif /* XdecMultiDepthServer */
-
-
-#if XsunServer
-XCOMM
-XCOMM Sun server
-XCOMM
-MFBDIR = mfb
-CFB8DIR = cfb
-DDXDIR1 = hw/sun
-#ifndef AmoebaArchitecture
-SUNOBJS = hw/sun/sunInit.o
-#else
-SUNOBJS = hw/sun/sunInitColor.o
-#endif
-SUNDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
-SUNLIBS = hw/sun/LibraryTargetName(sun) CFB8Libs
-SUNSYSLIBS = $(WIDECHARSYSLIB) $(SYSLIBS)
-SetUIDServerTarget(Xsun,$(SUNDIRS),$(SUNOBJS),$(SUNLIBS),$(SUNSYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall Xsun
-#endif
-#endif /* XsunServer */
-
-
-#if Xsun24Server
-XCOMM
-XCOMM Sun multiple pixmap depth (8, 12, 24) server
-XCOMM
-MFBDIR = mfb
-CFB8DIR = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR1 = hw/sun
-SUN24DIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
-SUN24OBJS = hw/sun/sunInitMulti.o
-SUN24LIBS = hw/sun/LibraryTargetName(sun) CFBLibs
-SetUIDServerTarget(Xsun24,$(SUN24DIRS),$(SUN24OBJS),$(SUN24LIBS),$(SYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall Xsun24
-#endif
-#endif /* Xsun24Server */
-
-
-#if XsunMonoServer
-XCOMM
-XCOMM Sun monochrome server
-XCOMM
-MFBDIR = mfb
-DDXDIR1 = hw/sun
-SUNMDIRS = $(STDDIRS) $(MFBDIR) $(DDXDIR1) $(DEPDIRS)
-SUNMOBJS = hw/sun/sunInitMono.o hw/sun/sunInExMono.o
-SUNMLIBS = hw/sun/LibraryTargetName(sun) MFBBareLibs $(OTHEREXTS)
-SetUIDServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS),$(SUNMLIBS),$(SYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XsunMono
-#endif
-#endif /* XsunMonoServer */
-
-
-#if XsunAmoebaServer
-XCOMM
-XCOMM Sun server for Amoeba
-XCOMM
-MFBDIR = mfb
-CFB8DIR = cfb
-DDXDIR1 = hw/sunAmoeba
-SUNDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
-SUNOBJS = hw/sunAmoeba/sunInitColor.o
-SUNLIBS = hw/sunAmoeba/LibraryTargetName(sun) CFB8Libs
-ServerTarget(Xsun,$(SUNDIRS),$(SUNOBJS),$(SUNLIBS),$(SYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall Xsun
-#endif
-#endif /* XsunAmoebaServer */
-
-
-#if XsunAmoebaMonoServer
-XCOMM
-XCOMM Sun monochrome server for Amoeba
-XCOMM
-MFBDIR = mfb
-DDXDIR1 = hw/sunAmoeba
-SUNMDIRS = $(STDDIRS) $(MFBDIR) $(DDXDIR1) $(DEPDIRS)
-SUNMOBJS = hw/sunAmoeba/sunInitMono.o hw/sunAmoeba/sunInExMono.o
-SUNMLIBS = hw/sunAmoeba/LibraryTargetName(sun) MFBBareLibs $(OTHEREXTS)
-ServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS),$(SUNMLIBS),$(SYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XsunMono
-#endif
-#endif /* XsunAmoebaMonoServer */
-
-
-#if XsunLynxServer
-XCOMM
-XCOMM Sun server for LynxOS microSPARC 2.4.0
-XCOMM
-MFBDIR = mfb
-CFB8DIR = cfb
-DDXDIR1 = hw/sunLynx
-SUNDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
-SUNOBJS = hw/sunLynx/sunLyInit.o
-SUNLIBS = hw/sunLynx/libsun.a CFB8Libs
-ServerTarget(Xsun,$(SUNDIRS),$(SUNOBJS),$(SUNLIBS),$(SYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall Xsun
-#endif
-#endif /* XsunLynxServer */
-
-
-#if XsunLynxMonoServer
-XCOMM
-XCOMM Sun monochrome server for LynxOS microSPARC 2.4.0
-XCOMM
-MFBDIR = mfb
-DDXDIR1 = hw/sunLynx
-SUNMDIRS = $(STDDIRS) $(MFBDIR) $(DDXDIR1) $(DEPDIRS)
-SUNMOBJS = hw/sunLynx/sunInitMono.o hw/sunLynx/sunInExMono.o
-SUNMLIBS = hw/sunLynx/libsun.a MFBBareLibs $(OTHEREXTS)
-ServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS),$(SUNMLIBS),$(SYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XsunMono
-#endif
-#endif /* XsunLynxMonoServer */
-
-
-#if XibmServer
-XCOMM
-XCOMM IBM server
-XCOMM
-#if SpecialMalloc
-IBMALLOCLIB = hw/ibm/common/LibraryTargetName(ibmalloc)
-#else
-IBMALLOCLIB = 
-#endif
-MFBDIR  = mfb
-CFB8DIR = cfb
-DDXDIR1 = hw/ibm
-IBMDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
-IBMOBJS = hw/ibm/common/ibmcomm.o hw/ibm/common/ibmDate.o
-IBMLIBS = hw/ibm/AIX/hft.o hw/ibm/LibraryTargetName(ibm) $(IBMALLOCLIB) CFB8Libs
-ServerTarget(Xibm,$(IBMDIRS),$(IBMOBJS),$(IBMLIBS),$(SYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall Xibm
-#endif
-#endif /* XibmServer */
-
-
-#if XhpServer
-XCOMM
-XCOMM Hewlett Packard CFB Server
-XCOMM
-MFBDIR  = mfb
-CFB8DIR = cfb
-CFB32DIR = cfb32
-DDXDIR1 = hw/hp
-HPOBJS = hw/hp/hp.o
-HPSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
-HPLIBS = CFB32Libs
-HPSYSLIBS = $(CBRT) $(SYSLIBS)
-ServerTarget(Xhp,$(HPSUBDIRS),$(HPOBJS),$(HPLIBS),$(HPSYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall Xhp
-#endif
-#endif	/* XhpServer */
-
-
-#if XsvgaServer
-XCOMM
-XCOMM SVGA CFB Server
-XCOMM
-MFBDIR  = mfb
-CFB8DIR = cfb
-DDXDIR1 = hw/svga
-SVGASUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
-SVGAOBJS = hw/svga/svga.o
-SVGALIBS = CFB8Libs
-SVGASYSLIBS = $(CBRT) -lm -lmalloc
-SetUIDServerTarget(Xsvga,$(SVGASUBDIRS),$(SVGAOBJS),$(SVGALIBS),$(SVGASYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall Xsvga
-#endif
-#endif	/* XsvgaServer */
-
-
-#ifdef XFree86Version
-XF86INIT   = $(XF86COMSRC)/xf86Init.o $(XF86CONFIGSRC)/xf86IniExt.o
-XF86MINIT  = $(XF86COMSRC)/xf86Init_m.o $(XF86CONFIGSRC)/xf86MIniExt.o
-XF86CONFIG = $(XF86CONFIGSRC)/xf86_Option.o
-XF86COMLIB = $(XF86COMSRC)/LibraryTargetName(xf86)
-XF86OSLIB  = $(XF86OSSRC)/LibraryTargetName(xf86_os)
-XF86HWLIB  = $(XF86HWSRC)/LibraryTargetName(xf86_hw)
-XF86LIBS   = $(XF86INIT) $(XF86CONFIG) $(XF86COMLIB) $(XF86OSLIB) \
-             $(XF86HWLIB) $(XF86OSLIB)
-XF86MLIBS  = $(XF86MINIT) $(XF86CONFIG) $(XF86COMLIB) $(XF86OSLIB) \
-             $(XF86HWLIB) $(XF86OSLIB)
- 
-XF68INIT   = $(XF68COMSRC)/xf86Init.o $(XF68CONFIGSRC)/xf86IniExt.o
-XF68MINIT  = $(XF68COMSRC)/xf86Init_m.o $(XF68CONFIGSRC)/xf86MIniExt.o
-XF68CONFIG = $(XF68CONFIGSRC)/xf86_Option.o
-XF68COMLIB = $(XF68COMSRC)/LibraryTargetName(xf86)
-XF68OSLIB  = $(XF68OSSRC)/LibraryTargetName(xf86_os)
-XF68LIBS   = $(XF68INIT) $(XF68CONFIG) $(XF68COMLIB) $(XF68OSLIB)
-XF68MLIBS  = $(XF68MINIT) $(XF68CONFIG) $(XF68COMLIB) $(XF68OSLIB)
- 
-XF98INIT       = $(XF98COMSRC)/xf86Init.o $(XF98CONFIGSRC)/xf86IniExt.o
-XF98MINIT      = $(XF98COMSRC)/xf86Init_m.o $(XF98CONFIGSRC)/xf86MIniExt.o
-XF98CONFIG     = $(XF98CONFIGSRC)/xf86_Option.o
-XF98COMLIB     = $(XF98COMSRC)/LibraryTargetName(xf86)
-XF98OSLIB      = $(XF98OSSRC)/LibraryTargetName(xf86_os)
-XF98HWLIB      = $(XF98HWSRC)/LibraryTargetName(xf86_hw)
-XF98HWNECLIB   = $(XF98HWNECSRC)/LibraryTargetName(xf86_hw)
-XF98HWPWSKBLIB = $(XF98HWPWSKBSRC)/LibraryTargetName(xf86_hw)
-XF98HWPWLBLIB  = $(XF98HWPWLBSRC)/LibraryTargetName(xf86_hw)
-XF98HWGA968LIB = $(XF98HWGA968SRC)/LibraryTargetName(xf86_hw)
-XF98LIBS       = $(XF98INIT) $(XF98CONFIG) $(XF98COMLIB) \
-		 $(XF98HWLIB) $(XF98OSLIB)
-XF98LIBSNEC    = $(XF98INIT) $(XF98CONFIG) $(XF98COMLIB) \
-		 $(XF98HWNECLIB) $(XF98OSLIB)
-XF98LIBSPWSKB  = $(XF98INIT) $(XF98CONFIG) $(XF98COMLIB) \
-		 $(XF98HWPWSKBLIB) $(XF98OSLIB)
-XF98LIBSPWLB   = $(XF98INIT) $(XF98CONFIG) $(XF98COMLIB) \
-		 $(XF98HWPWLBLIB) $(XF98OSLIB)
-XF98LIBSGA968  = $(XF98INIT) $(XF98CONFIG) $(XF98COMLIB) \
-		 $(XF98HWGA968LIB) $(XF98OSLIB)
-XF98MLIBS      = $(XF98MINIT) $(XF98CONFIG) $(XF98COMLIB) \
-		 $(XF98HWLIB) $(XF98OSLIB)
-XF98MLIBSNEC   = $(XF98MINIT) $(XF98CONFIG) $(XF98COMLIB) \
-		 $(XF98HWNECLIB) $(XF98OSLIB)
-XF98MLIBSPWSKB = $(XF98MINIT) $(XF98CONFIG) $(XF98COMLIB) \
-		 $(XF98HWPWSKBLIB) $(XF98OSLIB)
-XF98MLIBSPWLB  = $(XF98MINIT) $(XF98CONFIG) $(XF98COMLIB) \
-	 	 $(XF98HWPWLBLIB) $(XF98OSLIB)
-XF98MLIBSGA968 = $(XF98MINIT) $(XF98CONFIG) $(XF98COMLIB) \
-		 $(XF98HWGA968LIB) $(XF98OSLIB)
-#endif
-
-
-#if HasParallelMake
-XCOMM
-XCOMM force non-parallel build of XF86 servers to prevent MUTEX overrides
-XCOMM
-#if XF86SVGAServer
-XF86SVGA = XF86_SVGA
-#endif
-#if XF86VGA16Server
-XF86VGA16 = XF86_VGA16
-#endif
-#if XF86W32Server
-XF86W32 = XF86_W32
-#endif
-#if XF86MonoServer
-XF86MONO = XF86_Mono
-#endif
-#if XF86S3Server
-XF86S3 = XF86_S3
-#endif
-#if XF86S3VServer
-XF86S3V = XF86_S3V
-#endif
-#if XF86I8514Server
-XF868514 = XF86_8514
-#endif
-#if XF86Mach8Server
-XF86MACH8 = XF86_Mach8
-#endif
-#if XF86Mach32Server
-XF86MACH32 = XF86_Mach32
-#endif
-#if XF86Mach64Server
-XF86MACH64 = XF86_Mach64
-#endif
-#if XF86P9000Server
-XF86P9000 = XF86_P9000
-#endif
-#if XF86AGXServer
-XF86AGX = XF86_AGX
-#endif
-#if XF86I128Server
-XF86I128 = XF86_I128
-#endif
-#if XF86TGAServer
-XF86TGA = XF86_TGA
-#endif
-#if XF68FBDevServer
-XF68FBDEV = XF68_FBDev
-#endif
-#if XF98GANBWAPServer
-XF98GANBWAP = XF98_GANBWAP
-#endif
-#if XF98NEC480Server
-XF98NEC480 = XF98_NEC480
-#endif
-#if XF98NKVNECServer
-XF98NKVNEC = XF98_NKVNEC
-#endif
-#if XF98WABSServer
-XF98WABS = XF98_WABS
-#endif
-#if XF98WABEPServer
-XF98WABEP = XF98_WABEP
-#endif
-#if XF98WSNAServer
-XF98WSNA = XF98_WSNA
-#endif
-#if XF98TGUIServer
-XF98TGUI = XF98_TGUI
-#endif
-#if XF98MGAServer
-XF98MGA = XF98_MGA
-#endif
-#if XF98SVGAServer
-XF98SVGA = XF98_SVGA
-#endif
-#if XF98EGCServer
-XF98EGC = XF98_EGC
-#endif
-#if XF98NECS3Server
-XF98NECS3 = XF98_NECS3
-#endif
-#if XF98PWSKBServer
-XF98PWSKB = XF98_PWSKB
-#endif
-#if XF98PWLBServer
-XF98PWLB = XF98_PWLB
-#endif
-#if XF98GA968Server
-XF98GA968 = XF98_GA968
-#endif
-#if XnestServer
-XNEST = Xnest
-#endif
-#if XVirtualFramebufferServer
-XVFB = Xvfb
-#endif
-#if defined(XF86SVGAServer) || defined(XF98GANBWAPServer) || \
-    defined(XF98NEC480Server) || defined(XF98NKVNECServer) || \
-    defined(XF98WABSServer) || defined(XF98WABEPServer) || \
-    defined(XF98WSNAServer) || defined(XF98TGUIServer) || \
-    defined(XF98MGAServer) || defined(XF98SVGAServer) || \
-    defined(XF86VGA16Server) || defined(XF98EGCServer) || \
-    defined(XF86W32Server) || defined(XF86MonoServer) || \
-    defined(XF86S3Server) || defined(XF86S3VServer) || \
-    defined(XF98NECS3Server) || defined(XF98PWSKBServer) || \
-    defined(XF98PWLBServer) || defined(XF98GA968Server) || \
-    defined(XF86I8514Server) || defined(XF86Mach8Server) || \
-    defined(XF86Mach32Server) || defined(XF86Mach64Server) || \
-    defined(XF86P9000Server) || defined(XF86AGXServer) || \
-    defined(XF86I128Server) || defined(XF86TGAServer) || \
-    defined(XF68FBDevServer) || \
-    defined(XnestServer) || defined(XVirtualFramebufferServer)
-MakeMutex($(XF86SVGA) $(XF98GANBWAP) $(XF98NEC480) $(XF98NKVNEC) $(XF98WABS) \
-	  $(XF98WABEP) $(XF98WSNA) $(XF98TGUI) $(XF98MGA) $(XF98SVGA) \
-	  $(XF86VGA16) \
-	  $(XF98EGC) $(XF86W32) $(XF86MONO) $(XF86S3) $(XF86S3V) $(XF98NECS3) \
-	  $(XF98PWSKB) $(XF98PWLB) $(XF98GA968) $(XF868514) $(XF86MACH8) \
-	  $(XF86MACH32) $(XF86MACH64) $(XF86P9000) $(XF86AGX) $(XF86I128) \
-	  $(XF86TGA) $(XF68FBDEV) $(XNEST) $(XVFB))
-#endif
-MakeMutex($(STDDIRS) mfb cfb cfb16 cfb32)
-#endif
-
-
-#if XF86SVGAServer
-XCOMM
-XCOMM XFree86 SVGA Server
-XCOMM
-MFBDIR  = mfb
-CFB8DIR = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR1 = hw/xfree86
-XF86SVGASUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) \
-                  $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
-XF86SVGAOBJS = $(XF86COMSRC)/XF86_SVGA.o $(XF86SRC)/vga256/vga256Conf.o \
-               $(XF86SRC)/xaa/xaavga256/xaavga256.o \
-               $(XF86SRC)/xaa/xaa16/xaa16.o $(XF86SRC)/xaa/xaa24/xaa24.o \
-               $(XF86SRC)/xaa/xaa32/xaa32.o
-XF86SVGALIBS = $(VGADRIVERSRC)/LibraryTargetName(driver256) \
-               $(XF86SRC)/xaa/LibraryTargetName(xaa) \
-               $(XF86SRC)/vga256/LibraryTargetName(vga256) \
-               $(XF86LIBS) CFBLibs
-XF86SVGASYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF86SVGASUBDIRS) $(XF86SVGAOBJS) $(XF86SVGALIBS) $(XF86SVGASYSLIBS))
-#endif
-#if HasGnuMake
-$(XF86SVGAOBJS) $(XF86SVGALIBS) $(XF86SVGASYSLIBS):: $(XF86SVGASUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF86_SVGA,$(XF86SVGASUBDIRS),$(XF86SVGAOBJS),$(XF86SVGALIBS),$(XF86SVGASYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF86_SVGA
-#endif
-#ifdef OS2Architecture
-LinkFile(XF86_SVGA.def,SVGA.def)
-InstallLinkKitNonExecFile(SVGA.def,$(LINKKITDIR))
-#endif
-#endif	/* XF86SVGAServer */
-
-
-#if XF86VGA16Server
-XCOMM
-XCOMM XFree86 VGA 16 color Server
-XCOMM
-DDXDIR1 = hw/xfree86
-#if XF86VGA16DualServer
-XF86VGA16MONOOBJS = $(XF86SRC)/mono/monoConf.o
-XF86VGA16MONOLIBS = $(MONODRIVERSRC)/LibraryTargetName(monodrv) \
-                    $(XF86SRC)/mono/LibraryTargetName(mono)
-#endif
-XF86VGA16SUBDIRS = $(STDDIRS) $(DDXDIR1) $(DEPDIRS)
-XF86VGA16OBJS = $(XF86COMSRC)/XF86_VGA16.o $(XF86SRC)/vga16/vga16Conf.o \
-                $(XF86SRC)/vga16/misc/vga16misc.o $(XF86VGA16MONOOBJS)
-XF86VGA16LIBS = $(VGA16DRIVERSRC)/LibraryTargetName(driver16) \
-                $(XF86SRC)/vga16/LibraryTargetName(vga16) \
-                $(XF86VGA16MONOLIBS) $(XF86MLIBS) NoMFBBareLibs $(OTHEREXTS)
-XF86VGA16SYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF86VGA16SUBDIRS) $(XF86VGA16OBJS) $(XF86VGA16LIBS) $(XF86VGA16SYSLIBS))
-#endif
-#if HasGnuMake
-$(XF86VGA16OBJS) $(XF86VGA16LIBS) $(XF86VGA16SYSLIBS):: $(XF86VGA16SUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF86_VGA16,$(XF86VGA16SUBDIRS),$(XF86VGA16OBJS),$(XF86VGA16LIBS),$(XF86VGA16SYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF86_VGA16
-#endif
-#ifdef OS2Architecture
-LinkFile(XF86_VGA16.def,VGA16.def)
-InstallLinkKitNonExecFile(VGA16.def,$(LINKKITDIR))
-#endif
-#endif	/* XF86VGA16Server */
-
-
-#if XF86W32Server
-XCOMM
-XCOMM XFree86 W32 Server
-XCOMM
-MFBDIR  = mfb
-CFB8DIR = cfb
-DDXDIR1 = hw/xfree86
-XF86W32SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
-XF86W32OBJS = $(XF86COMSRC)/XF86_W32.o $(XF86ACCELSRC)/et4000w32/w32Conf.o
-XF86W32LIBS = $(XF86ACCELSRC)/et4000w32/w32/LibraryTargetName(w32) \
-              $(XF86ACCELSRC)/et4000w32/cfb.w32/LibraryTargetName(cfb) \
-              $(XF86ACCELSRC)/et4000w32/w32/LibraryTargetName(w32) \
-              $(XF86ACCELSRC)/et4000w32/asm/LibraryTargetName(asm) \
-              $(XF86LIBS) CFB8Libs
-XF86W32SYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF86W32SUBDIRS) $(XF86W32OBJS) $(XF86W32LIBS) $(XF86W32SYSLIBS))
-#endif
-#if HasGnuMake
-$(XF86W32OBJS) $(XF86W32LIBS) $(XF86W32SYSLIBS):: $(XF86W32SUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF86_W32,$(XF86W32SUBDIRS),$(XF86W32OBJS),$(XF86W32LIBS),$(XF86W32SYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF86_W32
-#endif
-#ifdef OS2Architecture
-LinkFile(XF86_W32.def,W32.def)
-InstallLinkKitNonExecFile(W32.def,$(LINKKITDIR))
-#endif
-#endif
-
-
-#if XF86MonoServer
-XCOMM
-XCOMM XFree86 Monochrome VGA Server
-XCOMM
-DDXDIR1 = hw/xfree86
-#if XF86MonoDualServer
-XF86MONOMONOOBJS = $(XF86SRC)/mono/monoConf.o
-XF86MONOMONOLIBS = $(MONODRIVERSRC)/LibraryTargetName(monodrv) \
-                   $(XF86SRC)/mono/LibraryTargetName(mono)
-#endif
-XF86MONOSUBDIRS = $(STDDIRS) $(MFBDIR) $(DDXDIR1) $(DEPDIRS)
-XF86MONOOBJS = $(XF86COMSRC)/XF86_Mono.o $(XF86SRC)/vga2/vga2Conf.o \
-               $(XF86SRC)/vga2/misc/vga2misc.o $(XF86MONOMONOOBJS)
-XF86MONOLIBS = $(VGA2DRIVERSRC)/LibraryTargetName(driver2) \
-               $(XF86SRC)/vga2/LibraryTargetName(vga2) \
-	       $(XF86MONOMONOLIBS) $(XF86MLIBS) NoMFBBareLibs $(OTHEREXTS)
-XF86MONOSYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF86MONOSUBDIRS) $(XF86MONOOBJS) $(XF86MONOLIBS) $(XF86MONOSYSLIBS))
-#endif
-#if HasGnuMake
-$(XF86MONOOBJS) $(XF86MONOLIBS) $(XF86MONOSYSLIBS):: $(XF86MONOSUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF86_Mono,$(XF86MONOSUBDIRS),$(XF86MONOOBJS),$(XF86MONOLIBS),$(XF86MONOSYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF86_Mono
-#endif
-#ifdef OS2Architecture
-LinkFile(XF86_Mono.def,Mono.def)
-InstallLinkKitNonExecFile(Mono.def,$(LINKKITDIR))
-#endif
-#endif	/* XF86MonoServer */
-
-
-#if XF86S3Server
-XCOMM
-XCOMM XFree86 S3 Server
-XCOMM
-MFBDIR   = mfb
-CFB8DIR  = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR1 = hw/xfree86
-XF86S3SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) \
-		$(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
-XF86S3OBJS = $(XF86COMSRC)/XF86_S3.o $(XF86ACCELSRC)/s3/s3Conf.o \
-             $(S3DRIVERSRC)/newmmio/newmmio.o \
-             $(S3DRIVERSRC)/mmio_928/mmio_928.o \
-             $(S3DRIVERSRC)/s3_generic/s3_generic.o
-XF86S3LIBS = $(XF86ACCELSRC)/s3/LibraryTargetName(s3) \
-             $(XF86ACCELSRC)/s3/s3newmmio/LibraryTargetName(s3newmmio) \
-             $(XF86ACCELSRC)/s3/s3mmio/LibraryTargetName(s3mmio) $(XF86LIBS) \
-             CFBLibs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF86S3SYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF86S3SUBDIRS) $(XF86S3OBJS) $(XF86S3LIBS) $(XF86S3SYSLIBS))
-#endif
-SetUIDServerTarget(XF86_S3,$(XF86S3SUBDIRS),$(XF86S3OBJS),$(XF86S3LIBS),$(XF86S3SYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF86_S3
-#endif
-#ifdef OS2Architecture
-LinkFile(XF86_S3.def,S3.def)
-InstallLinkKitNonExecFile(S3.def,$(LINKKITDIR))
-#endif
-#endif	/* XF86S3Server */
-
-
-#if XF86S3VServer
-XCOMM
-XCOMM XFree86 S3 ViRGE Server
-XCOMM
-MFBDIR   = mfb
-CFB8DIR  = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR1 = hw/xfree86
-XF86S3VSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) \
-		$(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
-XF86S3VOBJS = $(XF86COMSRC)/XF86_S3.o $(XF86ACCELSRC)/s3_virge/s3vConf.o \
-             $(S3VDRIVERSRC)/s3_virge/s3_virge.o
-XF86S3VLIBS = $(XF86ACCELSRC)/s3_virge/LibraryTargetName(s3v) $(XF86LIBS) \
-             CFBLibs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF86S3VSYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF86S3VSUBDIRS) $(XF86S3VOBJS) $(XF86S3VLIBS) $(XF86S3VSYSLIBS))
-#endif
-#if HasGnuMake
-$(XF86S3VOBJS) $(XF86S3VLIBS) $(XF86S3VSYSLIBS):: $(XF86S3VSUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF86_S3V,$(XF86S3VSUBDIRS),$(XF86S3VOBJS),$(XF86S3VLIBS),$(XF86S3VSYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF86_S3V
-#endif
-#ifdef OS2Architecture
-LinkFile(XF86_S3V.def,S3V.def)
-InstallLinkKitNonExecFile(S3V.def,$(LINKKITDIR))
-#endif
-#endif	/* XF86S3VServer */
-
-
-#if XF86I8514Server
-XCOMM
-XCOMM XFree86 8514 Server
-XCOMM
-MFBDIR  = mfb
-CFB8DIR = cfb
-DDXDIR1 = hw/xfree86
-XF868514SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
-XF868514OBJS = $(XF86COMSRC)/XF86_8514.o
-XF868514LIBS = $(XF86ACCELSRC)/ibm8514/LibraryTargetName(8514) $(XF86LIBS) \
-               CFB8Libs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF868514SYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF868514SUBDIRS) $(XF868514OBJS) $(XF868514LIBS) $(XF868514SYSLIBS))
-#endif
-#if HasGnuMake
-$(XF868514OBJS) $(XF868514LIBS) $(XF868514SYSLIBS):: $(XF868514SUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF86_8514,$(XF868514SUBDIRS),$(XF868514OBJS),$(XF868514LIBS),$(XF868514SYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF86_8514
-#endif
-#ifdef OS2Architecture
-LinkFile(XF86_8514.def,8514.def)
-InstallLinkKitNonExecFile(8514.def,$(LINKKITDIR))
-#endif
-#endif	/* XF86I8514Server */
-
-
-#if XF86Mach8Server
-XCOMM
-XCOMM XFree86 Mach8 Server
-XCOMM
-MFBDIR  = mfb
-CFB8DIR = cfb
-DDXDIR1 = hw/xfree86
-XF86MACH8SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DDXDIR1) $(DEPDIRS)
-XF86MACH8OBJS = $(XF86COMSRC)/XF86_Mach8.o
-XF86MACH8LIBS = $(XF86ACCELSRC)/mach8/LibraryTargetName(mach8) $(XF86LIBS) \
-                CFB8Libs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF86MACH8SYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF86MACH8SUBDIRS) $(XF86MACH8OBJS) $(XF86MACH8LIBS) $(XF86MACH8SYSLIBS))
-#endif
-#if HasGnuMake
-$(XF86MACH8OBJS) $(XF86MACH8LIBS) $(XF86MACH8SYSLIBS):: $(XF86MACH8SUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF86_Mach8,$(XF86MACH8SUBDIRS),$(XF86MACH8OBJS),$(XF86MACH8LIBS),$(XF86MACH8SYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF86_Mach8
-#endif
-#ifdef OS2Architecture
-LinkFile(XF86_Mach8.def,Mach8.def)
-InstallLinkKitNonExecFile(Mach8.def,$(LINKKITDIR))
-#endif
-#endif	/* XF86Mach8Server */
-
-
-#if XF86Mach32Server
-XCOMM
-XCOMM XFree86 Mach32 Server
-XCOMM
-MFBDIR   = mfb
-CFB8DIR  = cfb
-CFB16DIR = cfb16
-DDXDIR1  = hw/xfree86
-XF86MACH32SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(DDXDIR1) \
-                    $(DEPDIRS)
-XF86MACH32OBJS = $(XF86COMSRC)/XF86_Mach32.o
-XF86MACH32LIBS = $(XF86ACCELSRC)/mach32/LibraryTargetName(mach32) $(XF86LIBS) \
-                 CFB16Libs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF86MACH32SYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF86MACH32SUBDIRS) $(XF86MACH32OBJS) $(XF86MACH32LIBS) $(XF86MACH32SYSLIBS))
-#endif
-#if HasGnuMake
-$(XF86MACH32OBJS) $(XF86MACH32LIBS) $(XF86MACH32SYSLIBS):: $(XF86MACH32SUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF86_Mach32,$(XF86MACH32SUBDIRS),$(XF86MACH32OBJS),$(XF86MACH32LIBS),$(XF86MACH32SYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF86_Mach32
-#endif
-#ifdef OS2Architecture
-LinkFile(XF86_Mach32.def,Mach32.def)
-InstallLinkKitNonExecFile(Mach32.def,$(LINKKITDIR))
-#endif
-#endif	/* XF86Mach32Server */
-
-
-#if XF86Mach64Server
-XCOMM
-XCOMM XFree86 Mach64 Server
-XCOMM
-MFBDIR   = mfb
-CFB8DIR  = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR1  = hw/xfree86
-XF86MACH64SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) \
-                    $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
-XF86MACH64OBJS = $(XF86COMSRC)/XF86_Mach64.o
-XF86MACH64LIBS = $(XF86ACCELSRC)/mach64/LibraryTargetName(mach64) \
-		 $(XF86LIBS) CFBLibs
-XF86MACH64SYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF86MACH64SUBDIRS) $(XF86MACH64OBJS) $(XF86MACH64LIBS) $(XF86MACH64SYSLIBS))
-#endif
-#if HasGnuMake
-$(XF86MACH64OBJS) $(XF86MACH64LIBS) $(XF86MACH64SYSLIBS):: $(XF86MACH64SUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF86_Mach64,$(XF86MACH64SUBDIRS),$(XF86MACH64OBJS),$(XF86MACH64LIBS),$(XF86MACH64SYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF86_Mach64
-#endif
-#ifdef OS2Architecture
-LinkFile(XF86_Mach64.def,Mach64.def)
-InstallLinkKitNonExecFile(Mach64.def,$(LINKKITDIR))
-#endif
-#endif	/* XF86Mach64Server */
-
-
-#if XF86P9000Server
-XCOMM
-XCOMM XFree86 P9000 Server
-XCOMM
-MFBDIR  = mfb
-CFB8DIR = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR1 = hw/xfree86
-XF86P9000SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) \
-		   $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
-XF86P9000OBJS = $(XF86COMSRC)/XF86_P9000.o
-XF86P9000LIBS = $(XF86ACCELSRC)/p9000/LibraryTargetName(p9000) \
-                $(XF86LIBS) CFBLibs
-XF86P9000SYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF86P9000SUBDIRS) $(XF86P9000OBJS) $(XF86P9000LIBS) $(XF86P9000SYSLIBS))
-#endif
-#if HasGnuMake
-$(XF86P9000OBJS) $(XF86P9000LIBS) $(XF86P9000SYSLIBS):: $(XF86P9000SUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF86_P9000,$(XF86P9000SUBDIRS),$(XF86P9000OBJS),$(XF86P9000LIBS),$(XF86P9000SYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF86_P9000
-#endif
-#ifdef OS2Architecture
-LinkFile(XF86_P9000.def,P9000.def)
-InstallLinkKitNonExecFile(P9000.def,$(LINKKITDIR))
-#endif
-#endif        /* XF86P9000Server */
-
-
-#if XF86AGXServer
-XCOMM
-XCOMM XFree86 AGX Server
-XCOMM
-MFBDIR   = mfb
-CFB8DIR  = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR1  = hw/xfree86
-XF86AGXSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) \
-		 $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
-XF86AGXOBJS = $(XF86COMSRC)/XF86_AGX.o
-XF86AGXLIBS = $(XF86ACCELSRC)/agx/LibraryTargetName(agx) $(XF86LIBS) CFBLibs
-XF86AGXSYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF86AGXSUBDIRS) $(XF86AGXOBJS) $(XF86AGXLIBS) $(XF86AGXSYSLIBS))
-#endif
-#if HasGnuMake
-$(XF86AGXOBJS) $(XF86AGXLIBS) $(XF86AGXSYSLIBS):: $(XF86AGXSUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF86_AGX,$(XF86AGXSUBDIRS),$(XF86AGXOBJS),$(XF86AGXLIBS),$(XF86AGXSYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF86_AGX
-#endif
-#ifdef OS2Architecture
-LinkFile(XF86_AGX.def,AGX.def)
-InstallLinkKitNonExecFile(AGX.def,$(LINKKITDIR))
-#endif
-#endif        /* XF86AGXServer */
-
-
-#if XF98GANBWAPServer
-XCOMM
-XCOMM XFree98 GA-98NB/WAP Server
-XCOMM
-MFBDIR  = mfb
-CFB8DIR = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR2 = hw/xfree98
-XF98GANBWAPSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
-XF98GANBWAPOBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/vga256Conf.o \
-		 $(XF98SRC)/xaa/xaa16/xaa16.o $(XF98SRC)/xaa/xaa24/xaa24.o $(XF98SRC)/xaa/xaa32/xaa32.o $(XF98SRC)/xaa/xaavga256/xaavga256.o
-XF98GANBWAPLIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(driverganbwap) \
-		  $(XF98SRC)/xaa/LibraryTargetName(xaa) \
-		  $(XF98SRC)/vga256/LibraryTargetName(ganbwap) $(XF98LIBS) \
-		  CFBLibs
-XF98GANBWAPSYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF98GANBWAPSUBDIRS) $(XF98GANBWAPOBJS) $(XF98GANBWAPLIBS) $(XF98GANBWAPSYSLIBS))
-#endif
-#if HasGnuMake
-$(XF98GANBWAPOBJS) $(XF98GANBWAPLIBS) $(XF98GANBWAPSYSLIBS):: $(XF98GANBWAPSUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF98_GANBWAP,$(XF98GANBWAPSUBDIRS),$(XF98GANBWAPOBJS),$(XF98GANBWAPLIBS),$(XF98GANBWAPSYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF98_GANBWAP
-#endif
-#endif	/* XF98GANBWAPServer */
-
-
-#if XF98NEC480Server
-XCOMM
-XCOMM XFree98 NEC480 Server
-XCOMM
-MFBDIR  = mfb
-CFB8DIR = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR2 = hw/xfree98
-XF98NEC480SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
-XF98NEC480OBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/nec480Conf.o\
-		 $(XF98SRC)/xaa/xaa16/xaa16.o $(XF98SRC)/xaa/xaa24/xaa24.o $(XF98SRC)/xaa/xaa32/xaa32.o $(XF98SRC)/xaa/xaavga256/xaavga256.o
-XF98NEC480LIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(drivernec480) \
-		 $(XF98SRC)/xaa/LibraryTargetName(xaa) \
-		 $(XF98SRC)/vga256/LibraryTargetName(nec480) $(XF98LIBS) \
-		 CFBLibs
-XF98NEC480SYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF98NEC480SUBDIRS) $(XF98NEC480OBJS) $(XF98NEC480LIBS) $(XF98NEC480SYSLIBS))
-#endif
-#if HasGnuMake
-$(XF98NEC480OBJS) $(XF98NEC480LIBS) $(XF98NEC480SYSLIBS):: $(XF98NEC480SUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF98_NEC480,$(XF98NEC480SUBDIRS),$(XF98NEC480OBJS),$(XF98NEC480LIBS),$(XF98NEC480SYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF98_NEC480
-#endif
-#endif	/* XF98NEC480Server */
-
-
-#if XF98NKVNECServer
-XCOMM
-XCOMM XFree98 NEC-CIRRUS/EPSON NKV/NKV2 Server
-XCOMM
-MFBDIR  = mfb
-CFB8DIR = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR2 = hw/xfree98
-XF98NKVNECSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
-XF98NKVNECOBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/vga256Conf.o \
-		 $(XF98SRC)/xaa/xaa16/xaa16.o $(XF98SRC)/xaa/xaa24/xaa24.o $(XF98SRC)/xaa/xaa32/xaa32.o $(XF98SRC)/xaa/xaavga256/xaavga256.o
-XF98NKVNECLIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(drivernkvnec) \
-		 $(XF98SRC)/xaa/LibraryTargetName(xaa) \
-		 $(XF98SRC)/vga256/LibraryTargetName(nkvnec) $(XF98LIBS) \
-		 CFBLibs
-XF98NKVNECSYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF98NKVNECSUBDIRS) $(XF98NKVNECOBJS) $(XF98NKVNECLIBS) $(XF98NKVNECSYSLIBS))
-#endif
-#if HasGnuMake
-$(XF98NKVNECOBJS) $(XF98NKVNECLIBS) $(XF98NKVNECSYSLIBS):: $(XF98NKVNECSUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF98_NKVNEC,$(XF98NKVNECSUBDIRS),$(XF98NKVNECOBJS),$(XF98NKVNECLIBS),$(XF98NKVNECSYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF98_NKVNEC
-#endif
-#endif	/* XF98NKVNECServer */
-
-
-#if XF98WABSServer
-XCOMM
-XCOMM XFree98 WAB-S Server
-XCOMM
-MFBDIR  = mfb
-CFB8DIR = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR2 = hw/xfree98
-XF98WABSSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
-XF98WABSOBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/vga256Conf.o \
-		 $(XF98SRC)/xaa/xaa16/xaa16.o $(XF98SRC)/xaa/xaa24/xaa24.o $(XF98SRC)/xaa/xaa32/xaa32.o $(XF98SRC)/xaa/xaavga256/xaavga256.o
-XF98WABSLIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(driverwabs) \
-	       $(XF98SRC)/xaa/LibraryTargetName(xaa) \
-	       $(XF98SRC)/vga256/LibraryTargetName(wabs) $(XF98LIBS) CFBLibs
-XF98WABSSYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF98WABSSUBDIRS) $(XF98WABSOBJS) $(XF98WABSLIBS) $(XF98WABSSYSLIBS))
-#endif
-#if HasGnuMake
-$(XF98WABSOBJS) $(XF98WABSLIBS) $(XF98WABSSYSLIBS):: $(XF98WABSSUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF98_WABS,$(XF98WABSSUBDIRS),$(XF98WABSOBJS),$(XF98WABSLIBS),$(XF98WABSSYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF98_WABS
-#endif
-#endif	/* XF98WABSServer */
-
-
-#if XF98WABEPServer
-XCOMM
-XCOMM XFree98 WAB-EP Server
-XCOMM
-MFBDIR  = mfb
-CFB8DIR = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR2 = hw/xfree98
-XF98WABEPSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
-XF98WABEPOBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/vga256Conf.o \
-		 $(XF98SRC)/xaa/xaa16/xaa16.o $(XF98SRC)/xaa/xaa24/xaa24.o $(XF98SRC)/xaa/xaa32/xaa32.o $(XF98SRC)/xaa/xaavga256/xaavga256.o
-XF98WABEPLIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(driverwabep) \
-	       $(XF98SRC)/xaa/LibraryTargetName(xaa) \
-	       $(XF98SRC)/vga256/LibraryTargetName(wabep) $(XF98LIBS) CFBLibs
-XF98WABEPSYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF98WABEPSUBDIRS) $(XF98WABEPOBJS) $(XF98WABEPLIBS) $(XF98WABEPSYSLIBS))
-#endif
-#if HasGnuMake
-$(XF98WABEPOBJS) $(XF98WABEPLIBS) $(XF98WABEPSYSLIBS):: $(XF98WABEPSUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF98_WABEP,$(XF98WABEPSUBDIRS),$(XF98WABEPOBJS),$(XF98WABEPLIBS),$(XF98WABEPSYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF98_WABEP
-#endif
-#endif	/* XF98WABEPServer */
-
-
-#if XF98WSNAServer
-XCOMM
-XCOMM XFree98 WSN-A2F Server
-XCOMM
-MFBDIR  = mfb
-CFB8DIR = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR2 = hw/xfree98
-XF98WSNASUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
-XF98WSNAOBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/vga256Conf.o \
-		 $(XF98SRC)/xaa/xaa16/xaa16.o $(XF98SRC)/xaa/xaa24/xaa24.o $(XF98SRC)/xaa/xaa32/xaa32.o $(XF98SRC)/xaa/xaavga256/xaavga256.o
-XF98WSNALIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(driverwsna) \
-	       $(XF98SRC)/xaa/LibraryTargetName(xaa) \
-	       $(XF98SRC)/vga256/LibraryTargetName(wsna) $(XF98LIBS) CFBLibs
-XF98WSNASYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF98WSNASUBDIRS) $(XF98WSNAOBJS) $(XF98WSNALIBS) $(XF98WSNASYSLIBS))
-#endif
-#if HasGnuMake
-$(XF98WSNAOBJS) $(XF98WSNALIBS) $(XF98WSNASYSLIBS):: $(XF98WSNASUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF98_WSNA,$(XF98WSNASUBDIRS),$(XF98WSNAOBJS),$(XF98WSNALIBS),$(XF98WSNASYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF98_WSNA
-#endif
-#endif	/* XF98WSNAServer */
-
-
-#if XF98TGUIServer
-XCOMM
-XCOMM XFree98 Trident Cyber9320/9680 Server
-XCOMM
-MFBDIR  = mfb
-CFB8DIR = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR2 = hw/xfree98
-XF98TGUISUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
-XF98TGUIOBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/tguiConf.o \
-		 $(XF98SRC)/xaa/xaa16/xaa16.o $(XF98SRC)/xaa/xaa24/xaa24.o $(XF98SRC)/xaa/xaa32/xaa32.o $(XF98SRC)/xaa/xaavga256/xaavga256.o
-XF98TGUILIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(drivertrident) \
-	       $(XF98SRC)/xaa/LibraryTargetName(xaa) \
-	       $(XF98SRC)/vga256/LibraryTargetName(trident) $(XF98LIBS) CFBLibs
-XF98TGUISYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF98TGUISUBDIRS) $(XF98TGUIOBJS) $(XF98TGUILIBS) $(XF98TGUISYSLIBS))
-#endif
-#if HasGnuMake
-$(XF98TGUIOBJS) $(XF98TGUILIBS) $(XF98TGUISYSLIBS):: $(XF98TGUISUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF98_TGUI,$(XF98TGUISUBDIRS),$(XF98TGUIOBJS),$(XF98TGUILIBS),$(XF98TGUISYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF98_TGUI
-#endif
-#endif	/* XF98TGUIServer */
-
-
-#if XF98MGAServer
-XCOMM
-XCOMM XFree98 Matrox Millennium/Mystique Server
-XCOMM
-MFBDIR  = mfb
-CFB8DIR = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR2 = hw/xfree98
-XF98MGASUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
-XF98MGAOBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/mgaConf.o \
-		 $(XF98SRC)/xaa/xaa16/xaa16.o $(XF98SRC)/xaa/xaa24/xaa24.o $(XF98SRC)/xaa/xaa32/xaa32.o $(XF98SRC)/xaa/xaavga256/xaavga256.o
-XF98MGALIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(drivermga) \
-	       $(XF98SRC)/xaa/LibraryTargetName(xaa) \
-	       $(XF98SRC)/vga256/LibraryTargetName(mga) $(XF98LIBS) CFBLibs
-XF98MGASYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF98MGASUBDIRS) $(XF98MGAOBJS) $(XF98MGALIBS) $(XF98MGASYSLIBS))
-#endif
-#if HasGnuMake
-$(XF98MGAOBJS) $(XF98MGALIBS) $(XF98MGASYSLIBS):: $(XF98MGASUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF98_MGA,$(XF98MGASUBDIRS),$(XF98MGAOBJS),$(XF98MGALIBS),$(XF98MGASYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF98_MGA
-#endif
-#endif	/* XF98MGAServer */
-
-
-#if XF98SVGAServer
-XCOMM
-XCOMM XFree98 Cirrus Logic CLGD7555 Server
-XCOMM
-MFBDIR  = mfb
-CFB8DIR = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR2 = hw/xfree98
-XF98SVGASUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
-XF98SVGAOBJS = $(XF98COMSRC)/XF86_SVGA.o $(XF98SRC)/vga256/vga256Conf.o \
-		 $(XF98SRC)/xaa/xaa16/xaa16.o $(XF98SRC)/xaa/xaa24/xaa24.o $(XF98SRC)/xaa/xaa32/xaa32.o $(XF98SRC)/xaa/xaavga256/xaavga256.o
-XF98SVGALIBS = $(XF98VGADRIVERSRC)/LibraryTargetName(driversvga) \
-	       $(XF98SRC)/xaa/LibraryTargetName(xaa) \
-	       $(XF98SRC)/vga256/LibraryTargetName(vga256) $(XF98LIBS) CFBLibs
-XF98SVGASYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF98SVGASUBDIRS) $(XF98SVGAOBJS) $(XF98SVGALIBS) $(XF98SVGASYSLIBS))
-#endif
-#if HasGnuMake
-$(XF98SVGAOBJS) $(XF98SVGALIBS) $(XF98SVGASYSLIBS):: $(XF98SVGASUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF98_SVGA,$(XF98SVGASUBDIRS),$(XF98SVGAOBJS),$(XF98SVGALIBS),$(XF98SVGASYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF98_SVGA
-#endif
-#endif	/* XF98SVGAServer */
-
-
-#if XF98EGCServer
-XCOMM
-XCOMM XFree98 EGC Server
-XCOMM
-DDXDIR2 = hw/xfree98
-XF98EGCSUBDIRS = $(STDDIRS) $(DDXDIR2) $(DEPDIRS)
-XF98EGCOBJS = $(XF98COMSRC)/XF86_VGA16.o $(XF98SRC)/vga16/vga16Conf.o \
-                $(XF98SRC)/vga16/misc/vga16misc.o
-XF98EGCLIBS = $(XF98VGA16DRIVERSRC)/LibraryTargetName(driver16) \
-		$(XF98SRC)/vga16/LibraryTargetName(vga16) $(XF98MLIBS) \
-		NoMFBBareLibs $(OTHEREXTS)
-XF98EGCSYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF98EGCSUBDIRS) $(XF98EGCOBJS) $(XF98EGCLIBS) $(XF98EGCSYSLIBS))
-#endif
-#if HasGnuMake
-$(XF98EGCOBJS) $(XF98EGCLIBS) $(XF98EGCSYSLIBS):: $(XF98EGCSUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF98_EGC,$(XF98EGCSUBDIRS),$(XF98EGCOBJS),$(XF98EGCLIBS),$(XF98EGCSYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF98_EGC
-#endif
-#endif	/* XF98EGCServer */
-
-
-#if XF98NECS3Server
-XCOMM
-XCOMM XFree98 NEC S3 Server
-XCOMM
-MFBDIR   = mfb
-CFB8DIR  = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR2 = hw/xfree98
-XF98NECS3SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) \
-                   $(CFB24DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
-XF98NECS3OBJS = $(XF98COMSRC)/XF86_S3.o $(XF98ACCELSRC)/s3nec/s3Conf.o \
-                $(XF98NECS3DRIVERSRC)/newmmio/newmmio.o \
-                $(XF98NECS3DRIVERSRC)/mmio_928/mmio_928.o \
-                $(XF98NECS3DRIVERSRC)/s3_generic/s3_generic.o
-XF98NECS3LIBS = $(XF98ACCELSRC)/s3nec/LibraryTargetName(s3nec) \
-                $(XF98ACCELSRC)/s3nec/s3newmmio/LibraryTargetName(s3necnewmmio) \
-                $(XF98ACCELSRC)/s3nec/s3mmio/LibraryTargetName(s3necmmio) \
-                $(XF98LIBSNEC) CFBLibs \
-                $(XF98ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF98NECS3SYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF98NECS3SUBDIRS) $(XF98NECS3OBJS) $(XF98NECS3LIBS) $(XF98NECS3SYSLIBS))
-#endif
-#if HasGnuMake
-$(XF98NECS3OBJS) $(XF98NECS3LIBS) $(XF98NECS3SYSLIBS):: $(XF98NECS3SUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF98_NECS3,$(XF98NECS3SUBDIRS),$(XF98NECS3OBJS),$(XF98NECS3LIBS),$(XF98NECS3SYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF98_NECS3
-#endif
-#endif	/* XF98NECS3Server */
-
-
-#if XF98PWSKBServer
-XCOMM
-XCOMM XFree98 S3 PW/PCSKB Server
-XCOMM
-MFBDIR   = mfb
-CFB8DIR  = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR2 = hw/xfree98
-XF98PWSKBSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) \
-                   $(CFB24DIR) $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
-XF98PWSKBOBJS = $(XF98COMSRC)/XF86_S3.o $(XF98ACCELSRC)/s3pwskb/s3Conf.o \
-                $(XF98PWSKBDRIVERSRC)/newmmio/newmmio.o \
-                $(XF98PWSKBDRIVERSRC)/mmio_928/mmio_928.o \
-                $(XF98PWSKBDRIVERSRC)/s3_generic/s3_generic.o
-XF98PWSKBLIBS = $(XF98ACCELSRC)/s3pwskb/LibraryTargetName(s3pwskb) \
-                $(XF98ACCELSRC)/s3pwskb/s3newmmio/LibraryTargetName(s3pwskbnewmmio) \
-                $(XF98ACCELSRC)/s3pwskb/s3mmio/LibraryTargetName(s3pwskbmmio) \
-                $(XF98LIBSPWSKB) CFBLibs \
-                $(XF98ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF98PWSKBSYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF98PWSKBSUBDIRS) $(XF98PWSKBOBJS) $(XF98PWSKBLIBS) $(XF98PWSKBSYSLIBS))
-#endif
-#if HasGnuMake
-$(XF98PWSKBOBJS) $(XF98PWSKBLIBS) $(XF98PWSKBSYSLIBS):: $(XF98PWSKBSUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF98_PWSKB,$(XF98PWSKBSUBDIRS),$(XF98PWSKBOBJS),$(XF98PWSKBLIBS),$(XF98PWSKBSYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF98_PWSKB
-#endif
-#endif	/* XF98PWSKBServer */
-
-
-#if XF98PWLBServer
-XCOMM
-XCOMM XFree98 S3 PW/LB Server
-XCOMM
-MFBDIR   = mfb
-CFB8DIR  = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR2 = hw/xfree98
-XF98PWLBSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \
-                  $(DDXDIR2) $(DEPDIRS)
-XF98PWLBOBJS = $(XF98COMSRC)/XF86_S3.o $(XF98ACCELSRC)/s3pwlb/s3Conf.o \
-               $(XF98PWLBDRIVERSRC)/newmmio/newmmio.o \
-               $(XF98PWLBDRIVERSRC)/mmio_928/mmio_928.o \
-               $(XF98PWLBDRIVERSRC)/s3_generic/s3_generic.o
-XF98PWLBLIBS = $(XF98ACCELSRC)/s3pwlb/LibraryTargetName(s3pwlb) \
-               $(XF98ACCELSRC)/s3pwlb/s3newmmio/LibraryTargetName(s3pwlbnewmmio) \
-               $(XF98ACCELSRC)/s3pwlb/s3mmio/LibraryTargetName(s3pwlbmmio) \
-               $(XF98LIBSPWLB) CFBLibs \
-               $(XF98ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF98PWLBSYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF98PWLBSUBDIRS) $(XF98PWLBOBJS) $(XF98PWLBLIBS) $(XF98PWLBSYSLIBS))
-#endif
-#if HasGnuMake
-$(XF98PWLBOBJS) $(XF98PWLBLIBS) $(XF98PWLBSYSLIBS):: $(XF98PWLBSUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF98_PWLB,$(XF98PWLBSUBDIRS),$(XF98PWLBOBJS),$(XF98PWLBLIBS),$(XF98PWLBSYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF98_PWLB
-#endif
-#endif	/* XF98PWLBServer */
-
-
-#if XF98GA968Server
-XCOMM
-XCOMM XFree98 S3 GA-968 Server
-XCOMM
-MFBDIR   = mfb
-CFB8DIR  = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR2 = hw/xfree98
-XF98GA968SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) \
-                   $(CFB32DIR) $(DDXDIR2) $(DEPDIRS)
-XF98GA968OBJS = $(XF98COMSRC)/XF86_S3.o $(XF98ACCELSRC)/s3ga968/s3Conf.o \
-                $(XF98GA968DRIVERSRC)/newmmio/newmmio.o \
-                $(XF98GA968DRIVERSRC)/mmio_928/mmio_928.o \
-                $(XF98GA968DRIVERSRC)/s3_generic/s3_generic.o
-XF98GA968LIBS = $(XF98ACCELSRC)/s3ga968/LibraryTargetName(s3ga968) \
-                $(XF98ACCELSRC)/s3ga968/s3newmmio/LibraryTargetName(s3ga968newmmio) \
-                $(XF98ACCELSRC)/s3ga968/s3mmio/LibraryTargetName(s3ga968mmio) \
-                $(XF98LIBSGA968) CFBLibs \
-                $(XF98ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF98GA968SYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF98GA968SUBDIRS) $(XF98GA968OBJS) $(XF98GA968LIBS) $(XF98GA968SYSLIBS))
-#endif
-#if HasGnuMake
-$(XF98GA968OBJS) $(XF98GA968LIBS) $(XF98GA968SYSLIBS):: $(XF98GA968SUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF98_GA968,$(XF98GA968SUBDIRS),$(XF98GA968OBJS),$(XF98GA968LIBS),$(XF98GA968SYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF98_GA968
-#endif
-#endif	/* XF98GA968Server */
-
-
-#if XF86I128Server
-XCOMM
-XCOMM XFree86 I128 Server
-XCOMM
-MFBDIR   = mfb
-CFB8DIR  = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR1  = hw/xfree86
-XF86I128SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) \
-                  $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
-XF86I128OBJS = $(XF86COMSRC)/XF86_I128.o \
-	       $(XF86SRC)/xaa/xaa8/xaa8.o $(XF86SRC)/xaa/xaa16/xaa16.o \
-	       $(XF86SRC)/xaa/xaa24/xaa24.o $(XF86SRC)/xaa/xaa32/xaa32.o
-XF86I128LIBS = $(XF86ACCELSRC)/i128/LibraryTargetName(i128) \
-	       $(XF86SRC)/xaa/LibraryTargetName(xaa) $(XF86LIBS) \
-               CFBLibs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF86I128SYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF86I128SUBDIRS) $(XF86I128OBJS) $(XF86I128LIBS) $(XF86I128SYSLIBS))
-#endif
-#if HasGnuMake
-$(XF86I128OBJS) $(XF86I128LIBS) $(XF86I128SYSLIBS):: $(XF86I128SUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF86_I128,$(XF86I128SUBDIRS),$(XF86I128OBJS),$(XF86I128LIBS),$(XF86I128SYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF86_I128
-#endif
-#ifdef OS2Architecture
-LinkFile(XF86_I128.def,I128.def)
-InstallLinkKitNonExecFile(I128.def,$(LINKKITDIR))
-#endif
-#endif        /* XF86I128Server */
-
-
-#if XF86TGAServer
-XCOMM
-XCOMM XFree86 TGA Server
-XCOMM
-MFBDIR   = mfb
-CFB8DIR  = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR1  = hw/xfree86
-XF86TGASUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) \
-                 $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
-XF86TGAOBJS = $(XF86COMSRC)/XF86_TGA.o \
-	      $(XF86SRC)/xaa/xaa8/xaa8.o $(XF86SRC)/xaa/xaa16/xaa16.o \
-	      $(XF86SRC)/xaa/xaa24/xaa24.o $(XF86SRC)/xaa/xaa32/xaa32.o
-XF86TGALIBS = $(XF86ACCELSRC)/tga/LibraryTargetName(tga) \
-	      $(XF86SRC)/xaa/LibraryTargetName(xaa) $(XF86LIBS) \
-               CFBLibs $(XF86ACCELSRC)/cache/LibraryTargetName(xf86cache)
-XF86TGASYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF86TGASUBDIRS) $(XF86TGAOBJS) $(XF86TGALIBS) $(XF86TGASYSLIBS))
-#endif
-#if HasGnuMake
-$(XF86TGAOBJS) $(XF86TGALIBS) $(XF86TGASYSLIBS):: $(XF86TGASUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF86_TGA,$(XF86TGASUBDIRS),$(XF86TGAOBJS),$(XF86TGALIBS),$(XF86TGASYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF86_TGA
-#endif
-#ifdef OS2Architecture
-LinkFile(XF86_TGA.def,TGA.def)
-InstallLinkKitNonExecFile(TGA.def,$(LINKKITDIR))
-#endif
-#endif
-
-
-#if XF68FBDevServer
-XCOMM
-XCOMM XFree68 Linux/m68k Frame Buffer Device Server
-XCOMM
-MFBDIR  = mfb
-DDXDIR3 = hw/xfree68
-#if XF68FBDevIPLAN2p2
-IPLAN2P2DIR = iplan2p2
-FBDEVFBLIBS:= $(FBDEVFBLIBS) iplan2p2/LibraryTargetName(ipl2p2)
-#endif
-#if XF68FBDevIPLAN2p4
-IPLAN2P4DIR = iplan2p4
-FBDEVFBLIBS:= $(FBDEVFBLIBS) iplan2p4/LibraryTargetName(ipl2p4)
-#endif
-#if XF68FBDevIPLAN2p8
-IPLAN2P8DIR = iplan2p8
-FBDEVFBLIBS:= $(FBDEVFBLIBS) iplan2p8/LibraryTargetName(ipl2p8)
-#endif
-#if XF68FBDevILBM
-ILBMDIR = ilbm
-FBDEVFBLIBS:= $(FBDEVFBLIBS) ilbm/LibraryTargetName(ilbm)
-#endif
-#if XF68FBDevAFB
-AFBDIR = afb
-FBDEVFBLIBS:= $(FBDEVFBLIBS) afb/LibraryTargetName(afb)
-#endif
-#if XF68FBDevCFB8
-CFB8DIR = cfb
-FBDEVFBLIBS:= $(FBDEVFBLIBS) $(CFB8)
-#endif
-#if XF68FBDevCFB16
-CFB16DIR = cfb16
-FBDEVFBLIBS:= $(FBDEVFBLIBS) $(CFB16)
-#endif
-#if XF68FBDevCFB32
-CFB32DIR = cfb32
-FBDEVFBLIBS:= $(FBDEVFBLIBS) $(CFB32)
-#endif
-XF68FBDevSUBDIRS = $(STDDIRS) $(MFBDIR) $(IPLAN2P2DIR) $(IPLAN2P4DIR) \
-                   $(IPLAN2P8DIR) $(ILBMDIR) $(AFBDIR) $(CFB8DIR) \
-                   $(CFB16DIR) $(CFB32DIR) $(DDXDIR3) $(DEPDIRS)
-XF68FBDevOBJS = $(XF68COMSRC)/XF68_FBDev.o
-XF68FBDevLIBS = $(XF68SRC)/fbdev/LibraryTargetName(fbdev) $(XF68LIBS) \
-                PreFbLibs $(FBDEVFBLIBS) PostFbLibs
-XF68FBDevSYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XF68FBDevSUBDIRS) $(XF68FBDevOBJS) $(XF68FBDevLIBS) $(XF68FBDevSYSLIBS))
-#endif
-#if HasGnuMake
-$(XF68FBDevOBJS) $(XF68FBDevLIBS) $(XF68FBDevSYSLIBS):: $(XF68FBDevSUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-SetUIDServerTarget(XF68_FBDev,$(XF68FBDevSUBDIRS),$(XF68FBDevOBJS),$(XF68FBDevLIBS),$(XF68FBDevSYSLIBS))
-#ifndef ServerToInstall
-#define ServerToInstall XF68_FBDev
-#endif
-#endif /* XF68FBDevServer */
-
-
-#if XprtServer
-XCOMM
-XCOMM Print Server
-XCOMM
-MFBDIR  = mfb
-CFB8DIR = cfb
-CFB32DIR = cfb32
-XPSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB32DIR) $(DEPDIRS)
-#if PrintOnlyServer
-XPOBJS = Xprint/ddxInit.o Xprint/miinitext.o
-XPLIBS = PreFbLibs $(XPDDXLIBS) $(XPDDXFBLIBS) PostFbLibs
-#else
-XPOBJS = Xprint/ddxInit.o
-XPLIBS = PreFbLibs PostFbLibs
-#endif
-#if (defined(SunArchitecture) || defined(SparcArchitecture)) && defined(SVR4Architecture)
-XPSYSLIBS = $(CBRT) $(SYSLIBS) -lw
-#else
-XPSYSLIBS = $(CBRT) $(SYSLIBS)
-#endif
-#if HasParallelMake
-MakeMutex($(XPSUBDIRS) $(XPOBJS) $(XPLIBS) $(XPSYSLIBS))
-#endif
-#if HasGnuMake
-$(XPOBJS) $(XPLIBS) $(XPSYSLIBS):: $(XPSUBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-ServerTarget(Xprt,$(XPSUBDIRS),$(XPOBJS),$(XPLIBS),$(XPSYSLIBS))
-#endif	/* XprtServer */
-
-#if XnestServer
-XCOMM
-XCOMM Server with Xlib-based ddx
-XCOMM
-#ifndef Win32Architecture
-XNESTDDXDIR = hw/xnest
-#else
-XNESTDDXDIR = hw
-#endif
-XNESTDIRS = $(STDDIRS) $(XNESTDDXDIR) $(DEPDIRS)
-#if !defined(LynxOSArchitecture) && !defined(Win32Architecture)
-XNESTOBJS = 
-#else
-XNESTOBJS = dix/main.o
-#endif
-XNEST = hw/xnest/LibraryTargetName(xnest)
-XNESTLIBS = PreFbLibs $(XNEST) NoMfbPostFbLibs $(XNEST)
-XNESTSYSLIBS = $(LDPRELIBS) $(XLIB) $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XNESTDIRS) $(XNESTOBJS) $(XNESTLIBS) $(XNESTSYSLIBS))
-#endif
-#if HasGnuMake
-$(XNESTOBJS) $(XNESTLIBS) $(XNESTSYSLIBS):: $(XNESTDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-ServerTarget(Xnest,$(XNESTDIRS),$(XNESTOBJS),$(XNESTLIBS),$(XNESTSYSLIBS))
-#ifdef OS2Architecture
-InstallLinkKitNonExecFile(Xnest.def,$(LINKKITDIR))
-#endif
-#endif /* XnestServer */
-
-
-#if XnonServer
-XCOMM
-XCOMM non server, just compile sources for build test
-XCOMM
-MFBDIR   = mfb
-CFB8DIR  = cfb
-CFB16DIR = cfb16
-CFB32DIR = cfb32
-#if HasParallelMake
-MakeMutex($(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DEPDIRS))
-#endif
-Xnon: $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DEPDIRS)
-#endif /* XnonServer */
-
-
-#if XVirtualFramebufferServer
-XCOMM
-XCOMM server with Virtual (malloced) framebuffer
-XCOMM
-MFBDIR   = mfb
-CFB8DIR  = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-#ifndef Win32Architecture
-XVFBDDXDIR = hw/vfb
-#else
-XVFBDDXDIR = hw
-#endif
-XVFBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(XVFBDDXDIR) $(DEPDIRS)
-#if !defined(LynxOSArchitecture) && !defined(Win32Architecture)
-XVFBOBJS = hw/vfb/stubs.o
-#else
-XVFBOBJS = hw/vfb/stubs.o dix/main.o
-#endif
-XVFB = hw/vfb/LibraryTargetName(vfb)
-XVFBLIBS = PreFbLibs $(XVFB) $(CFB) PostFbLibs
-XVFBSYSLIBS = $(SYSLIBS)
-#if HasParallelMake
-MakeMutex($(XVFBDIRS) $(XVFBOBJS) $(XVFB) $(XVFBLIBS) $(XVFBSYSLIBS))
-#endif
-#if HasGnuMake
-$(XVFBOBJS) $(XVFB) $(XVFBLIBS) $(XVFBSYSLIBS):: $(XVFBDIRS)
-	@if [ -f $@ ]; then touch $@; fi
-#endif
-ServerTarget(Xvfb,$(XVFBDIRS),$(XVFBOBJS),$(XVFBLIBS),$(XVFBSYSLIBS))
-#endif /* XVirtualFramebufferServer */
-
-
-#if XvncServer
-XCOMM
-XCOMM VNC X server
-XCOMM
-MFBDIR   = mfb
-CFB8DIR  = cfb
-CFB16DIR = cfb16
-CFB24DIR = cfb24
-CFB32DIR = cfb32
-DDXDIR1  = hw/vnc
-XVNCDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) $(DDXDIR1) $(DEPDIRS)
-XVNCOBJS = 
-#include <vnclibs.def>
-XVNC = hw/vnc/libvnc.a $(VNCLIBS)
-XVNCLIBS = PreFbLibs $(XVNC) $(CFB) PostFbLibs
-XVNCSYSLIBS = $(SYSLIBS) $(VNCSYSLIBS)
-ServerTarget(Xvnc,$(XVNCDIRS),$(XVNCOBJS),$(XVNCLIBS),$(XVNCSYSLIBS))
-#endif /* XvncServer */
-
-
-#if UseXserverWrapper
-SetUIDProgramTarget(Xwrapper,os/wrapper.o,NullParameter,NullParameter,NullParameter)
-InstallProgramWithFlags(Xwrapper,$(BINDIR),$(INSTUIDFLAGS))
-#endif
-
-CFBDIRS = $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR)
-IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR)
-DDXDIRS = $(DDXDIR1) $(DDXDIR2) $(DDXDIR3) $(XVFBDDXDIR) $(XNESTDDXDIR)
-SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFBDIRS) $(IPLANDIRS) $(ILBMDIR) $(AFBDIR) \
-          $(DDXDIRS)
-
-#if defined(ServerToInstall) && !defined(OS2Architecture)
-install::
-	-(cd $(DESTDIR)$(BINDIR); $(RM) X; $(LN) ServerToInstall X)
-#endif
-
-#define IHaveSubdirs
-
-DependSubdirs($(SUBDIRS))
-MakeLintLibSubdirs($(SUBDIRS))
-LintSubdirs($(SUBDIRS))
-
-ForceSubdirs($(DEPDIRS) $(SUBDIRS))
-
-InstallManPage(Xserver,$(MANDIR))
--- a/Xvnc/programs/Xserver/Xext/Imakefile
+++ /dev/null
@@ -1,80 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/56 1996/11/26 16:07:54 swick $
-XCOMM $XFree86: xc/programs/Xserver/Xext/Imakefile,v 3.11.2.1 1998/01/23 12:35:11 dawes Exp $
-#include <Server.tmpl>
-
-#if HasShm
-  SHMSRCS = shm.c
-  SHMOBJS = shm.o
-#endif
-
-#if BuildScreenSaverExt
-  SCRNSAVSRC = saver.c
-  SCRNSAVOBJ = saver.o
-#endif
-
-#if BuildXF86VidModeExt
- VIDMODESRCS = xf86vmode.c
- VIDMODEOBJS = xf86vmode.o
-#endif
-
-#if BuildXF86MiscExt
-XF86MISCSRCS = xf86misc.c
-XF86MISCOBJS = xf86misc.o
-#endif
-
-#if BuildXF86DGA
- XF86DGASRCS = xf86dga.c
- XF86DGAOBJS = xf86dga.o
-#endif
-
-#if BuildDPMSExt
- DPMSSRCS = dpms.c
- DPMSOBJS = dpms.o
-#endif
-
-#if BuildAppgroup
-  APPGROUPSRCS = appgroup.c
-  APPGROUPOBJS = appgroup.o
-#endif
-#if BuildXCSecurity
-    SECURITYSRCS = security.c
-    SECURITYOBJS = security.o
- SERVERCONFIGDIR = ServerConfigDir
-   POLICYFILEDEF = -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGDIR)/SecurityPolicy\"
-#endif
-
-       SRCS = shape.c $(SHMSRCS) mbuf.c \
-              mitmisc.c xtest.c xtest1di.c xtest1dd.c sleepuntil.c \
-	      bigreq.c sync.c $(SCRNSAVSRC) xcmisc.c $(VIDMODESRCS) \
-	      $(XF86MISCSRCS) $(XF86DGASRCS) $(SECURITYSRCS) \
-	      $(DPMSSRCS) \
-	      $(APPGROUPSRCS) xprint.c
-       OBJS = shape.o $(SHMOBJS) mbuf.o \
-              mitmisc.o xtest.o xtest1di.o xtest1dd.o sleepuntil.o \
-              bigreq.o sync.o $(SCRNSAVOBJ) xcmisc.o $(VIDMODEOBJS) \
-	      $(XF86MISCOBJS) $(XF86DGAOBJS) $(SECURITYOBJS) \
-	      $(DPMSOBJS) \
-	      $(APPGROUPOBJS) xprint.o
-
-XF86INCLUDES = -I../hw/xfree86/common -I../hw/xfree86/os-support
-    INCLUDES = -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) $(XF86INCLUDES)
-    LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(ext,$(OBJS))
-LintLibraryTarget(ext,$(SRCS))
-NormalLintTarget($(SRCS))
-
-#if BuildXCSecurity
-SpecialCObjectRule(security,$(ICONFIGFILES),$(POLICYFILEDEF))
-#endif
-
-InstallLinkKitLibrary(ext,$(LINKKITDIR)/lib)
-
-LinkVarDirectory(xserver,.,xserver,.)
-
-#if BuildXCSecurity && InstallSecurityConfig
-InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR))
-#endif
-
-DependTarget()
--- a/Xvnc/programs/Xserver/cfb/Imakefile
+++ /dev/null
@@ -1,252 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/67 1996/12/02 10:19:53 lehors $
-XCOMM $XFree86: xc/programs/Xserver/cfb/Imakefile,v 3.9.2.1 1997/05/03 09:45:03 dawes Exp $
-#include <Server.tmpl>
-
-#ifndef PixelSize
-#define PixelSize 8
-#endif
-
-#if PixelSize == 8
-/* cfb8cppl.c MUST come last to avoid confusing makedepend */
-PSZSRCS = cfb8bit.c cfbteblt8.c cfbglrop8.c cfbpush8.c cfbrctstp8.c cfb8cppl.c
-PSZOBJS = cfb8bit.o cfbteblt8.o cfbglrop8.o cfbpush8.o cfbrctstp8.o cfb8cppl.o
-#ifdef MipsArchitecture
-#ifndef ArcArchitecture
-#ifndef Mips64Architecture
-STIPPLESRC = stipmips.s stipmipste.s
-STIPPLEOBJ = stipmips.o stipmipste.o
-STIPPLEDEF = -DHAS_STIPPLE_CODE
-#endif
-#endif
-#endif
-#ifdef SparcArchitecture
-STIPPLESRC = stipsparc.s stipsparcte.s
-STIPPLEOBJ = stipsparc.o stipsparcte.o
-STIPPLEDEF = -DHAS_STIPPLE_CODE
-#endif
-#endif
-
-#if PixelSize == 32
-#ifdef SparcArchitecture
-STIPPLESRC = stipsprc32.s stipsprcte32.s
-STIPPLEOBJ = stipsprc32.o stipsprcte32.o
-STIPPLEDEF = -DHAS_STIPPLE_CODE
-#endif
-#endif
-
-
-SRCS =	 cfbgc.c cfbrrop.c cfbwindow.c \
-	 cfbpntwin.c cfbmskbits.c cfbpixmap.c cfbbitblt.c \
-	 cfbfillsp.c cfbsetsp.c cfbscrinit.c cfballpriv.c \
-	 cfbgetsp.c cfbfillrct.c \
-	 cfbsolidC.c cfbsolidX.c cfbsolidG.c \
-	 cfbtileoddC.c cfbtileoddG.c cfbtile32C.c cfbtile32G.c \
-	 cfbcmap.c cfbzerarcC.c cfbzerarcX.c cfbzerarcG.c \
-	 cfbfillarcC.c cfbfillarcG.c \
-	 cfbigblt8.c cfbglblt8.c cfbtegblt.c cfbbstore.c \
-	 cfbbltC.c cfbbltX.c cfbbltO.c cfbbltG.c \
-	 cfbpolypnt.c \
-	 cfbbres.c cfbline.c cfbhrzvert.c cfbbresd.c cfbimage.c cfbseg.c \
-	 cfb8lineCO.c cfb8lineX.c cfb8lineG.c cfb8lineCP.c \
-	 cfb8segC.c cfb8segX.c cfb8segG.c cfb8segCS.c \
-	 cfbply1rctC.c cfbply1rctG.c $(PSZSRCS)
-
-OBJS =   cfbgc.o cfbrrop.o cfbwindow.o \
-	 cfbgetsp.o cfbfillrct.o \
-	 cfbsolidC.o cfbsolidX.o cfbsolidG.o \
-	 cfbtileoddC.o cfbtileoddG.o cfbtile32C.o cfbtile32G.o \
-	 cfbfillsp.o cfbsetsp.o cfbscrinit.o cfballpriv.o \
-	 cfbpntwin.o cfbmskbits.o cfbpixmap.o \
-	 cfbcmap.o cfbzerarcC.o cfbzerarcX.o cfbzerarcG.o \
-	 cfbfillarcC.o cfbfillarcG.o \
-	 cfbigblt8.o cfbglblt8.o cfbtegblt.o cfbbstore.o \
-	 cfbpolypnt.o \
-	 cfbbres.o cfbline.o cfbhrzvert.o cfbbresd.o cfbimage.o cfbseg.o \
-	 cfb8lineCO.o cfb8lineX.o cfb8lineG.o cfb8lineCP.o \
-	 cfb8segCS.o cfb8segX.o cfb8segG.o cfb8segC.o \
-	 cfbbitblt.o cfbbltC.o cfbbltX.o cfbbltO.o cfbbltG.o \
-	 cfbply1rctC.o cfbply1rctG.o $(PSZOBJS) $(STIPPLEOBJ)
-
-#ifdef XFree86Version
-EXTRAINCLUDES = -I../hw/xfree86/common
-EXTRADEFINES  = -DXFREE86
-#endif
-   INCLUDES = -I. -I../cfb -I../mfb -I../mi -I../include -I$(XINCLUDESRC) \
-	      -I$(FONTINCSRC) $(EXTRAINCLUDES)
-   LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln \
-	     ../mfb/llib-lmfb.ln ../mi/llib-lmi.ln
-    DEFINES = -DPSZ=PixelSize $(EXTRADEFINES)
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(cfb,$(OBJS))
-LintLibraryTarget(cfb,$(SRCS))
-
-NormalLintTarget($(SRCS))
-
-#ifdef LinkDirectory
-
-LinkSourceFile(cfb.h,LinkDirectory)
-LinkSourceFile(cfbmap.h,LinkDirectory)
-LinkSourceFile(cfballpriv.c,LinkDirectory)
-LinkSourceFile(cfbbitblt.c,LinkDirectory)
-LinkSourceFile(cfbblt.c,LinkDirectory)
-LinkSourceFile(cfbbres.c,LinkDirectory)
-LinkSourceFile(cfbbresd.c,LinkDirectory)
-LinkSourceFile(cfbbstore.c,LinkDirectory)
-LinkSourceFile(cfbcmap.c,LinkDirectory)
-LinkSourceFile(cfbfillarc.c,LinkDirectory)
-LinkSourceFile(cfbfillrct.c,LinkDirectory)
-LinkSourceFile(cfbfillsp.c,LinkDirectory)
-LinkSourceFile(cfbgc.c,LinkDirectory)
-LinkSourceFile(cfbgetsp.c,LinkDirectory)
-LinkSourceFile(cfbhrzvert.c,LinkDirectory)
-LinkSourceFile(cfbimage.c,LinkDirectory)
-LinkSourceFile(cfbline.c,LinkDirectory)
-LinkSourceFile(cfb8line.c,LinkDirectory)
-LinkSourceFile(cfbmskbits.c,LinkDirectory)
-LinkSourceFile(cfbmskbits.h,LinkDirectory)
-LinkSourceFile(cfbpixmap.c,LinkDirectory)
-LinkSourceFile(cfbply1rct.c,LinkDirectory)
-LinkSourceFile(cfbpntwin.c,LinkDirectory)
-LinkSourceFile(cfbpolypnt.c,LinkDirectory)
-LinkSourceFile(cfbrrop.c,LinkDirectory)
-LinkSourceFile(cfbrrop.h,LinkDirectory)
-LinkSourceFile(cfbscrinit.c,LinkDirectory)
-LinkSourceFile(cfbsetsp.c,LinkDirectory)
-LinkSourceFile(cfbsolid.c,LinkDirectory)
-LinkSourceFile(cfbigblt8.c,LinkDirectory)
-LinkSourceFile(cfbglblt8.c,LinkDirectory)
-LinkSourceFile(cfbtegblt.c,LinkDirectory)
-LinkSourceFile(cfbtileodd.c,LinkDirectory)
-LinkSourceFile(cfbtile32.c,LinkDirectory)
-LinkSourceFile(cfbwindow.c,LinkDirectory)
-LinkSourceFile(cfbzerarc.c,LinkDirectory)
-LinkSourceFile(cfb8bit.h,LinkDirectory)
-#if PixelSize == 8
-LinkSourceFile(cfb8bit.c,LinkDirectory)
-LinkSourceFile(cfb8cppl.c,LinkDirectory)
-LinkSourceFile(cfbpush8.c,LinkDirectory)
-LinkSourceFile(cfbrctstp8.c,LinkDirectory)
-LinkSourceFile(cfbteblt8.c,LinkDirectory)
-#ifdef MipsArchitecture
-LinkSourceFile(stipmips.s,LinkDirectory)
-#endif
-#ifdef SparcArchitecture
-LinkSourceFile(stipsparc.s,LinkDirectory)
-#endif
-#endif
-#if PixelSize == 32
-#ifdef SparcArchitecture
-LinkSourceFile(stipsprc32.s,LinkDirectory)
-#endif
-#endif
-#endif
-
-ObjectFromSpecialSource(cfbseg,cfbline,-DPOLYSEGMENT)
-
-ObjectFromSpecialSource(cfbfillarcC,cfbfillarc,-DRROP=GXcopy)
-ObjectFromSpecialSource(cfbfillarcG,cfbfillarc,-DRROP=GXset)
-
-ObjectFromSpecialSource(cfbzerarcC,cfbzerarc,-DRROP=GXcopy)
-ObjectFromSpecialSource(cfbzerarcX,cfbzerarc,-DRROP=GXxor)
-ObjectFromSpecialSource(cfbzerarcG,cfbzerarc,-DRROP=GXset)
-
-ObjectFromSpecialSource(cfbbltC,cfbblt,-DMROP=Mcopy)
-ObjectFromSpecialSource(cfbbltX,cfbblt,-DMROP=Mxor)
-ObjectFromSpecialSource(cfbbltO,cfbblt,-DMROP=Mor)
-ObjectFromSpecialSource(cfbbltG,cfbblt,-DMROP=0)
-
-ObjectFromSpecialSource(cfbsolidC,cfbsolid,-DRROP=GXcopy)
-ObjectFromSpecialSource(cfbsolidX,cfbsolid,-DRROP=GXxor)
-ObjectFromSpecialSource(cfbsolidG,cfbsolid,-DRROP=GXset)
-
-ObjectFromSpecialSource(cfbtileoddC,cfbtileodd,-DMROP=Mcopy)
-ObjectFromSpecialSource(cfbtileoddG,cfbtileodd,-DMROP=0)
-
-ObjectFromSpecialSource(cfbtile32C,cfbtile32,-DMROP=Mcopy)
-ObjectFromSpecialSource(cfbtile32G,cfbtile32,-DMROP=0)
-
-ObjectFromSpecialSource(cfb8lineCO,cfb8line,-DRROP=GXcopy)
-ObjectFromSpecialSource(cfb8lineCP,cfb8line,-DRROP=GXcopy -DPREVIOUS)
-ObjectFromSpecialSource(cfb8lineX,cfb8line,-DRROP=GXxor)
-ObjectFromSpecialSource(cfb8lineG,cfb8line,-DRROP=GXset)
-
-ObjectFromSpecialSource(cfb8segCS,cfb8line,-DRROP=GXcopy -DPOLYSEGMENT -DWIDTH_SHIFT)
-ObjectFromSpecialSource(cfb8segC,cfb8line,-DRROP=GXcopy -DPOLYSEGMENT)
-ObjectFromSpecialSource(cfb8segX,cfb8line,-DRROP=GXxor -DPOLYSEGMENT)
-ObjectFromSpecialSource(cfb8segG,cfb8line,-DRROP=GXset -DPOLYSEGMENT)
-
-ObjectFromSpecialSource(cfbply1rctC,cfbply1rct,-DRROP=GXcopy)
-ObjectFromSpecialSource(cfbply1rctG,cfbply1rct,-DRROP=GXset)
-
-SpecialCObjectRule(cfbglblt8,$(_NOOP_),$(STIPPLEDEF))
-SpecialCObjectRule(cfbpixmap,$(ICONFIGFILES),$(_NOOP_))
-SpecialCObjectRule(cfbcmap,$(ICONFIGFILES),$(EXT_DEFINES) $(GLX_DEFINES))
-
-#if PixelSize == 8
-ObjectFromSpecialSource(cfbglrop8,cfbglblt8,-DGLYPHROP)
-
-#ifdef MipsArchitecture
-stipmipste.s: stipmips.s
-	$(RM) $@
-	$(LN) stipmips.s stipmipste.s
-clean::
-	$(RM) stipmipste.s
-
-stipmipste.o: stipmipste.s
-	$(AS) -o $@ -DTETEXT stipmipste.s
-#endif
-
-#ifdef SparcArchitecture
-stipsparcte.s: stipsparc.s
-	$(RM) $@
-	$(LN) stipsparc.s stipsparcte.s
-clean::
-	$(RM) stipsparcte.s
-
-stipsparc.o: stipsparc.s
-	$(CPP) AsmDefines stipsparc.s | $(AS) -o $@ -
-
-stipsparcte.o: stipsparcte.s
-	$(CPP) AsmDefines -DTETEXT stipsparcte.s | $(AS) -o $@ -
-#endif
-#endif
-
-#if PixelSize == 32
-#ifdef SparcArchitecture
-stipsprcte32.s: stipsprc32.s
-	$(RM) $@
-	$(LN) stipsprc32.s stipsprcte32.s
-clean::
-	$(RM) stipsprcte32.s
-
-stipsprc32.o: stipsprc32.s
-	$(CPP) AsmDefines stipsprc32.s | $(AS) -o $@ -
-
-stipsprcte32.o: stipsprcte32.s
-	$(CPP) AsmDefines -DTETEXT stipsprcte32.s | $(AS) -o $@ -
-#endif
-#endif
-
-#if PixelSize == 32
-InstallLinkKitNamedLibrary(cfb,cfb32,$(LINKKITDIR)/lib)
-#endif
-#if PixelSize == 24
-InstallLinkKitNamedLibrary(cfb,cfb24,$(LINKKITDIR)/lib)
-#endif
-#if PixelSize == 16
-InstallLinkKitNamedLibrary(cfb,cfb16,$(LINKKITDIR)/lib)
-#endif
-#if PixelSize == 8
-InstallLinkKitLibrary(cfb,$(LINKKITDIR)/lib)
-InstallLinkKitNonExecFile(cfb.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(cfb8bit.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(cfbmap.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(cfbmskbits.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(cfbrrop.h,$(LINKKITDIR)/include)
-#endif
-
-#ifndef OS2Architecture
-DependTarget()
-#endif
-
--- a/Xvnc/programs/Xserver/cfb16/Imakefile
+++ /dev/null
@@ -1,5 +0,0 @@
-XCOMM $XConsortium: Imakefile,v 1.1 91/12/28 13:32:27 rws Exp $
-#define PixelSize	16
-#define LinkDirectory ../cfb
-
-#include "../cfb/Imakefile"
--- a/Xvnc/programs/Xserver/cfb24/Imakefile
+++ /dev/null
@@ -1,5 +0,0 @@
-XCOMM $XFree86: xc/programs/Xserver/cfb24/Imakefile,v 3.0 1996/06/29 09:06:07 dawes Exp $
-#define PixelSize	24
-#define LinkDirectory ../cfb
-
-#include "../cfb/Imakefile"
--- a/Xvnc/programs/Xserver/cfb32/Imakefile
+++ /dev/null
@@ -1,5 +0,0 @@
-XCOMM $XConsortium: Imakefile,v 1.1 91/12/28 13:32:46 rws Exp $
-#define PixelSize	32
-#define LinkDirectory ../cfb
-
-#include "../cfb/Imakefile"
--- a/Xvnc/programs/Xserver/dix/Imakefile
+++ /dev/null
@@ -1,98 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/52 1996/12/02 10:20:03 lehors $
-XCOMM $XFree86: xc/programs/Xserver/dix/Imakefile,v 3.8 1997/01/08 20:32:47 dawes Exp $
-#include <Server.tmpl>
-
-#if PrintOnlyServer
-XPSRC = xpstubs.c
-XPOBJ = xpstubs.o
-#endif
-
-#if !HasFfs
-FFS_SRC = ffs.c
-FFS_OBJ = ffs.o
-#endif
-
-#if !HasFfsl
-FFSL_SRC = ffsl.c
-FFSL_OBJ = ffsl.o
-#endif
-
-SRCS = atom.c colormap.c cursor.c devices.c dispatch.c dixutils.c events.c \
-	extension.c gc.c globals.c glyphcurs.c grabs.c \
-	main.c property.c resource.c swaprep.c swapreq.c \
-	tables.c window.c initatoms.c dixfonts.c privates.c pixmap.c $(FFS_SRC) \
-        $(FFSL_SRC)
-OBJS = atom.o colormap.o cursor.o devices.o dispatch.o dixutils.o events.o \
-	extension.o gc.o globals.o glyphcurs.o grabs.o \
-	main.o property.o resource.o swaprep.o swapreq.o \
-	tables.o window.o initatoms.o dixfonts.o privates.o pixmap.o $(FFS_OBJ) \
-        $(FFSL_OBJ)
-
-    INCLUDES = -I../include -I$(XINCLUDESRC) -I$(FONTINCSRC) -I$(EXTINCSRC)
-    LINTLIBS = ../os/llib-los.ln
-
-/*
- * The following configuration parameters may be set in the appropriate
- * .macros files or site.def in the directory util/imake.includes/:
- *
- *     DefaultFontPath                COMPILEDDEFAULTFONTPATH
- *     DefaultRGBDatabase             RGB_DB
- *
- * The sample util/imake.includes/Imake.tmpl will provide generic defaults.
- * The values in site.h are simply a last line of defense and should not be
- * changed.
- */
-
-#ifdef DefaultFontPath
-DEFAULTFONTPATH = DefaultFontPath
-SITE_FONT_PATH = -DCOMPILEDDEFAULTFONTPATH=\"$(DEFAULTFONTPATH)\"
-#endif
-
-#ifdef DefaultRGBDatabase
-DEFAULTRGBDATABASE = DefaultRGBDatabase
-   SITE_RGB_DB = -DRGB_DB=\"$(DEFAULTRGBDATABASE)\"
-#endif
-
-#ifdef DefaultDisplayClass
-DEFAULTDISPLAYCLASS = DefaultDisplayClass
-   SITE_DISPLAY_CLASS = -DCOMPILEDDISPLAYCLASS=\"$(DEFAULTDISPLAYCLASS)\"
-#endif
-
-#ifdef XVendorString
-VENDORSTRING = XVendorString
-   VENDOR_STRING = -DVENDOR_STRING="$(VENDORSTRING)"
-#endif
-
-#ifdef XVendorRelease
-VENDORRELEASE = XVendorRelease
-   VENDOR_RELEASE = -DVENDOR_RELEASE=$(VENDORRELEASE)
-#endif
-
-#if HasKrb5
-         K5DEFS = Krb5Defines
-#endif
-
-SITE_DEFINES = $(SITE_FONT_PATH) $(SITE_RGB_DB) $(SITE_DISPLAY_CLASS)
-
-VENDOR_DEFINES = $(VENDOR_STRING) $(VENDOR_RELEASE)
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(dix,$(OBJS))
-LintLibraryTarget(dix,$(SRCS) $(XPSRC))
-NormalLintTarget($(SRCS) $(XPSRC))
-
-SpecialCObjectRule(globals,$(ICONFIGFILES),$(SITE_DEFINES))
-SpecialCObjectRule(tables,$(ICONFIGFILES),$(K5DEFS))
-SpecialCObjectRule(dispatch,$(ICONFIGFILES),$(K5DEFS))
-SpecialCObjectRule(main,$(ICONFIGFILES),$(VENDOR_DEFINES))
-SpecialCObjectRule(pixmap,$(ICONFIGFILES),$(_NOOP_))
-SpecialCObjectRule(privates,$(ICONFIGFILES),$(_NOOP_))
-
-#if PrintOnlyServer
-NormalLibraryTarget(xpstubs,$(XPOBJ))
-#endif
-
-InstallLinkKitLibrary(dix,$(LINKKITDIR)/lib)
-InstallLinkKitLibrary(xpstubs,$(LINKKITDIR)/lib)
-
-DependTarget()
--- a/Xvnc/programs/Xserver/hw/vnc/Imakefile
+++ /dev/null
@@ -1,25 +0,0 @@
-XCOMM $XConsortium: Imakefile,v 1.5 94/01/21 22:04:27 dpw Exp $
-#include <Server.tmpl>
-
-SRCS = init.c sockets.c kbdptr.c cmap.c draw.c cutpaste.c \
-       dispcur.c sprite.c rfbserver.c translate.c httpd.c auth.c \
-       rre.c corre.c stats.c hextile.c zlib.c tight.c cursor.c
-
-OBJS = init.o sockets.o kbdptr.o cmap.o draw.o cutpaste.o \
-       dispcur.o sprite.o rfbserver.o translate.o httpd.o auth.o \
-       rre.o corre.o stats.o hextile.o zlib.o tight.o cursor.o
-
-#include <vnclibs.def>
-INCLUDES = -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) -I$(XINCLUDESRC) \
-	   -I../../cfb -I../../mfb -I../../mi -I../../include -I../../os \
-	   $(VNCCPPFLAGS)
-
-DEFINES = ServerOSDefines
-
-all:: $(OBJS)
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(vnc,$(OBJS))
-SpecialCObjectRule(init,$(ICONFIGFILES),-DXVNCRELEASE=XvncRelease)
-
-DependTarget()
--- a/Xvnc/programs/Xserver/include/Imakefile
+++ /dev/null
@@ -1,40 +0,0 @@
-XCOMM $XConsortium: Imakefile,v 1.2 95/01/13 20:28:14 kaleb Exp $
-XCOMM $XFree86: xc/programs/Xserver/include/Imakefile,v 3.5.4.1 1997/05/12 12:52:39 hohndel Exp $
-
-all::
-
-InstallLinkKitNonExecFile(closure.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(colormap.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(colormapst.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(cursor.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(cursorstr.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(dix.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(dixfont.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(dixfontstr.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(dixstruct.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(extension.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(extnsionst.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(gc.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(gcstruct.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(input.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(inputstr.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(misc.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(miscstruct.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(opaque.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(os.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(pixmap.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(pixmapstr.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(property.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(resource.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(region.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(regionstr.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(screenint.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(scrnintstr.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(servermd.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(site.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(validate.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(window.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(windowstr.h,$(LINKKITDIR)/include)
-
-depend::
-
--- a/Xvnc/programs/Xserver/mfb/Imakefile
+++ /dev/null
@@ -1,93 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/42 1996/11/04 16:09:42 kaleb $
-XCOMM $XFree86: xc/programs/Xserver/mfb/Imakefile,v 3.2 1996/12/23 07:09:36 dawes Exp $
-#include <Server.tmpl>
-
-SRCS1 =	 mfbgc.c mfbwindow.c mfbfont.c \
-	 mfbfillrct.c mfbpntwin.c maskbits.c mfbpixmap.c \
-	 mfbimage.c mfbline.c mfbbres.c mfbhrzvert.c mfbbresd.c \
-	 mfbpushpxl.c mfbzerarc.c mfbfillarc.c \
-         mfbfillsp.c mfbsetsp.c mfbscrinit.c mfbscrclse.c mfbclip.c \
-         mfbbitblt.c mfbgetsp.c mfbpolypnt.c \
-	 mfbbltC.c mfbbltX.c mfbbltCI.c mfbbltO.c mfbbltG.c \
-	 mfbcmap.c mfbtileC.c mfbtileG.c mfbmisc.c mfbbstore.c
-
-SRCS =	 $(SRCS1) mfbseg.c mfbpgbwht.c mfbpgbblak.c mfbpgbinv.c mfbigbwht.c \
-	 mfbigbblak.c mfbpawhite.c mfbpablack.c mfbpainv.c mfbtewhite.c \
-	 mfbteblack.c mfbbltC.c mfbbltX.c mfbbltCI.c mfbbltO.c mfbbltG.c \
-	 mfbtileC.c mfbtileG.c mfbplywhite.c mfbplyblack.c mfbplyinv.c
-
-OBJS =   mfbgc.o mfbwindow.o mfbfont.o \
-	 mfbfillrct.o mfbpntwin.o maskbits.o mfbpixmap.o \
-	 mfbimage.o mfbline.o mfbbres.o mfbhrzvert.o mfbbresd.o mfbseg.o \
-	 mfbpushpxl.o mfbzerarc.o mfbfillarc.o \
-	 mfbfillsp.o mfbsetsp.o mfbscrinit.o mfbscrclse.o mfbclip.o \
-         mfbbitblt.o mfbgetsp.o mfbpolypnt.o \
-	 mfbbltC.o mfbbltX.o mfbbltCI.o mfbbltO.o mfbbltG.o \
-	 mfbpgbwht.o mfbpgbblak.o mfbpgbinv.o \
-	 mfbigbwht.o mfbigbblak.o mfbcmap.o \
-	 mfbpawhite.o mfbpablack.o mfbpainv.o mfbtileC.o mfbtileG.o \
-         mfbtewhite.o mfbteblack.o mfbmisc.o mfbbstore.o \
-         mfbplywhite.o mfbplyblack.o mfbplyinv.o
-
-INCLUDES = -I. -I../mi -I../include -I$(XINCLUDESRC) -I$(FONTINCSRC)
-LINTDEFS = -DMFBPOLYGLYPHBLT=mfbPolyGlyphBltWhite \
-	   -DMFBIMAGEGLYPHBLT=mfbImageGlyphBltWhite \
-	   -DEQWHOLEWORD=MFB_EQWHOLEWORD_WHITE -DOPEQ=MFB_OPEQ_WHITE
-
-LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln ../mi/llib-lmi.ln
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(mfb,$(OBJS))
-LintLibraryTarget(mfb,$(SRCS1))
-NormalLintTarget($(LINTDEFS) $(SRCS1))
-
-ObjectFromSpecialSource(mfbseg,mfbline,-DPOLYSEGMENT)
-
-ObjectFromSpecialSource(mfbpgbwht,mfbplygblt,-DMFBPOLYGLYPHBLT=mfbPolyGlyphBltWhite -DOPEQ=MFB_OPEQ_WHITE)
-
-ObjectFromSpecialSource(mfbpgbblak,mfbplygblt,-DMFBPOLYGLYPHBLT=mfbPolyGlyphBltBlack -DOPEQ=MFB_OPEQ_BLACK)
-
-ObjectFromSpecialSource(mfbpgbinv,mfbplygblt,-DMFBPOLYGLYPHBLT=mfbPolyGlyphBltInvert -DOPEQ=MFB_OPEQ_INVERT)
-
-ObjectFromSpecialSource(mfbigbwht,mfbimggblt,-DMFBIMAGEGLYPHBLT=mfbImageGlyphBltWhite -DOPEQ=MFB_OPEQ_WHITE)
-
-ObjectFromSpecialSource(mfbigbblak,mfbimggblt,-DMFBIMAGEGLYPHBLT=mfbImageGlyphBltBlack -DOPEQ=MFB_OPEQ_BLACK)
-
-ObjectFromSpecialSource(mfbpawhite,mfbpntarea,-DMFBSOLIDFILLAREA=mfbSolidWhiteArea -DMFBSTIPPLEFILLAREA=mfbStippleWhiteArea -DOPEQ=MFB_OPEQ_WHITE -DEQWHOLEWORD=MFB_EQWHOLEWORD_WHITE)
-
-ObjectFromSpecialSource(mfbpablack,mfbpntarea,-DMFBSOLIDFILLAREA=mfbSolidBlackArea -DMFBSTIPPLEFILLAREA=mfbStippleBlackArea -DOPEQ=MFB_OPEQ_BLACK -DEQWHOLEWORD=MFB_EQWHOLEWORD_BLACK)
-
-ObjectFromSpecialSource(mfbpainv,mfbpntarea,-DMFBSOLIDFILLAREA=mfbSolidInvertArea -DMFBSTIPPLEFILLAREA=mfbStippleInvertArea -DOPEQ=MFB_OPEQ_INVERT -DEQWHOLEWORD=MFB_EQWHOLEWORD_INVERT)
-
-ObjectFromSpecialSource(mfbtewhite,mfbtegblt,-DMFBTEGLYPHBLT=mfbTEGlyphBltWhite -DOP=MFB_OP_WHITE -DCLIPTETEXT=mfbImageGlyphBltWhite)
-
-ObjectFromSpecialSource(mfbteblack,mfbtegblt,-DMFBTEGLYPHBLT=mfbTEGlyphBltBlack -DOP=MFB_OP_BLACK -DCLIPTETEXT=mfbImageGlyphBltBlack)
-
-ObjectFromSpecialSource(mfbplywhite,mfbply1rct,-DMFBFILLPOLY1RECT=mfbFillPolyWhite -DOPEQ=MFB_OPEQ_WHITE -DEQWHOLEWORD=MFB_EQWHOLEWORD_WHITE)
-
-ObjectFromSpecialSource(mfbplyblack,mfbply1rct,-DMFBFILLPOLY1RECT=mfbFillPolyBlack -DOPEQ=MFB_OPEQ_BLACK -DEQWHOLEWORD=MFB_EQWHOLEWORD_BLACK)
-
-ObjectFromSpecialSource(mfbplyinv,mfbply1rct,-DMFBFILLPOLY1RECT=mfbFillPolyInvert -DOPEQ=MFB_OPEQ_INVERT -DEQWHOLEWORD=MFB_EQWHOLEWORD_INVERT)
-
-ObjectFromSpecialSource(mfbbltC,mfbblt,-DMROP=Mcopy)
-
-ObjectFromSpecialSource(mfbbltX,mfbblt,-DMROP=Mxor)
-
-ObjectFromSpecialSource(mfbbltCI,mfbblt,-DMROP=McopyInverted)
-
-ObjectFromSpecialSource(mfbbltO,mfbblt,-DMROP=Mor)
-
-ObjectFromSpecialSource(mfbbltG,mfbblt,-DMROP=0)
-
-ObjectFromSpecialSource(mfbtileC,mfbtile,-DMROP=Mcopy)
-
-ObjectFromSpecialSource(mfbtileG,mfbtile,-DMROP=0)
-
-SpecialCObjectRule(mfbpixmap,$(ICONFIGFILES),$(_NOOP_))
-
-InstallLinkKitLibrary(mfb,$(LINKKITDIR)/lib)
-InstallLinkKitNonExecFile(fastblt.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(mfb.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(mergerop.h,$(LINKKITDIR)/include)
-
-DependTarget()
--- a/Xvnc/programs/Xserver/mi/Imakefile
+++ /dev/null
@@ -1,74 +0,0 @@
-XCOMM $XFree86: xc/programs/Xserver/mi/Imakefile,v 3.11.2.1 1997/05/03 09:50:45 dawes Exp $
-XCOMM $XConsortium: Imakefile /main/44 1996/12/02 10:22:16 lehors $
-#include <Server.tmpl>
-
-#if ! HasCbrt
-CBRT_SRC = cbrt.c
-CBRT_OBJ = cbrt.o
-#endif
-
-SRCS =  $(CBRT_SRC) mivaltree.c mipolyseg.c mipolyrect.c \
-	mipoly.c mipolycon.c mipolygen.c mipolyutil.c \
-	mifillrct.c miwideline.c mispans.c \
-	miarc.c mizerarc.c mifillarc.c \
-	miwindow.c micursor.c miregion.c \
-	mipolytext.c mibitblt.c mipolypnt.c mipushpxl.c \
-	miexpose.c miglblt.c mizerline.c mifpolycon.c \
-	midash.c mibstore.c miinitext.c mieq.c \
-	mipointer.c misprite.c midispcur.c miscrinit.c miclipn.c migc.c
-
-OBJS =	$(CBRT_OBJ) mivaltree.o mipolyseg.o mipolyrect.o \
-	mipoly.o mipolycon.o mipolygen.o mipolyutil.o \
-	mifillrct.o miwideline.o mispans.o \
-	miarc.o mizerarc.o mifillarc.o \
-	miwindow.o micursor.o miregion.o \
-	mipolytext.o mibitblt.o mipolypnt.o mipushpxl.o \
-	miexpose.o miglblt.o mizerline.o mifpolycon.o \
-	midash.o mibstore.o miinitext.o mieq.o \
-	mipointer.o misprite.o midispcur.o miscrinit.o miclipn.o migc.o
-
-#ifdef XFree86Version
-/* 
- * Make sure XINPUT, XF86VidTune, etc aren't defined for the miinitext.o 
- * used by Xnest, Xvfb 
- */
-EXT_DEFINES = ExtensionDefines -UXINPUT -UXF86VIDMODE -UXFreeXDGA -UXF86MISC
-#else
-EXT_DEFINES = ExtensionDefines
-#endif
-#if PexDynamicModule
-PEX_MODULE_DEFINES = -DPEX_MODULE
-#endif
-#if XieDynamicModule
-XIE_MODULE_DEFINES = -DXIE_MODULE
-#endif
-EXT_MODULES_DEFINES = $(PEX_MODULE_DEFINES) $(XIE_MODULE_DEFINES)
-
-INCLUDES = -I. -I../include -I../../../include/fonts \
-           -I$(XINCLUDESRC) -I$(FONTINCSRC)
-LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(mi,$(OBJS))
-LintLibraryTarget(mi,$(SRCS))
-NormalLintTarget($(SRCS))
-
-#ifndef Win32Architecture
-NormalLibraryTarget(cbrt,cbrt.o)
-#endif
-
-SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(EXT_DEFINES) -UGLXEXT)
-SpecialCObjectRule(miscrinit,$(ICONFIGFILES),$(EXT_DEFINES))
-
-InstallLinkKitLibrary(mi,$(LINKKITDIR)/lib)
-InstallLinkKitLibrary(cbrt,$(LINKKITDIR)/lib)
-InstallLinkKitNonExecFile(mi.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(mibstore.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(miline.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(mipointer.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(misprite.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(mispritest.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(mistruct.h,$(LINKKITDIR)/include)
-InstallLinkKitNonExecFile(miinitext.c,$(LINKKITDIR))
-
-DependTarget()
--- a/Xvnc/programs/Xserver/os/Imakefile
+++ /dev/null
@@ -1,157 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/84 1996/12/15 21:26:59 rws $
-XCOMM $XFree86: xc/programs/Xserver/os/Imakefile,v 3.18.2.2 1998/02/21 06:07:15 robin Exp $
-#include <Server.tmpl>
-
-/*
- * If you have any extra files to be put into the library, define them here.
- */
-
-#ifdef HPArchitecture
-#define OtherSources hpsocket.c 
-#define OtherObjects hpsocket.o
-#endif
-
-#ifdef AmoebaArchitecture
-#define OtherSources iopreader.c
-#define OtherObjects iopreader.o
-#endif
-
-/*
- * do not modify the following two definitions
- */
-
-#ifndef OtherSources
-#define OtherSources
-#endif
-
-#ifndef OtherObjects
-#define OtherObjects
-#endif
-
-#if HasXdmAuth
-XDMAUTHDEFS = -DHASXDMAUTH
-XDMAUTHOBJS = xdmauth.o
-XDMAUTHSRCS = xdmauth.c
-#else
-XDMAUTHDEFS = 
-XDMAUTHOBJS =
-XDMAUTHSCRS =
-#endif
-
-#if HasSecureRPC
-RPCDEFS = -DSECURE_RPC
-RPCOBJS = rpcauth.o
-RPCSRCS = rpcauth.c
-#else
-RPCDEFS =
-RPCOBJS =
-RPCSRCS =
-#endif
-
-#if HasKrb5
-KRB5OBJS = k5auth.o k5encode.o
-KRB5SRCS = k5auth.c k5encode.c
-#endif
-
-#if HasBSD44Sockets
-   SOCK_DEFINES = -DBSD44SOCKETS
-#endif
-
-#if BuildLBX
-   LBX_SRCS = lbxio.c
-   LBX_OBJS = lbxio.o
-#else
-   LBX_SRCS =
-   LBX_OBJS =
-#endif
-
-BOOTSTRAPCFLAGS = 
-           SRCS = WaitFor.c access.c connection.c io.c oscolor.c \
-                  osinit.c utils.c auth.c mitauth.c secauth.c $(XDMAUTHSRCS) \
-                  $(RPCSRCS) $(KRB5SRCS) xdmcp.c decompress.c OtherSources \
-                  transport.c xalloc.c $(LBX_SRCS)
-           OBJS = WaitFor.o access.o connection.o io.o oscolor.o \
-                  osinit.o utils.o auth.o mitauth.o secauth.o $(XDMAUTHOBJS) \
-                  $(RPCOBJS) $(KRB5OBJS) xdmcp.o decompress.o OtherObjects \
-                  transport.o xalloc.o $(LBX_OBJS)
-
-#if SpecialMalloc
-     MEM_DEFINES = -DSPECIAL_MALLOC
-#endif /* SpecialMalloc */
-#if UseInternalMalloc
-     MEM_DEFINES = -DINTERNAL_MALLOC
-#endif
-#if UseMemLeak
-     MEM_DEFINES = -DMEMBUG
-#endif
-#if UseRgbTxt
-    RGB_DEFINES = -DUSE_RGB_TXT
-#endif
-    DBM_DEFINES = NdbmDefines
-    ADM_DEFINES = -DADMPATH=\"$(ADMDIR)/X\%smsgs\"
-    EXT_DEFINES = ExtensionDefines
-  XDMCP_DEFINES = ServerXdmcpDefines
-     OS_DEFINES = ServerOSDefines
-   KRB5_DEFINES = Krb5Defines
-        DEFINES = -DXSERV_t -DTRANS_SERVER ConnectionFlags $(MEM_DEFINES) $(XDMAUTHDEFS) $(RPCDEFS) $(SIGNAL_DEFINES) $(OS_DEFINES) $(KRB5_DEFINES) $(RGB_DEFINES)
-       INCLUDES = -I.  -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(TOP)/lib/Xau -I../lbx Krb5Includes
- DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) $(TRANS_INCLUDES) ConnectionFlags
-       LINTLIBS = ../dix/llib-ldix.ln
-
-#ifdef NEED_ALLOCA_FROM_LIBPW
-          PWLIB = /lib/libPW.a
-#endif /* NEED_ALLOCA_FROM_LIBPW */
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(os,$(OBJS))
-LintLibraryTarget(os,$(SRCS))
-NormalLintTarget($(SRCS))
-
-#ifdef NEED_ALLOCA_FROM_LIBPW
-XCOMM
-XCOMM And this one is to get the version of alloca that lives in /lib/libPW.a
-XCOMM without getting all of the rest of the stuff in there.
-XCOMM
-alloca.o:  $(PWLIB)
-	rm -f alloca.o
-	ar x $(PWLIB) alloca.o
-#endif /* NEED_ALLOCA_FROM_LIBPW */
-
-SpecialCObjectRule(access,$(ICONFIGFILES),$(SOCK_DEFINES) $(XDMCP_DEFINES))
-SpecialCObjectRule(auth,$(ICONFIGFILES),$(XDMCP_DEFINES))
-SpecialCObjectRule(xdmauth,$(ICONFIGFILES),$(XDMCP_DEFINES))
-SpecialCObjectRule(xdmcp,$(ICONFIGFILES),$(SOCK_DEFINES) $(XDMCP_DEFINES))
-SpecialCObjectRule(connection,$(ICONFIGFILES),$(SOCK_DEFINES) $(XDMCP_DEFINES))
-SpecialCObjectRule(transport,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES))
-LinkSourceFile(transport.c,$(TRANSCOMMSRC))
-SpecialCObjectRule(osinit,$(ICONFIGFILES),$(ADM_DEFINES))
-SpecialCObjectRule(WaitFor,$(ICONFIGFILES),$(EXT_DEFINES))
-SpecialCObjectRule(io,$(ICONFIGFILES),$(EXT_DEFINES))
-#if BuildLBX
-SpecialCObjectRule(lbxio,$(ICONFIGFILES),$(EXT_DEFINES))
-#endif
-SpecialCObjectRule(utils,$(ICONFIGFILES),$(XDMCP_DEFINES) $(EXT_DEFINES))
-SpecialCObjectRule(xalloc,$(ICONFIGFILES),NullParameter)
-#if defined(SparcArchitecture) && HasGcc && !HasGcc2
-oscolor.o: oscolor.c $(ICONFIGFILES)
-	$(RM) $@
-	cc -c $(DBM_DEFINES) $(CDEBUGFLAGS) $(ALLDEFINES) $*.c
-#else
-SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES))
-#endif
-
-#if UseXserverWrapper
-AllTarget(wrapper.o)
-
-       WRAPPER_DEFINES = -DXSERVER_PATH=\"$(BINDIR)/X\"
-
-SpecialCObjectRule(wrapper,NullParameter,$(WRAPPER_DEFINES))
-#endif
-
-#if HasKrb5
-LinkSourceFile(k5encode.c,$(XAUTHSRC))
-#endif
-
-InstallLinkKitLibrary(os,$(LINKKITDIR)/lib)
-
-DependTarget()
--- a/libvncauth/Imakefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-#ifdef SunArchitecture
-EXTRA_DEFINES = -D__EXTENSIONS__
-#endif
-
-SRCS = vncauth.c d3des.c
-
-OBJS = vncauth.o d3des.o
-
-INCLUDES = -I. -I../include
-
-NormalLibraryTarget(vncauth,$(OBJS))
-
-DependTarget()
--- a/vncconnect/Imakefile
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#ifdef SunArchitecture
-EXTRA_DEFINES = -D__EXTENSIONS__
-#endif
-
-all:: vncconnect
-
-NormalProgramTarget(vncconnect,vncconnect.o,$(DEPXLIB),$(XLIB),)
-DependTarget()
--- a/vncpasswd/Imakefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#ifdef SunArchitecture
-EXTRA_DEFINES = -D__EXTENSIONS__
-#endif
-
-SRCS = vncpasswd.c
-INCLUDES = -I../include
-VNCAUTH_LIB = ../libvncauth/libvncauth.a
-
-all:: vncpasswd
-
-NormalProgramTarget(vncpasswd,vncpasswd.o,$(VNCAUTH_LIB),$(VNCAUTH_LIB),)
-DependTarget()
--- a/vncviewer/Imakefile
+++ /dev/null
@@ -1,48 +0,0 @@
-
-#ifdef SunArchitecture
-EXTRA_DEFINES = -D__EXTENSIONS__
-#endif
-
-XCOMM Shared memory support works OK on x86 linux, not tested elsewhere but
-XCOMM seems to cause problems on Digital Unix.
-
-#if defined(i386Architecture) && defined(LinuxArchitecture)
-DEFINES = -DMITSHM
-#endif
-
-ZLIB_INC = -I/usr/local/include
-JPEG_INC = -I/usr/local/include
-INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I/usr/include
-VNCAUTH_LIB = ../libvncauth/libvncauth.a
-ZLIB_LIB = -L/usr/local/lib -lz
-#ifdef OSF1Architecture
-XCOMM Avoid linking with different libjpeg in /usr/shlib under Tru64.
-JPEG_LIB = /usr/local/lib/libjpeg.a
-#else
-JPEG_LIB = -L/usr/local/lib -ljpeg
-#endif
-
-DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB)
-LOCAL_LIBRARIES = XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB)
-
-SRCS = \
-  argsresources.c \
-  caps.c \
-  colour.c \
-  cursor.c \
-  desktop.c \
-  dialogs.c \
-  fullscreen.c \
-  listen.c \
-  misc.c \
-  popup.c \
-  rfbproto.c \
-  selection.c \
-  shm.c \
-  sockets.c \
-  tunnel.c \
-  vncviewer.c
-
-OBJS = $(SRCS:.c=.o)
-
-ComplexProgramTarget(vncviewer)