--- Makefile.orig	Thu Jan  1 01:00:00 1970
+++ ./Makefile	Fri Jul 16 22:18:44 1999
@@ -0,0 +1,986 @@
+# Makefile generated by imake - do not edit!
+# $TOG: imake.c /main/97 1997/06/20 20:23:51 kaleb $
+
+# ----------------------------------------------------------------------
+# Makefile generated from "Imake.tmpl" and </tmp/IIf.Mc9984>
+# $TOG: Imake.tmpl /main/245 1997/05/20 10:05:47 kaleb $
+#
+#
+#
+#
+# $XFree86: xc/config/cf/Imake.tmpl,v 3.32.2.11 1998/11/08 09:06:27 dawes Exp $
+# ----------------------------------------------------------------------
+
+all::
+
+.SUFFIXES: .i
+
+# $TOG: Imake.cf /main/28 1997/06/25 08:31:36 barstow $
+# $XFree86: xc/config/cf/Imake.cf,v 3.34.2.11 1998/12/22 11:23:01 hohndel Exp $
+
+# -----------------------------------------------------------------------
+# site-specific configuration parameters that need to come before
+# the platform-specific parameters - edit site.def to change
+
+# site:  $XConsortium: site.def /main/revisionist/4 1996/12/31 08:02:07 kaleb $
+# site:  $XFree86: xc/config/cf/site.def,v 3.17.2.1 1997/06/22 10:32:21 dawes Exp $
+
+# $XFree86: xc/config/cf/xf86site.def,v 3.101.2.25 1998/11/08 09:06:29 dawes Exp $
+
+# ----------------------------------------------------------------------
+# platform-specific configuration parameters - edit OpenBSD.cf to change
+
+# platform:  $XFree86: xc/config/cf/OpenBSD.cf,v 3.1.2.13 1998/12/22 11:23:02 hohndel Exp $
+#
+# $OpenBSD: patch-04,v 1.2 1999/07/17 10:53:21 matthieu Exp $
+#
+
+# operating system:  OpenBSD 2.5 i386 OSBinaryType (2.5.0)
+
+# $XFree86: xc/config/cf/xfree86.cf,v 3.129.2.36 1998/11/07 04:42:24 dawes Exp $
+
+# $XConsortium: xfree86.cf /main/34 1996/12/06 11:45:18 rws $
+
+LINKKITDIR = $(USRLIBDIR)/Server
+XF98LINKKITDIR = $(USRLIBDIR)/Server
+
+       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
+
+        XFREE86DOCDIR = $(DOCDIR)
+      XFREE86PSDOCDIR = $(DOCPSDIR)
+    XFREE86HTMLDOCDIR = $(DOCHTMLDIR)
+XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
+
+# $XConsortium: xf86.rules /main/9 1996/10/31 14:54:26 kaleb $
+# $XFree86: xc/config/cf/xf86.rules,v 3.16.2.1 1997/05/18 12:00:01 dawes Exp $
+
+# $XConsortium: bsdLib.rules /main/3 1996/09/28 16:09:18 rws $
+
+# $XFree86: xc/config/cf/bsdLib.rules,v 3.4.2.6 1998/11/08 11:49:53 dawes Exp $
+
+# ----------------------------------------------------------------------
+# site-specific configuration parameters that go after
+# the platform-specific parameters - edit site.def to change
+
+# site:  $XConsortium: site.def /main/revisionist/4 1996/12/31 08:02:07 kaleb $
+# site:  $XFree86: xc/config/cf/site.def,v 3.17.2.1 1997/06/22 10:32:21 dawes Exp $
+
+# ---------------------------------------------------------------------
+# Imake rules for building libraries, programs, scripts, and data files
+# rules:  $TOG: Imake.rules /main/222 1997/07/17 20:04:40 kaleb $
+# rules:  $XFree86: xc/config/cf/Imake.rules,v 3.33.2.10 1998/11/04 10:53:01 dawes Exp $
+
+ _NULLCMD_ = @ echo -n
+
+TKLIBNAME =
+
+TKLIBDIR =
+
+TCLLIBNAME =
+
+TCLIBDIR =
+
+XPMLIBNAME = Xpm
+
+XPMLIBDIR = /usr/X11R6/lib
+
+XPMINCDIR = /usr/X11R6/include
+
+          PATHSEP = /
+            SHELL = /bin/sh
+
+              TOP = .
+      CURRENT_DIR = .
+
+            IMAKE = imake
+           DEPEND = gccmakedep
+        MKDIRHIER = mkdir -p
+    EXPORTLISTGEN =
+        CONFIGSRC = $(TOP)/config
+         IMAKESRC = $(CONFIGSRC)/imake
+        DEPENDSRC = $(CONFIGSRC)/util
+
+          INCROOT = /usr/X11R6/include
+        USRLIBDIR = /usr/X11R6/lib
+        VARLIBDIR = /var/lib
+         SHLIBDIR = /usr/X11R6/lib
+       LINTLIBDIR = $(USRLIBDIR)/lint
+          MANPATH = /usr/X11R6/man
+    MANSOURCEPATH = $(MANPATH)/cat
+           MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
+        LIBMANDIR = $(MANSOURCEPATH)$(LIBMANSUFFIX)
+       FILEMANDIR = $(MANSOURCEPATH)$(FILEMANSUFFIX)
+
+               AR = ar clq
+  BOOTSTRAPCFLAGS =
+               CC = gcc
+               AS = as
+
+.SUFFIXES: .cc
+
+              CXX = g++
+          CXXFILT = c++filt
+           CXXLIB =
+    CXXDEBUGFLAGS = -O2
+CXXDEPENDINCLUDES =
+ CXXEXTRA_DEFINES =
+CXXEXTRA_INCLUDES =
+   CXXSTD_DEFINES = -DCSRG_BASED $(CXXPROJECT_DEFINES)
+       CXXOPTIONS =
+      CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
+       CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES)
+         CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
+
+         COMPRESS = compress
+          GZIPCMD = gzip
+              CPP = /usr/libexec/cpp $(STD_CPP_DEFINES)
+    PREPROCESSCMD = /usr/libexec/cpp $(STD_CPP_DEFINES)
+          INSTALL = install
+     INSTALLFLAGS = -c
+               LD = ld
+              LEX = lex
+           LEXLIB = -ll
+             YACC = yacc
+           CCYACC = yacc
+             LINT = lint
+      LINTLIBFLAG = -C
+         LINTOPTS = -axz
+               LN = ln -s
+             MAKE = make
+               MV = mv -f
+               CP = cp
+
+           RANLIB = ranlib
+  RANLIBINSTFLAGS =
+
+               RM = rm -f
+        MANSUFFIX = 1
+     LIBMANSUFFIX = 3
+    FILEMANSUFFIX = 5
+            TROFF = groff -Tps
+            NROFF = nroff -Tlatin1
+         MSMACROS = -ms
+        MANMACROS = -man
+              TBL = tbl
+              EQN = eqn -Tps
+             NEQN = neqn -Tlatin1
+              COL = col
+         COLFLAGS = -b
+
+            DVIPS = dvips
+            LATEX = latex
+
+     STD_INCLUDES =
+  STD_CPP_DEFINES = -traditional $(PROJECT_DEFINES)
+      STD_DEFINES = -DCSRG_BASED $(PROJECT_DEFINES)
+ EXTRA_LOAD_FLAGS =
+  EXTRA_LDOPTIONS =
+  EXTRA_LIBRARIES =
+             TAGS = ctags
+
+   PARALLELMFLAGS =
+
+    SHAREDCODEDEF =
+         SHLIBDEF = -DBSDSHLIB
+
+     SHLIBLDFLAGS = -Bshareable
+
+         PICFLAGS = -fpic
+
+      CXXPICFLAGS = -fpic
+
+    PROTO_DEFINES = -DFUNCPROTO=15 -DNARROWPROTO
+
+     INSTPGMFLAGS = -s
+
+     INSTBINFLAGS = -m 0755
+     INSTUIDFLAGS = -m 4755
+     INSTLIBFLAGS = -m 0644
+     INSTINCFLAGS = -m 0444
+     INSTMANFLAGS = -m 0444
+     INSTDATFLAGS = -m 0444
+    INSTKMEMFLAGS = -m 4755
+
+      PROJECTROOT = /usr/X11R6
+
+      CDEBUGFLAGS = -O2
+        CCOPTIONS =
+
+      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 = -L$(USRLIBDIR)
+        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)
+
+           CCLINK = $(CC)
+
+          CXXLINK = $(CXX)
+
+     LDSTRIPFLAGS = -x
+   LDCOMBINEFLAGS = -X -r
+      DEPENDFLAGS =
+
+# Not sure this belongs here
+         TKLIBDIR =
+         TKINCDIR =
+        TKLIBNAME =
+        TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME)
+        TCLLIBDIR =
+        TCLINCDIR =
+       TCLLIBNAME =
+       TCLLIBRARY = -L$(TCLLIBDIR) -l$(TCLLIBNAME)
+
+        MACROFILE = OpenBSD.cf
+           RM_CMD = $(RM)
+
+    IMAKE_DEFINES =
+
+         IRULESRC = $(CONFIGDIR)
+        IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES)
+
+     ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/X11.tmpl 			$(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) 			$(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules $(IRULESRC)/xf86site.def $(IRULESRC)/host.def $(EXTRA_ICONFIGFILES)
+
+# $TOG: X11.rules /main/4 1997/04/30 15:23:24 kaleb $
+#
+#
+#
+# $XFree86: xc/config/cf/X11.rules,v 1.1.1.1.2.3 1998/10/04 15:22:47 hohndel Exp $
+
+# ----------------------------------------------------------------------
+# X Window System Build Parameters and Rules
+# $TOG: X11.tmpl /main/292 1997/05/20 10:05:59 kaleb $
+#
+#
+#
+#
+# $XFree86: xc/config/cf/X11.tmpl,v 1.8.2.9 1998/12/30 10:04:09 dawes Exp $
+
+CONNECTION_FLAGS = -DTCPCONN -DUNIXCONN -DHAS_STICKY_DIR_BIT
+
+# -----------------------------------------------------------------------
+# X Window System make variables; these need to be coordinated with rules
+
+             XTOP = $(TOP)
+           BINDIR = /usr/X11R6/bin
+     BUILDINCROOT = $(TOP)/exports
+      BUILDINCDIR = $(BUILDINCROOT)/include
+      BUILDINCTOP = ../..
+      BUILDLIBDIR = $(TOP)/exports/lib
+      BUILDLIBTOP = ../..
+      BUILDBINDIR = $(TOP)/exports/bin
+      BUILDBINTOP = ../..
+    XBUILDINCROOT = $(XTOP)/exports
+     XBUILDINCDIR = $(XBUILDINCROOT)/include/X11
+     XBUILDINCTOP = ../../..
+     XBUILDBINDIR = $(XBUILDINCROOT)/bin
+           INCDIR = $(INCROOT)
+           ADMDIR = /var/log
+           LIBDIR = $(USRLIBDIR)/X11
+   TOP_X_INCLUDES =
+
+           VARDIR = /var/X11
+
+           DOCDIR = $(LIBDIR)/doc
+       DOCHTMLDIR = $(DOCDIR)/html
+         DOCPSDIR = $(DOCDIR)/PostScript
+          FONTDIR = $(LIBDIR)/fonts
+         XINITDIR = $(LIBDIR)/xinit
+           XDMDIR = $(LIBDIR)/xdm
+        XDMVARDIR = $(VARLIBDIR)/xdm
+           TWMDIR = $(LIBDIR)/twm
+           XSMDIR = $(LIBDIR)/xsm
+           NLSDIR = $(LIBDIR)/nls
+       XLOCALEDIR = $(LIBDIR)/locale
+        PEXAPIDIR = $(LIBDIR)/PEX
+      LBXPROXYDIR = $(LIBDIR)/lbxproxy
+  PROXYMANAGERDIR = $(LIBDIR)/proxymngr
+        XPRINTDIR = $(LIBDIR)
+      XAPPLOADDIR = $(LIBDIR)/app-defaults
+       FONTCFLAGS = -t
+
+     INSTAPPFLAGS = $(INSTDATFLAGS)
+
+              RGB = rgb
+            FONTC = bdftopcf
+        MKFONTDIR = mkfontdir
+
+       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 = $(BUILDINCROOT)/include
+      XINCLUDESRC = $(INCLUDESRC)/X11
+        SERVERSRC = $(XTOP)/programs/Xserver
+       CONTRIBSRC = $(XTOP)/../contrib
+   UNSUPPORTEDSRC = $(XTOP)/unsupported
+           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)
+
+       XENVLIBDIR = $(USRLIBDIR)
+   CLIENTENVSETUP = LD_LIBRARY_PATH=$(XENVLIBDIR)
+
+# $XConsortium: bsdLib.tmpl /main/3 1996/09/28 16:09:25 rws $
+# $XFree86: xc/config/cf/bsdLib.tmpl,v 3.3.2.2 1998/11/06 13:54:16 dawes Exp $
+
+          XLIBSRC = $(LIBSRC)/X11
+
+SOXLIBREV = 6.1
+DEPXONLYLIB =
+XONLYLIB =  -lX11
+
+LINTXONLY = $(LINTLIBDIR)/llib-lX11.ln
+
+         XLIBONLY = $(XONLYLIB)
+
+      XEXTLIBSRC = $(LIBSRC)/Xext
+
+SOXEXTREV = 6.3
+DEPEXTENSIONLIB =
+EXTENSIONLIB =  -lXext
+
+LINTEXTENSION = $(LINTLIBDIR)/llib-lXext.ln
+
+LINTEXTENSIONLIB = $(LINTEXTENSION)
+          DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB)
+             XLIB = $(EXTENSIONLIB) $(XONLYLIB)
+         LINTXLIB = $(LINTXONLYLIB)
+
+    XSSLIBSRC = $(LIBSRC)/Xss
+
+DEPXSSLIB = $(USRLIBDIR)/libXss.a
+XSSLIB =  -lXss
+
+LINTXSS = $(LINTLIBDIR)/llib-lXss.ln
+
+    XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc
+
+DEPXXF86MISCLIB = $(USRLIBDIR)/libXxf86misc.a
+XXF86MISCLIB =  -lXxf86misc
+
+LINTXXF86MISC = $(LINTLIBDIR)/llib-lXxf86misc.ln
+
+    XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm
+
+DEPXXF86VMLIB = $(USRLIBDIR)/libXxf86vm.a
+XXF86VMLIB =  -lXxf86vm
+
+LINTXXF86VM = $(LINTLIBDIR)/llib-lXxf86vm.ln
+
+    XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga
+
+DEPXXF86DGALIB = $(USRLIBDIR)/libXxf86dga.a
+XXF86DGALIB =  -lXxf86dga
+
+LINTXXF86DGA = $(LINTLIBDIR)/llib-lXxf86dga.ln
+
+    XDPMSLIBSRC = $(LIBSRC)/Xdpms
+
+DEPXDPMSLIB = $(USRLIBDIR)/libXdpms.a
+XDPMSLIB =  -lXdpms
+
+LINTXDPMS = $(LINTLIBDIR)/llib-lXdpms.ln
+
+         XAUTHSRC = $(LIBSRC)/Xau
+
+DEPXAUTHLIB = $(USRLIBDIR)/libXau.a
+XAUTHLIB =  -lXau
+
+LINTXAUTH = $(LINTLIBDIR)/llib-lXau.ln
+
+      XDMCPLIBSRC = $(LIBSRC)/Xdmcp
+
+DEPXDMCPLIB = $(USRLIBDIR)/libXdmcp.a
+XDMCPLIB =  -lXdmcp
+
+LINTXDMCP = $(LINTLIBDIR)/llib-lXdmcp.ln
+
+           XMUSRC = $(LIBSRC)/Xmu
+
+SOXMUREV = 6.0
+DEPXMULIB =
+XMULIB =  -lXmu $(LDPRELIBS) $(XTOOLONLYLIB) $(XONLYLIB)
+
+LINTXMU = $(LINTLIBDIR)/llib-lXmu.ln
+
+       OLDXLIBSRC = $(LIBSRC)/oldX
+
+SOOLDXREV = 6.0
+DEPOLDXLIB =
+OLDXLIB =  -loldX
+
+LINTOLDX = $(LINTLIBDIR)/llib-loldX.ln
+
+         XPLIBSRC = $(LIBSRC)/Xp
+
+SOXPREV = 6.2
+DEPXPLIB =
+XPLIB =  -lXp
+
+LINTXP = $(LINTLIBDIR)/llib-lXp.ln
+
+       TOOLKITSRC = $(LIBSRC)/Xt
+
+SOXTREV = 6.0
+DEPXTOOLONLYLIB =
+XTOOLONLYLIB =  -lXt
+
+LINTXTOOLONLY = $(LINTLIBDIR)/llib-lXt.ln
+
+      DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB)
+         XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB)
+     LINTXTOOLLIB = $(LINTXTOOLONLYLIB)
+
+       XALIBSRC = $(LIBSRC)/Xa
+
+SOXAREV = 1.0
+DEPXALIB =
+XALIB =  -lXa
+
+LINTXA = $(LINTLIBDIR)/llib-lXa.ln
+
+       AWIDGETSRC = $(LIBSRC)/Xaw
+
+SOXAWREV = 6.1
+DEPXAWLIB =
+XAWLIB =  -lXaw
+
+LINTXAW = $(LINTLIBDIR)/llib-lXaw.ln
+
+         XILIBSRC = $(LIBSRC)/Xi
+
+SOXINPUTREV = 6.0
+DEPXILIB =
+XILIB =  -lXi
+
+LINTXI = $(LINTLIBDIR)/llib-lXi.ln
+
+      XTESTLIBSRC = $(LIBSRC)/Xtst
+
+SOXTESTREV = 6.1
+DEPXTESTLIB =
+XTESTLIB =  -lXtst
+
+LINTXTEST = $(LINTLIBDIR)/llib-lXtst.ln
+
+        PEXLIBSRC = $(LIBSRC)/PEX5
+
+SOPEXREV = 6.0
+DEPPEXLIB =
+PEXLIB =  -lPEX5
+
+LINTPEX = $(LINTLIBDIR)/llib-lPEX5.ln
+
+        XIELIBSRC = $(LIBSRC)/XIE
+
+SOXIEREV = 6.0
+DEPXIELIB =
+XIELIB =  -lXIE
+
+LINTXIE = $(LINTLIBDIR)/llib-lXIE.ln
+
+      PHIGSLIBSRC = $(LIBSRC)/PHIGS
+
+DEPPHIGSLIB = $(USRLIBDIR)/libphigs.a
+PHIGSLIB =  -lphigs
+
+LINTPHIGS = $(LINTLIBDIR)/llib-lphigs.ln
+
+DEPXBSDLIB = $(USRLIBDIR)/libXbsd.a
+XBSDLIB =  -lXbsd
+
+LINTXBSD = $(LINTLIBDIR)/llib-lXbsd.ln
+
+           ICESRC = $(LIBSRC)/ICE
+
+SOICEREV = 6.3
+DEPICELIB =
+ICELIB =  -lICE
+
+LINTICE = $(LINTLIBDIR)/llib-lICE.ln
+
+            SMSRC = $(LIBSRC)/SM
+
+SOSMREV = 6.0
+DEPSMLIB =
+SMLIB =  -lSM
+
+LINTSM = $(LINTLIBDIR)/llib-lSM.ln
+
+           XKEYSRC = $(LIBSRC)/Xkey
+
+SOXKEYREV = 6.0
+DEPXKEYLIB =
+XKEYLIB =  -lXkey
+
+LINTXKEY = $(LINTLIBDIR)/llib-lXkey.ln
+
+         FSLIBSRC = $(LIBSRC)/FS
+
+DEPFSLIB = $(USRLIBDIR)/libFS.a
+FSLIB =  -lFS
+
+LINTFS = $(LINTLIBDIR)/llib-lFS.ln
+
+         FONTLIBSRC = $(LIBSRC)/font
+
+DEPFONTLIB = $(USRLIBDIR)/libfont.a
+FONTLIB =  -lfont
+
+LINTFONT = $(LINTLIBDIR)/llib-lfont.ln
+
+          XPMLIBSRC = $(LIBSRC)/Xpm
+
+DEPXPMLIB = $(USRLIBDIR)/libXpm.a
+XPMLIB =  -lXpm
+
+LINTXPM = $(LINTLIBDIR)/llib-lXpm.ln
+
+    XKBFILELIBSRC = $(LIBSRC)/xkbfile
+
+DEPXKBFILELIB = $(USRLIBDIR)/libxkbfile.a
+XKBFILELIB =  -lxkbfile
+
+LINTXKBFILE = $(LINTLIBDIR)/llib-lxkbfile.ln
+
+     XKBCOMPCMD = xkbcomp
+
+    XKBUILIBSRC = $(LIBSRC)/xkbui
+
+DEPXKBUILIB = $(USRLIBDIR)/libxkbui.a
+XKBUILIB =  -lxkbui
+
+LINTXKBUI = $(LINTLIBDIR)/llib-lxkbui.ln
+
+          DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
+
+         DEPLIBS1 = $(DEPLIBS)
+         DEPLIBS2 = $(DEPLIBS)
+         DEPLIBS3 = $(DEPLIBS)
+         DEPLIBS4 = $(DEPLIBS)
+         DEPLIBS5 = $(DEPLIBS)
+         DEPLIBS6 = $(DEPLIBS)
+         DEPLIBS7 = $(DEPLIBS)
+         DEPLIBS8 = $(DEPLIBS)
+         DEPLIBS9 = $(DEPLIBS)
+         DEPLIBS10 = $(DEPLIBS)
+
+XMULIBONLY = -lXmu
+XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
+
+        CONFIGDIR = $(LIBDIR)/config
+
+    USRLIBDIRPATH = $(USRLIBDIR)
+        LDPRELIBS = -L$(USRLIBDIR)
+       LDPOSTLIBS =
+     TOP_INCLUDES = -I$(INCROOT) $(TOP_X_INCLUDES)
+  PROJECT_DEFINES =
+
+CXXPROJECT_DEFINES =
+
+# ----------------------------------------------------------------------
+# start of Imakefile
+
+# If you want to install the help files for olvwm, set HasInfoFiles to 1
+
+# If you haven't installed olwm from xview3 or from Sun's OpenWindows,
+# and you want to install the olwm man page (which discusses most of the
+# window operations), defind NeedOlwmManPage to 1
+
+#
+# Set MORECCFLAGS to any options you want to pass to the compiler.  These
+# include and defines, and debugging and/or optimization flags, and the like.
+# Also, if you have headers for things like the XPM library in a non-standard
+# place, include the appropriate -I flag here.
+#
+# There are a bunch of defines, and I can't honestly say I've used or even
+# tested all of them (since much of this code came from the xview 3.2 release)
+# and certainly I haven't used all combinations of them.  See below for
+# suggested settings:
+#
+# Here's a set of possible defines:
+#  -DALLPLANES          Support the AllPlanes extension (valid in SunOs/Solaris)
+#  -DDEBUG              Include some debugging code
+#  -DIDENT              Include ident directives for the compiler
+#  -DMAXPID=32768       For 386BSD
+#  -DMEMDEBUG           To debug the memory allocation
+#  -DOW_I18N_L3         Include support for Level 3 internationalization
+#                           (Note:  I haven't tested without this, and I can't
+#                            test it in any locale but C, so include it, but
+#                            take it with a grain of salt -- the original olwm
+#                            code will work, but the olvwm extensions may not
+#                            support the correctinternationalization)
+#  -DOW_I18N_L4         Include support for Level 4 internationalization
+#                           (Note:  This is not yet supported, but it may work)
+#  -DREGEXP             Support for the 386 BSD regular expression library
+
+#  -DRLIMIT_NOFILE      Support for the 386BSD/Ultrix RLIMIT calls
+#  -DSHAPE              Support the shapes extension (valid in SunOS/Solaris)
+#  -DSYSV               Support for System V (Release 3 or 4)
+#  -DSVR4               Support for System V Release 4 (you must also include
+#                               -DSYSV)
+#  -DXPM                Support the XPM color pixmaps -- requires that you
+#                               have the xpm library somewhere
+#
+# I haven't tested this on Solaris 1.x, but I'd suggest
+#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DIDENT
+
+# For a generic Solaris 2.x system, I'd suggest
+# MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DSVR4 -DSYSV -DIDENT -x O4
+MORECCFLAGS= -DXPM -DOW_I18N_L3 -DSHAPE -DREGEXP
+#
+# Set MORELDFLAGS to any link options you want.  Be sure to add -lxpm if you
+# want to include XPM support.  For a generic Solaris 1.x
+# system, I'd suggest
+#MORELDFLAGS=-L${OPENWINHOME}/lib
+#
+# For Solaris 2.x, I'd suggest
+# MORELDFLAGS=-L${OPENWINHOME}/lib -R ${OPENWINHOME}/lib -lintl
+MORELDFLAGS=-L${OPENWINHOME}/lib -lcompat -lXpm
+
+# No more changes needed
+
+###########################################################################
+# @(#)XView.cf	1.10 09 Feb 1992 SMI
+# XView.cf for XView release 3.0.  Specify site preferences here.
+
+###########################################################################
+# @(#)XView.tmpl	1.15 12 May 1993 SMI
+# XView.tmpl for XView release 3.2.  Template to add additional config
+# rules to those supplied with X Version 11 release 5.
+
+              MKDIRHIER = mkdirhier
+
+           XV_CFLAGS.optimized =
+           XV_CFLAGS.shared = -DDYNAMICLIB
+
+                DEFINES = $(LOCALE_DEFINES) $(MMAP_DEFINES) $(XV_ALLOC_DEFINES) 			  $(XV_STRDUP_DEFINES) $(XV_CFLAGS.optimized) $(XV_CFLAGS.shared)
+
+              XVDESTDIR = /usr/X11R6
+           LIBRARY_DEST = $(XVDESTDIR)/lib
+      LINT_LIBRARY_DEST = $(XVDESTDIR)/lib/lint
+                 BINDIR = $(XVDESTDIR)/bin
+                MANPATH = $(XVDESTDIR)/man
+            HEADER_DEST = $(XVDESTDIR)/include
+               SRC_DEST = $(XVDESTDIR)/share/src/xview
+               DOC_DEST = $(XVDESTDIR)/share/doc/xview
+
+               XVLIBSRC = $(TOP)/lib
+              HELP_DEST = $(LIBRARY_DEST)/help
+    LIBRARY_DEST_EXTRAS = $(LIBRARY_DEST)
+       TEXT_EXTRAS_MENU = $(LIBRARY_DEST)/.text_extras_menu
+                     AR = ar ruv
+                  CHMOD = chmod
+
+                DEPXLIB =
+
+            BUILDINCDIR = $(TOP)/build
+            BUILDINCTOP = ../../..
+
+                 INCDIR = include
+
+               XVPUBINC = xview
+               XVPRIINC = xview_private
+               OLPUBINC = olgx
+               OLPRIINC = olgx_private
+               PSPUBINC = xvps
+               PSPRIINC = xvps_private
+               IMAGEINC = images
+              BITMAPINC = bitmaps
+         PIXRECT_INCDIR = $(INCDIR)/pixrect
+           XVPUB_INCDIR = $(INCDIR)/$(XVPUBINC)
+           XVPRI_INCDIR = $(INCDIR)/$(XVPRIINC)
+           OLPUB_INCDIR = $(INCDIR)/$(OLPUBINC)
+           OLPRI_INCDIR = $(INCDIR)/$(OLPRIINC)
+           PSPUB_INCDIR = $(INCDIR)/$(PSPUBINC)
+           PSPRI_INCDIR = $(INCDIR)/$(PSPRIINC)
+           IMAGE_INCDIR = $(INCDIR)/$(IMAGEINC)
+          BITMAP_INCDIR = $(INCDIR)/$(BITMAPINC)
+    PIXRECT_HEADER_DEST = $(HEADER_DEST)/pixrect
+      XVPUB_HEADER_DEST = $(HEADER_DEST)/$(XVPUBINC)
+      XVPRI_HEADER_DEST = $(HEADER_DEST)/$(XVPRIINC)
+      OLPUB_HEADER_DEST = $(HEADER_DEST)/$(OLPUBINC)
+      OLPRI_HEADER_DEST = $(HEADER_DEST)/$(OLPRIINC)
+      PSPUB_HEADER_DEST = $(HEADER_DEST)/$(PSPUBINC)
+      PSPRI_HEADER_DEST = $(HEADER_DEST)/$(PSPRIINC)
+            IMAGES_DEST = $(HEADER_DEST)/$(IMAGEINC)
+            BITMAP_DEST = $(HEADER_DEST)/$(BITMAPINC)
+
+                LINTDIR = $(LINT_LIBRARY_DEST)
+
+                    PIC = -fpic
+               STRCONST =
+                   XSTR = xstr
+             XSTR_ARRAY = _libxview_xstr
+                OBJSORT = ./objsort.sh
+                OBJLIST = ./lorder-sparc
+     INSTSHAREDLIBFLAGS = -m 0755
+
+            DEPXVIEWLIB =
+               XVIEWLIB = -L$(LIBRARY_DEST) -lxview
+
+            DEPOLGXLIB =
+               OLGXLIB = -L$(LIBRARY_DEST) -lolgx
+
+            DEPXVPSLIB =
+               XVPSLIB = -L$(LIBRARY_DEST) -lxvps
+
+             XLIB = $(EXTENSIONLIB)  -lX11
+
+             SYSV_CLIENT_LIB =
+             XVCLIENTSYSDEFINES = -DSUNOS41
+
+        XVCLIENTI18NDEFINES = -DOW_I18N_L3
+        XVCLIENTMISCLIB =
+        XVCLIENTINCLUDES =
+
+        XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
+
+             SOXVIEWREV = 3.2
+              SOOLGXREV = 3.2
+
+                  SODIR = shared
+                  SADIR = unshared
+
+             SHARED_DIR = $(TARGETDIR)xshared
+           UNSHARED_DIR = $(TARGETDIR)xunshared
+      XSTR_STRINGS_FILE = $(TARGETDIR)xstrings
+
+###########################################################################
+# @(#)XView.rules	1.8 12 May 1993 SMI
+# XView.rules for XView release 3.0.  Imake rules needed by distribution.
+
+#########################################################################
+# @(#)Imakefile	1.5 10/4/91 SMI
+# Imakefile for olwm release 3.0.
+
+DEFINES =  $(MORECCFLAGS)
+SYS_LIBRARIES = -ll -lm
+INCLUDES = -I$(HEADER_DEST) -I$(TOP) -I$(XPMINCDIR)
+DEPLIBS =
+LOCAL_LIBRARIES = $(MORELDFLAGS) $(OLGXLIB) $(XLIB)
+
+HEADERS = cmdstream.h cursors.h debug.h defaults.h dsdm.h environ.h error.h           events.h gettext.h globals.h group.h helpcmd.h i18n.h iconimage.h           iconmask.h kbdfuncs.h list.h mem.h menu.h notice.h olcursor.h           olgx_impl.h ollocale.h olwm.h patchlevel.h properties.h resources.h           screen.h selection.h slots.h st.h virtual.h win.h
+
+INFOFILES = olvwm.info
+
+MANPAGES = olvwmrc.man
+
+BITMAPS = iconbitmap.h
+SCRIPTS =
+MISC 	= openwin-menu
+
+SRCS	= atom.c client.c cmdstream.c cursors.c debug.c defaults.c dsdm.c        environ.c error.c evbind.c events.c fontset.c gettext.c gif.c group.c        helpsend.c i18n.c images.c info.c kbdfuncs.c list.c mem.c menu.c        moveresize.c notice.c ol_button.413.c ol_button.svr4.c olvwmrc.c        olwm.c pixmap.c properties.c reduce.c resources.c screen.c        selection.c services.c slave.c slots.c st.c states.c usermenu.c        usleep.c virtual.c win.c winbusy.c winbutton.c wincolor.c winframe.c        wingframe.c winicon.c winipane.c winmenu.c winnofoc.c winpane.c        winpinmenu.c winpush.c winresize.c winroot.c
+
+OBJS	= atom.o client.o cmdstream.o cursors.o debug.o defaults.o dsdm.o        environ.o error.o evbind.o events.o fontset.o gettext.o gif.o group.o        helpsend.o i18n.o images.o info.o kbdfuncs.o list.o mem.o menu.o        moveresize.o notice.o ol_button.413.o ol_button.svr4.o olvwmrc.o        olwm.o pixmap.o properties.o reduce.o resources.o screen.o        selection.o services.o slave.o slots.o st.o states.o usermenu.o        usleep.o virtual.o win.o winbusy.o winbutton.o wincolor.o winframe.o        wingframe.o winicon.o winipane.o winmenu.o winnofoc.o winpane.o        winpinmenu.o winpush.o winresize.o winroot.o
+
+ALLFILES = 	${HEADERS} ${BITMAPS} ${SRCS} 	${MISC} ${INFOFILES} ${MANPAGES} ${SCRIPTS}
+
+ PROGRAM = olvwm
+
+all:: olvwm
+
+olvwm: $(OBJS) $(DEPLIBS)
+	$(RM) $@
+	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LOCAL_LIBRARIES) $(LDLIBS)  $(EXTRA_LOAD_FLAGS)
+
+install:: olvwm
+	@if [ -d $(DESTDIR)$(BINDIR) ]; then set +x; \
+	else (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); fi
+	$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS)  olvwm $(DESTDIR)$(BINDIR)/olvwm
+
+all:: olvwm.0
+
+olvwm.0:: olvwm.man
+	@if [ -f olvwm.man ]; \
+	then \
+	cat olvwm.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \
+	cp /tmp/$$$$.man olvwm.0; \
+	$(RM) /tmp/$$$$.man; \
+	fi
+
+install.man::
+	@if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \
+	else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi
+	-@if [ -f olvwm.0 ]; \
+	then \
+	$(INSTALL) -c $(INSTMANFLAGS) olvwm.0 $(DESTDIR)$(MANDIR)/olvwm.0; \
+	fi
+
+clean::
+	$(RM) olvwm.0
+
+depend:: .depend
+
+.depend::
+	$(RM) $@
+	$(DEPEND) -f- $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS) > $@
+
+lint:
+	$(LINT) $(LINTFLAGS) $(SRCS) $(LINTLIBS)
+lint1:
+	$(LINT) $(LINTFLAGS) $(FILE) $(LINTLIBS)
+
+clean::
+	$(RM) olvwm
+
+parse.c: parse.l
+	lex -t parse.l > parse.c
+
+olvwmrc.c: olvwmrc.y
+	yacc olvwmrc.y
+	mv y.tab.c olvwmrc.c
+
+olvwmrc.o: parse.c olvwmrc.c
+
+version.c: ${SRCS} ${HEADERS}
+	@echo '#ident "@(#)olvwm version compiled '`date`'"' > version.c
+
+clean::
+	/bin/rm -f parse.c olvwmrc.c version.c
+
+install.man:: $(MANPAGES)
+	@if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; 	else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi
+
+	@for i in $(MANPAGES) ;	do 	echo "installing $$i"; 	$(RM) $(DESTDIR)$(MANDIR)/`basename $$i .man`.$(MANSUFFIX)* ; 	$(INSTALL) -c $(INSTMANFLAGS) $$i $(DESTDIR)$(MANDIR)/`basename $$i .man`.$(MANSUFFIX) ; 	$(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/`basename $$i .man`.$(MANSUFFIX) ; 	done
+
+# @(#)XView.prog	1.6 28 Jun 1993 SMI
+
+populate::
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;
+	-@if [ -h SCCS ]; then \
+	for i in $(ALLFILES) ; do sccs get $$i ; done ; \
+	elif [ -h SCCS- ]; then \
+	$(MV) SCCS- SCCS ; \
+	for i in $(ALLFILES) ; do sccs get $$i ; done ; \
+	$(MV) SCCS SCCS- ; \
+	else \
+	echo "SCCS or SCCS- do not exist" ; \
+	fi
+
+install::
+	$(MKDIRHIER) $(HELP_DEST)
+
+install::
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;
+	for i in $(INFOFILES) ;\
+	do \
+	echo "installing $$i"; \
+	$(RM) $(HELP_DEST)/$$i ; \
+	$(INSTALL) -c $(INSTDATFLAGS) $$i $(HELP_DEST) ; \
+	done
+
+install.srcs::
+
+includes::
+
+install.man::
+
+depend:: .depend
+
+.depend::
+	$(RM) $@
+	$(DEPEND) -f- $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS) > $@
+
+lint:
+	$(LINT) $(LINTFLAGS) $(SRCS) $(LINTLIBS)
+lint1:
+	$(LINT) $(LINTFLAGS) $(FILE) $(LINTLIBS)
+
+# ----------------------------------------------------------------------
+# common rules for all Makefiles - do not edit
+
+.c.i:
+	$(RM) $@
+	 $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@
+
+emptyrule::
+
+clean::
+	$(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut *.core "#"*
+
+Makefile::
+	-@if [ -f Makefile ]; then set -x; \
+	$(RM) Makefile.bak; $(MV) Makefile Makefile.bak; \
+	else exit 0; fi
+	$(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
+
+tags::
+	$(TAGS) -w *.[ch]
+	$(TAGS) -xw *.[ch] > TAGS
+
+man_keywords::
+
+# ----------------------------------------------------------------------
+# 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::
+
+# ----------------------------------------------------------------------
+# dependencies generated by makedepend
+
+# dependencies are in .depend
+