diff --git a/Makefile b/Makefile
index 9cbfd3f0c9d2644a09b30f4787fd78248c8f9d0b..7cb1d56c3019a52ce12fb26cd2d795e1c042b21e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,829 +1,6 @@
-# $fiHeader: Makefile,v 1.73 93/01/18 13:54:08 cer Exp $
+# $fiHeader: Makefile,v 1.74 93/02/10 10:04:04 cer Exp $
 #
-#  Makefile for CLIM 2.0
+#  Makefile.sun4 for CLIM 2.0
 #
-CL	= /net/vapor/scm2/4.2.beta/src/dcl
-PWD	= /usr/tech/cer/stuff/clim-2.0
-DUMP-CL	= $(CL)
-CLOPTS	= -qq
-
-DEVICE	= /dev/null
-RM	= /bin/rm
-CAT	= /bin/cat
-ECHO	= /bin/echo
-MV	= /usr/fi/mv-nfs
-TAGS	= /usr/fi/lib/emacs/etc/etags
-TMP	= /tmp
-
-# Training
-
-TRAIN_TIMES=2
-# view, file, print
-PSVIEW=file
-
-FRAME_TESTS=t
-
-TRAIN_LISP= \
-	(load \"misc/train.lisp\") \
-	(train-clim :frame-tests $(FRAME_TESTS) :train-times $(TRAIN_TIMES) :psview :$(PSVIEW)) \
-	(exit 0)
-
-TRAIN_TEXT = \
-	$(ECHO) "\
-	$(TRAIN_LISP) \
-" | $(CLIM) $(CLOPTS) -batch \
-	; echo CLIM trained!!!!	
-
-# Info
-LOAD_SOURCE_FILE_INFO=t
-LOAD_XREF_INFO=nil
-RECORD_SOURCE_FILE_INFO=t
-RECORD_XREF_INFO=nil
-
-# Lisp optimization for compiling
-SPEED	= 3
-SAFETY	= 1
-# This next should be set to 1 for distribution
-DEBUG   = 2
-
-COMPILE_PRINT=nil 
-# Where to dump all clim images
-DUMP-CLIM = $(TMP)/clim.temp_`whoami`
-# Where images are then move to (can be same as DUMP-CLIM)
-CLIM	= ./slim
-CLIMOL= $(CLIM)
-CLIMXM= $(CLIM)
-
-XINCLUDES=-I/x11/motif-1.1/lib
-
-CFLAGS	= -O -D_NO_PROTO -DSTRINGS_ALIGNED -DNO_REGEX -DNO_ISDIR -DUSE_RE_COMP -DUSER_GETWD $(XINCLUDES)
-LDFLAGS=
-OLDSPACE = 15000000
-NEWSPACE = 5000000
-PREMALLOCS = '-m 401408'
-
-CLIM-SMALL	= ./slim-small
-
-PUBDIRS	= sys utils silica clim demo test genera clx pre-silica postscript compatibility
-DIRS0	=  tk tk-silica misc cloe climtoys
-DIRS	= $(PUBDIRS) xlib $(DIRS0)
-CHEAP_CLEAN	= $(PUBDIRS) $(DIRS0)
-
-SRC_FILES = */*.lisp *.lisp Makefile misc/make-stub-file \
-	    misc/undefinedsymbols misc/undefinedsymbols.olit misc/undefinedsymbols.colit \
-	    misc/undefinedsymbols.motif misc/undefinedsymbols.cmotif misc/undefinedsymbols.xt \
-	    xlib/xlibsupport.c misc/MyDrawingA*.[hc] misc/olsupport.c \
-	    misc/clos-preload.cl misc/xtsupport.c
-
-DEST=/dev/null
-
-CL_SRC=/usr/tech/cer/cl/src
-OPENWINHOME=/usr/openwin-3.0
-
-
-DEBUGLIB=
-MOTIFLIB=/x11/R4/sun4-lib/libXm$(DEBUGLIB).a
-MOTIFLIB_d=/x11/R4/sun4-lib/libXm_d.a
-XLIB= /x11/R4/sun4-lib/libX11$(DEBUGLIB).a 
-XTLIB=/x11/R4/sun4-lib/libXt$(DEBUGLIB).a
-XLIBS= $(XTLIB) $(XLIB)
-
-OLCOPYLIB=/vapor/x11/olit-3.0/lib3/sun4
-OLXLIBS=$(OLCOPYLIB)/libXt.a $(OLCOPYLIB)/libX11.a
-LIBXOL=$(OLCOPYLIB)/libXol.a
-LIBXOL_d=$(LIBXOL)
-
-# This has to be kept consistent with xlib.lisp
-UNDEFS=misc/undefinedsymbols
-
-# This should be the same as load-xt
-XT_UNDEFS=misc/undefinedsymbols.xt
-
-# This should be the same as load-xm
-XM_UNDEFS=misc/undefinedsymbols.motif
-XMC_UNDEFS=misc/undefinedsymbols.cmotif
-
-# This should be the same as load-ol
-OL_UNDEFS=misc/undefinedsymbols.olit
-OLC_UNDEFS=misc/undefinedsymbols.colit
-
-# These are the fasls and the .o that form the product
-
-CLIMFASLS= climg.fasl climol.fasl climxm.fasl clim-debug.fasl clim-debugol.fasl \
-	   clim-debugxm.fasl climps.fasl climgg.fasl # clim1compat.fasl
-
-PUBLIC_OBJS=  stub-xt.o stub-x.o stub-olit.o stub-motif.o \
-	  xlibsupport.o MyDrawingA.o \
-	  olsupport.o xtsupport.o
-
-OL_LICENSED_OBJS = clim-olit.o clim-olit_d.o
-XM_LICENSED_OBJS = clim-motif_d.o clim-motif.o 
-
-MOTIF_OBJS= clim-motif_d.o clim-motif.o xtsupport.o stub-xt.o stub-x.o stub-x.o
-OPENLOOK_OBJS= clim-olit_d.o clim-olit.o xtsupport.o stub-xt.o stub-x.o stub-x.o olsupport.o
-
-CLIMOBJS=$(PUBLIC_OBJS) $(XM_LICENSED_OBJS) $(OL_LICENSED_OBJS)
-
-INSTALLED_CLIMOBJS=$(PUBLIC_OBJS) $(XM_LICENSED_OBJS) $(OL_LICENSED_OBJS)
-
-
-# These are linked into the distribution
-# `pwd`/clim-olit_d.o \ `pwd`/clim-olit.o \
-
-#FCLIMOBJS= `pwd`/clim-motif_d.o `pwd`/clim-motif.o \
-#	    `pwd`/stub-xt.o `pwd`/stub-x.o \
-#	   `pwd`/xlibsupport.o `pwd`/MyDrawingA.o `pwd`/olsupport.o `pwd`/xtsupport.o
-
-# These are built into xm-dcl and ol-dcl.
-COMPOSEROBJS= /scm/4.1/sparc/src/code/excldep.o /scm/4.1/sparc/src/code/socket.o \
-	      /scm/4.1/sparc/src/code/gc_cursor.o \
-	      /scm/4.1/sparc/src/code/unixsocket.o \
-	      /scm/4.1/sparc/src/code/io.o /scm/4.1/sparc/src/code/exclio.o \
-	      /scm/4.1/sparc/src/code/RunStatus.o
-
-MALLOCOBJS =
-# Uncomment to enable malloc debugging.
-#
-# MALLOCOBJS= $(PWD)/malloclib/malloc.o $(PWD)/malloclib/free.o $(PWD)/malloclib/realloc.o \
-#	    $(PWD)/malloclib/calloc.o $(PWD)/malloclib/string.o \
-#	    $(PWD)/malloclib/malloc_chk.o $(PWD)/malloclib/malloc_chn.o \
-#	    $(PWD)/malloclib/memory.o $(PWD)/malloclib/tostring.o \
-#	    $(PWD)/malloclib/m_perror.o $(PWD)/malloclib/m_init.o \
-#	    $(PWD)/malloclib/mallopt.o $(PWD)/malloclib/dump.o $(PWD)/malloclib/leak.o
-
-#
-# "Compile time objects" -- these go into clim-debug.fasl
-#
-DEBUG-OBJS = xlib/ffi.fasl xlib/xlib-defs.fasl xlib/xlib-funs.fasl \
-	     xlib/x11-keysyms.fasl xlib/last.fasl \
-	     tk/xt-defs.fasl tk/xt-funs.fasl 
-
-XM-DEBUG-OBJS = tk/xm-defs.fasl tk/xm-funs.fasl
-OL-DEBUG-OBJS = tk/ol-defs.fasl tk/ol-funs.fasl
-
-#
-# "Load time objects" -- these go into clim.fasl
-#
-CLIM-UTILS-OBJS = utils/excl-verification.fasl \
-                   utils/lisp-package-fixups.fasl \
-                   utils/defpackage.fasl \
-                   utils/packages.fasl \
-                   utils/defun-utilities.fasl \
-                   utils/reader.fasl \
-                   utils/clos-patches.fasl \
-                   utils/clos.fasl \
-                   utils/utilities.fasl \
-                   utils/lisp-utilities.fasl \
-                   utils/processes.fasl \
-                   utils/queue.fasl \
-		   utils/timers.fasl \
-                   utils/protocols.fasl \
-                   utils/clim-streams.fasl \
-                   utils/excl-streams.fasl \
-                   utils/clim-macros.fasl \
-                   utils/transformations.fasl \
-                   utils/regions.fasl \
-                   utils/region-arithmetic.fasl \
-                   utils/extended-regions.fasl \
-		   utils/base-designs.fasl \
-                   utils/designs.fasl
-
-CLIM-SILICA-OBJS = silica/classes.fasl \
-                    silica/text-style.fasl \
-                    silica/macros.fasl \
-                    silica/sheet.fasl \
-                    silica/mirror.fasl \
-                    silica/event.fasl \
-                    silica/port.fasl \
-                    silica/medium.fasl \
-                    silica/framem.fasl \
-                    silica/graphics.fasl \
-		    silica/pixmaps.fasl \
-                    silica/std-sheet.fasl \
-                    silica/layout.fasl \
-                    silica/db-layout.fasl \
-                    silica/db-box.fasl \
-                    silica/db-table.fasl \
-                    silica/gadgets.fasl \
-                    silica/db-scroll.fasl \
-                    silica/db-border.fasl
-
-CLIM-STANDALONE-OBJS = clim/gestures.fasl \
-                        clim/defprotocol.fasl \
-                        clim/stream-defprotocols.fasl \
-                        clim/defresource.fasl \
-                        clim/temp-strings.fasl \
-                        clim/clim-defs.fasl \
-                        clim/stipples.fasl \
-                        clim/stream-class-defs.fasl \
-                        clim/interactive-defs.fasl \
-                        clim/cursor.fasl \
-                        clim/view-defs.fasl \
-                        clim/input-defs.fasl \
-                        clim/input-protocol.fasl \
-                        clim/output-protocol.fasl \
-                        clim/recording-protocol.fasl \
-			clim/recording-defs.fasl \
-			clim/text-recording.fasl \
-			clim/graphics-recording.fasl \
-                        clim/interactive-protocol.fasl \
-                        clim/input-editor-commands.fasl \
-                        clim/formatted-output-defs.fasl \
-                        clim/incremental-redisplay.fasl \
-                        clim/coordinate-sorted-set.fasl \
-			clim/r-tree.fasl \
-                        clim/window-stream.fasl \
-                        clim/pixmap-streams.fasl \
-                        clim/ptypes1.fasl \
-                        clim/completer.fasl \
-                        clim/presentations.fasl \
-                        clim/translators.fasl \
-                        clim/histories.fasl \
-                        clim/ptypes2.fasl \
-			clim/excl-presentations.fasl \
-                        clim/standard-types.fasl \
-                        clim/table-formatting.fasl \
-                        clim/graph-formatting.fasl \
-                        clim/surround-output.fasl \
-                        clim/text-formatting.fasl \
-                        clim/tracking-pointer.fasl \
-                        clim/dragging-output.fasl \
-                        clim/db-stream.fasl \
-                        clim/gadget-output.fasl \
-                        clim/accept.fasl \
-                        clim/present.fasl \
-                        clim/command.fasl \
-                        clim/command-processor.fasl \
-                        clim/basic-translators.fasl \
-                        clim/frames.fasl \
-			clim/default-frame.fasl \
-                        clim/activities.fasl \
-			clim/noting-progress.fasl \
-                        clim/menus.fasl \
-                        clim/accept-values.fasl \
-			clim/drag-and-drop.fasl \
-                        clim/item-list-manager.fasl \
-			postscript/pkgdcl.fasl \
-			postscript/postscript-s.fasl \
-                        clim/stream-trampolines.fasl
-
-GENERIC-GADGETS = clim/db-menu.fasl clim/db-list.fasl clim/db-text.fasl silica/db-button.fasl \
-	    silica/db-slider.fasl silica/scroll-pane.fasl
-
-XLIB-CLIM-OBJS = xlib/pkg.fasl xlib/load-xlib.fasl
-
-
-LOAD-XM-OBJS=	tk/load-xm.fasl
-LOAD-OL-OBJS=	tk/load-ol.fasl
-
-XT-TK-OBJS =  	tk/pkg.fasl \
-                tk/foreign-obj.fasl \
-                tk/macros.fasl \
-                tk/xlib.fasl \
-                tk/font.fasl \
-                tk/gcontext.fasl \
-                tk/graphics.fasl \
-                tk/meta-tk.fasl \
-                tk/make-classes.fasl \
-                tk/foreign.fasl \
-                tk/widget.fasl \
-                tk/resources.fasl \
-                tk/event.fasl \
-                tk/callbacks.fasl \
-                tk/xt-classes.fasl \
-                tk/xt-init.fasl
-
-XM-TK-OBJS = tk/xm-classes.fasl \
-		tk/xm-callbacks.fasl \
-                tk/xm-init.fasl \
-                tk/xm-widgets.fasl \
-                tk/xm-font-list.fasl \
-                tk/xm-protocols.fasl \
-                tk/convenience.fasl \
-                tk/make-widget.fasl
-
-OL-CLIM-OBJS = tk/ol-classes.fasl \
-                tk/ol-init.fasl \
-		tk/ol-widgets.fasl \
-                tk/ol-callbacks.fasl \
-                tk/make-widget.fasl
-
-MOTIF-CLIM-OBJS = tk-silica/pkg.fasl \
-                   tk-silica/xt-silica.fasl \
-                   tk-silica/xm-silica.fasl \
-                   tk-silica/xt-graphics.fasl \
-                   tk-silica/xm-graphics.fasl \
-                   tk-silica/image.fasl \
-                   tk-silica/xt-frames.fasl \
-                   tk-silica/xm-frames.fasl \
-                   tk-silica/xm-dialogs.fasl \
-                   tk-silica/xt-gadgets.fasl \
-                   tk-silica/xm-gadgets.fasl \
-                   tk-silica/xm-menus.fasl \
-                   tk-silica/xt-pixmaps.fasl \
-                   tk-silica/xt-cursor.fasl \
-                   tk-silica/last.fasl
-
-
-OPENLOOK-CLIM-OBJS = tk-silica/pkg.fasl \
-                      tk-silica/xt-silica.fasl \
-                      tk-silica/ol-silica.fasl \
-                      tk-silica/xt-graphics.fasl \
-                      tk-silica/ol-graphics.fasl \
-                      tk-silica/image.fasl \
-                      tk-silica/xt-frames.fasl \
-                      tk-silica/ol-frames.fasl \
-                      tk-silica/xt-gadgets.fasl \
-                      tk-silica/ol-gadgets.fasl \
-		      tk-silica/xt-cursor.fasl \
-                      tk-silica/xt-pixmaps.fasl \
-		      tk-silica/last.fasl
-
-POSTSCRIPT_CLIM= postscript/postscript-port.fasl \
-	postscript/postscript-medium.fasl \
-	postscript/laserwriter-metrics.fasl 
-
-# Used for tags
-ALL_SRC =	   utils/excl-verification.lisp \
-                   utils/lisp-package-fixups.lisp \
-                   utils/defpackage.lisp \
-                   utils/packages.lisp \
-                   utils/defun-utilities.lisp \
-                   utils/reader.lisp \
-                   utils/clos-patches.lisp \
-                   utils/clos.lisp \
-                   utils/utilities.lisp \
-                   utils/lisp-utilities.lisp \
-                   utils/processes.lisp \
-                   utils/queue.lisp \
-                   utils/protocols.lisp \
-                   utils/clim-streams.lisp \
-                   utils/excl-streams.lisp \
-                   utils/clim-macros.lisp \
-                   utils/transformations.lisp \
-                   utils/regions.lisp \
-                   utils/region-arithmetic.lisp \
-                   utils/extended-regions.lisp \
-                   utils/designs.lisp \
-		    silica/classes.lisp \
-                    silica/text-style.lisp \
-                    silica/macros.lisp \
-                    silica/sheet.lisp \
-                    silica/mirror.lisp \
-                    silica/event.lisp \
-                    silica/port.lisp \
-                    silica/medium.lisp \
-                    silica/framem.lisp \
-                    silica/graphics.lisp \
-                    silica/pixmaps.lisp \
-                    silica/std-sheet.lisp \
-                    silica/layout.lisp \
-                    silica/db-layout.lisp \
-                    silica/db-box.lisp \
-                    silica/db-table.lisp \
-                    silica/gadgets.lisp \
-                    silica/db-border.lisp \
-                    silica/db-scroll.lisp \
-                    silica/db-button.lisp \
-                    silica/db-slider.lisp \
-			clim/gestures.lisp \
-                        clim/defprotocol.lisp \
-                        clim/stream-defprotocols.lisp \
-                        clim/defresource.lisp \
-                        clim/temp-strings.lisp \
-                        clim/clim-defs.lisp \
-                        clim/stipples.lisp \
-                        clim/stream-class-defs.lisp \
-                        clim/interactive-defs.lisp \
-                        clim/cursor.lisp \
-                        clim/view-defs.lisp \
-                        clim/input-defs.lisp \
-                        clim/input-protocol.lisp \
-                        clim/output-protocol.lisp \
-                        clim/recording-defs.lisp \
-                        clim/recording-protocol.lisp \
-                        clim/text-recording.lisp \
-                        clim/graphics-recording.lisp \
-                        clim/interactive-protocol.lisp \
-                        clim/input-editor-commands.lisp \
-                        clim/formatted-output-defs.lisp \
-                        clim/incremental-redisplay.lisp \
-                        clim/coordinate-sorted-set.lisp \
-                        clim/window-stream.lisp \
-                        clim/pixmap-streams.lisp \
-                        clim/ptypes1.lisp \
-                        clim/completer.lisp \
-                        clim/presentations.lisp \
-                        clim/translators.lisp \
-                        clim/histories.lisp \
-                        clim/ptypes2.lisp \
-                        clim/standard-types.lisp \
-                        clim/excl-presentations.lisp \
-                        clim/table-formatting.lisp \
-                        clim/graph-formatting.lisp \
-                        clim/surround-output.lisp \
-                        clim/text-formatting.lisp \
-                        clim/tracking-pointer.lisp \
-                        clim/dragging-output.lisp \
-                        clim/db-stream.lisp \
-                        clim/gadget-output.lisp \
-                        clim/accept.lisp \
-                        clim/present.lisp \
-                        clim/command.lisp \
-                        clim/command-processor.lisp \
-                        clim/basic-translators.lisp \
-                        clim/frames.lisp \
-                        clim/default-frame.lisp \
-                        clim/noting-progress.lisp \
-                        clim/menus.lisp \
-                        clim/accept-values.lisp \
-                        clim/drag-and-drop.lisp \
-                        clim/item-list-manager.lisp \
-                        clim/stream-trampolines.lisp \
-	     xlib/pkg.lisp \
-             xlib/ffi.lisp \
-             xlib/xlib-defs.lisp \
-             xlib/load-xlib.lisp \
-             xlib/xlib-funs.lisp \
-             xlib/x11-keysyms.lisp \
-             xlib/last.lisp \
-	      tk/load-xm.lisp \
-              tk/load-ol.lisp \
-	      tk/pkg.lisp \
-              tk/macros.lisp \
-              tk/xt-defs.lisp \
-              tk/foreign-obj.lisp \
-              tk/xlib.lisp \
-              tk/font.lisp \
-              tk/gcontext.lisp \
-              tk/graphics.lisp \
-              tk/meta-tk.lisp \
-              tk/make-classes.lisp \
-              tk/foreign.lisp \
-              tk/widget.lisp \
-              tk/resources.lisp \
-              tk/event.lisp \
-              tk/callbacks.lisp \
-              tk/xt-classes.lisp \
-              tk/xt-init.lisp \
-              tk/xm-defs.lisp \
-              tk/xm-classes.lisp \
-              tk/xm-callbacks.lisp \
-              tk/xt-funs.lisp \
-              tk/xm-funs.lisp \
-              tk/xm-classes.lisp \
-              tk/xm-init.lisp \
-              tk/xm-widgets.lisp \
-              tk/xm-font-list.lisp \
-              tk/xm-protocols.lisp \
-              tk/convenience.lisp \
-              tk/make-widget.lisp \
-		   tk-silica/pkg.lisp \
-                   tk-silica/xt-silica.lisp \
-                   tk-silica/xm-silica.lisp \
-                   tk-silica/xt-graphics.lisp \
-                   tk-silica/xm-graphics.lisp \
-                   tk-silica/image.lisp \
-                   tk-silica/xt-frames.lisp \
-                   tk-silica/xm-frames.lisp \
-                   tk-silica/xt-gadgets.lisp \
-                   tk-silica/xm-gadgets.lisp \
-                   tk-silica/xm-menus.lisp \
-                   tk-silica/xt-cursor.lisp \
-                   tk-silica/xt-pixmaps.lisp \
-	      tk/ol-defs.lisp \
-              tk/ol-funs.lisp \
-              tk/ol-classes.lisp \
-              tk/ol-init.lisp \
-              tk/ol-widgets.lisp \
-              tk/ol-callbacks.lisp \
-                      tk-silica/ol-silica.lisp \
-                      tk-silica/ol-graphics.lisp \
-                      tk-silica/ol-frames.lisp \
-                      tk-silica/ol-gadgets.lisp
-
-
-GENERIC-OBJS= $(CLIM-UTILS-OBJS) $(CLIM-SILICA-OBJS) $(CLIM-STANDALONE-OBJS)
-MOTIF-OBJS = $(LOAD-XM-OBJS) $(XT-TK-OBJS) $(XM-TK-OBJS) $(MOTIF-CLIM-OBJS) 
-OPENLOOK-OBJS = $(LOAD-OL-OBJS) $(XT-TK-OBJS) $(OL-CLIM-OBJS) $(OPENLOOK-CLIM-OBJS)
-
-make = make SPEED=${SPEED} SAFETY=${SAFETY} DEBUG=${DEBUG} \
-	LOAD_SOURCE_FILE_INFO=${LOAD_SOURCE_FILE_INFO} \
-	RECORD_SOURCE_FILE_INFO=${RECORD_SOURCE_FILE_INFO} \
-	LOAD_XREF_INFO=${LOAD_XREF_INFO} \
-	RECORD_XREF_INFO=${RECORD_XREF_INFO} \
-	CLIM=${CLIM} CLIMOL=${CLIMOL} CLIMXM=${CLIMXM} DUMP-CLIM=${DUMP-CLIM} \
-	COMPILE_PRINT=${COMPILE_PRINT}
-
-default: all-xm
-
-trained-clim-xm:	
-	(${make} all-xm train ; ${make} clim-xm)
-
-trained-clim-ol:	
-	(${make} all-ol train ; ${make} clim-ol)
-
-all-xm:	compile-xm cat-xm clim-xm
-all-ol:	compile-ol cat-ol clim-ol
-
-compile-xm:	$(MOTIF_OBJS) FORCE
-	$(ECHO) "\
-	(si::system-compile-wrapper \
-	 (function \
-	  (lambda () \
-	    (setq *compile-print* $(COMPILE_PRINT)) \
-	    (setq sys::*libxt-pathname* \"$(XTLIB)\") \
-	    (setq sys::*libx11-pathname* \"$(XLIB)\") \
-	    (setq sys::*clim-motif-pathname* \"clim-motif$(DEBUGLIB).o\") \
-	    (load \"misc/compile-1.lisp\") \
-	    (compile-it 'motif-clim))) \
-	 :speed $(SPEED) :debug $(DEBUG) :safety $(SAFETY) \
-	 :record-source-file-info $(RECORD_SOURCE_FILE_INFO) \
-	 :record-xref-info $(RECORD_XREF_INFO) \
-	 :compile-print nil :compile-verbose nil \
-	 :redefinition-warnings t :gcprint nil)" | $(CL) $(CLOPTS) -batch
-
-compile-ol:	$(OPENLOOK_OBJS) FORCE
-	$(ECHO) "\
-	(si::system-compile-wrapper \
-	 (function \
-	  (lambda () \
-	    (setq *compile-print* $(COMPILE_PRINT)) \
-	    (setf excl:*load-xref-info* $(LOAD_XREF_INFO)) \
-	    (setq sys::*libxt-pathname* \"$(XTLIB)\") \
-	    (setq sys::*libx11-pathname* \"$(XLIB)\") \
-	    (setq sys::*clim-olit-pathname* \"clim-olit$(DEBUGLIB).o\") \
-	    (setq *ignore-package-name-case* t) \
-	    (set-case-mode :case-insensitive-lower) \
-	    (load \"misc/compile-1.lisp\") \
-	    (compile-it 'openlook-clim))) \
-	 :speed $(SPEED) :debug $(DEBUG) :safety $(SAFETY) \
-	 :record-source-file-info $(RECORD_SOURCE_FILE_INFO) \
-	 :record-xref-info $(RECORD_XREF_INFO) \
-	 :compile-print nil :compile-verbose nil \
-	 :redefinition-warnings t :gcprint nil)" | $(CL) $(CLOPTS) -batch
-
-# Concatenation
-
-cat:	cat-xm cat-ol
-cat-g:	climg.fasl clim-debug.fasl climps.fasl climgg.fasl # clim1compat.fasl
-cat-xm:	cat-g climxm.fasl clim-debugxm.fasl 
-cat-ol:	cat-g climol.fasl clim-debugol.fasl 
-
-climg.fasl	: $(GENERIC-OBJS) $(XLIB-CLIM-OBJS)
-	$(CAT) $(GENERIC-OBJS) $(XLIB-CLIM-OBJS) > $(TMP)/clim.fasl_`whoami`
-	$(MV) $(TMP)/clim.fasl_`whoami` climg.fasl
-	ls -lt climg.fasl >> Clim-sizes.n
-	ls -lt climg.fasl
-
-climgg.fasl	: $(GENERIC-GADGETS)
-	$(CAT) $(GENERIC-GADGETS) > $(TMP)/clim.fasl_`whoami`
-	$(MV) $(TMP)/clim.fasl_`whoami` climgg.fasl
-	ls -lt climgg.fasl >> Clim-sizes.n
-	ls -lt climgg.fasl
-
-
-climxm.fasl	: $(MOTIF-OBJS) $(XLIB-CLIM-OBJS)
-	$(CAT) $(MOTIF-OBJS) > $(TMP)/clim.fasl_`whoami`
-	$(MV) $(TMP)/clim.fasl_`whoami` climxm.fasl
-	ls -lt climxm.fasl >> Clim-sizes.n
-	ls -lt climxm.fasl
-
-climol.fasl	: $(OPENLOOK-OBJS)
-	$(CAT) $(OPENLOOK-OBJS) > $(TMP)/clim.fasl_`whoami`
-	$(MV) $(TMP)/clim.fasl_`whoami` climol.fasl
-	ls -lt climol.fasl >> Clim-sizes.n
-	ls -lt climol.fasl
-
-echo-fasls:
-	ls -lt $(MOTIF-OBJS) > /tmp/foo
-
-clim-debug.fasl:	$(DEBUG-OBJS)
-	$(CAT) $(DEBUG-OBJS) > $(TMP)/clim-debug.fasl_`whoami`
-	$(MV) $(TMP)/clim-debug.fasl_`whoami` clim-debug.fasl
-	ls -lt clim-debug.fasl >> Clim-sizes.n
-	ls -lt clim-debug.fasl
-
-clim-debugxm.fasl:	$(XM-DEBUG-OBJS)
-	$(CAT) $(XM-DEBUG-OBJS) > $(TMP)/clim-debugxm.fasl_`whoami`
-	$(MV) $(TMP)/clim-debugxm.fasl_`whoami` clim-debugxm.fasl
-	ls -lt clim-debugxm.fasl >> Clim-sizes.n
-	ls -lt clim-debugxm.fasl
-
-clim-debugol.fasl:	$(OL-DEBUG-OBJS)
-	$(CAT) $(OL-DEBUG-OBJS) > $(TMP)/clim-debugol.fasl_`whoami`
-	$(MV) $(TMP)/clim-debugol.fasl_`whoami` clim-debugol.fasl
-	ls -lt clim-debugol.fasl >> Clim-sizes.n
-	ls -lt clim-debugol.fasl
-
-climps.fasl: 	$(POSTSCRIPT_CLIM)
-	$(CAT) $(POSTSCRIPT_CLIM) > $(TMP)/climps.fasl_`whoami`
-	$(MV) $(TMP)/climps.fasl_`whoami` climps.fasl
-
-CLIM1COMPAT= compatibility/packages.fasl compatibility/clim1-compatibility.fasl
-
-clim1compat.fasl : $(CLIM1COMPAT)
-	$(CAT) $(CLIM1COMPAT) > $(TMP)/clim1compat.fasl_`whoami`
-	$(MV) $(TMP)/clim1compat.fasl_`whoami` clim1compat.fasl
-	ls -lt clim1compat.fasl >> Clim-sizes.n
-	ls -lt clim1compat.fasl
-
-# We should only run these rules when
-# We do this because we because we might have only compiled one port
-
-tk/xm-defs.fasl : tk/xm-defs.lisp
-	echo Foo
-
-
-# Building
-
-clim-xm:	FORCE $(MOTIF_OBJS)
-	-$(RM) -f $(CLIM)
-	$(ECHO) " \
-		(setq sys::*libxt-pathname* \"$(XTLIB)\") \
-		(setq sys::*libx11-pathname* \"$(XLIB)\") \
-	        (setq sys::*clim-motif-pathname* \"clim-motif$(DEBUGLIB).o\") \
-		(load \"misc/dev-load-1.lisp\") \
-		(load-it 'motif-clim) \
-		(setq sys::*clim-dump-name* \"$(DUMP-CLIM)\") \
-		(load \"misc/dump.lisp\")" | $(DUMP-CL) $(CLOPTS) -batch
-	$(MV) $(DUMP-CLIM) $(CLIMXM)
-	ls -lLt $(CLIMXM) >> Clim-sizes.n
-	size $(CLIMXM) >> Clim-sizes.n
-	ls -lLt $(CLIMXM)
-	echo CLIM-XM built!!!!	
-
-clim-ol:	FORCE $(OPENLOOK_OBJS)
-	-$(RM) -f $(CLIMOL)
-	$(ECHO) " \
-		(setq sys::*libxt-pathname* \"$(XTLIB)\") \
-		(setq sys::*libx11-pathname* \"$(XLIB)\") \
-	        (setq sys::*clim-olit-pathname* \"clim-olit$(DEBUGLIB).o\") \
-		(load \"misc/dev-load-1.lisp\") \
-		(load-it 'openlook-clim) \
-		(setq sys::*clim-dump-name* \"$(DUMP-CLIM)\") \
-		(load \"misc/dump.lisp\")" | $(DUMP-CL) $(CLOPTS) -batch
-	$(MV) $(DUMP-CLIM) $(CLIMOL)
-	ls -lLt $(CLIMOL) >> Clim-sizes.n
-	size $(CLIMOL) >> Clim-sizes.n
-	ls -lLt $(CLIMOL)
-	echo CLIM-OL built!!!!		
-
-clim-small:	FORCE
-	$(ECHO) " \
-		(load \"misc/load-xm.lisp\") \
-		(setq sys::*clim-dump-name* \"$(DUMP-CLIM)\") \
-		(load \"misc/dump.lisp\")" | $(DUMP-CL) $(CLOPTS) -batch
-	$(MV) $(DUMP-CLIM) $(CLIM-SMALL)
-	ls -lt $(CLIM-SMALL) >> Clim-sizes.n
-	size $(CLIM-SMALL) >> Clim-sizes.n
-	ls -lt $(CLIM-SMALL)
-
-# Training
-
-train	:	FORCE
-	$(TRAIN_TEXT)
-
-BENCHMARK_FILE=nil
-
-benchmark:
-	$(ECHO) "\
-	(load \"climtoys/test-clim.lisp\") \
-	(clim-user::benchmark-clim $(BENCHMARK_FILE)) \
-"  | $(CLIM) $(CLOPTS) -batch
-
-testps :
-	$(ECHO) "\
-	(load \"climtoys/test-clim.lisp\") \
-	(load \"test/postscript-tests.lisp\") \
-	(clim-user::run-postscript-tests :output :$(PSVIEW)) \
-"  | $(CLIM) $(CLOPTS) -batch
-
-
-echo-train:
-	-$(ECHO) "$(TRAIN_LISP)"
-
-# Misc
-
-
-cleanobjs: 
-	rm -f $(CLIMOBJS) stub-motif.o stub-olit.o
-
-clean:
-	find $(DIRS) -name "*.fasl" -print | xargs rm -f ; rm -f $(CLIMFASLS) \
-	  $(CLIMOBJS) stub-motif.o stub-olit.o slim slim-small
-
-
-cheapclean:
-	find $(CHEAP_CLEAN) -name "*.fasl" -print | xargs rm -f
-
-
-tags:
-	$(TAGS) $(ALL_SRC)
-
-wc:
-	wc $(ALL_SRC)
-
-swm-tape:
-	tar cf $(DEVICE) `find $(PUBDIRS) '(' -name "*.cl" -o -name "*.lisp" ')' -print`
-
-dist:	FORCE
-	tar -cf -  $(SRC_FILES) | compress >  Dist/src.tar.Z
-
-rcscheck:
-	rcscheck $(DIRS) | grep -v .fasl
-
-FORCE:
-
-################## Make-dist stuff
-
-makeclimfasls	: makeclimxmfasls makeclimolfasls
-makeclimxmfasls	: compile-xm cat-xm
-makeclimolfasls	: compile-ol cat-ol
-
-
-install_clim	:
-	cp $(CLIMFASLS) $(DEST)
-	cp $(INSTALLED_CLIMOBJS) $(DEST)
-
-# Link in the libraries & distribution object files with standard names
-
-link-objects	:
-	ln -s $(XTLIB) $(DEST)/libXt.a
-	ln -s $(XLIB) $(DEST)/libX11.a
-#	ln -s $(INSTALLED_CLIMOBJS) $(DEST)
-
-# Backwards compatibility...
-link-motif-libraries:	link-objects
-
-echo_src_files:
-	@ls $(SRC_FILES) | cat
-	
-makeclimobjs	: $(CLIMOBJS)
-
-################## Lower level Makefile stuff
-
-
-ol-dcl	:  stub-x.o stub-xt.o clim-olit.o xlibsupport.o olsupport.o xtsupport.o  $(MALLOCOBJS)
-	cd $(CL_SRC) ; /bin/rm -f ucl ;\
-	make initial_oldspace=$(OLDSPACE) oldspace=$(OLDSPACE) newspace=$(NEWSPACE) premallocs=$(PREMALLOCS) ucl_xtras='$(PWD)/stub-x.o $(PWD)/stub-xt.o $(PWD)/clim-olit.o $(PWD)/xlibsupport.o $(PWD)/olsupport.o $(PWD)/xtsupport.o $(COMPOSEROBJS) $(MALLOCOBJS) $(OLXLIBS)' dcl
-
-xm-dcl	: stub-x.o stub-xt.o clim-motif.o xlibsupport.o xtsupport.o  MyDrawingA.o $(MALLOCOBJS)
-	cd $(CL_SRC) ; /bin/rm -f ucl ;\
-	make initial_oldspace=$(OLDSPACE) oldspace=$(OLDSPACE) newspace=$(NEWSPACE) premallocs=$(PREMALLOCS) ucl_xtras='$(PWD)/stub-x.o $(PWD)/stub-xt.o $(PWD)/clim-motif.o $(PWD)/xlibsupport.o $(PWD)/MyDrawingA.o $(PWD)/xtsupport.o $(COMPOSEROBJS) $(MOTIFLIB) $(MALLOCOBJS) $(XTLIB) $(XLIB) $(XMDCLXTRAS)' dcl	
-
-dcl	: 
-	cd $(CL_SRC) ; /bin/rm -f ucl ;\
-	make dcl	
-
-clim-motif.o	: stub-motif.o stub-xt.o $(MOTIFLIB)
-	ld -r $(LDFLAGS) -o clim-motif.o stub-motif.o stub-xt.o $(MOTIFLIB)
-
-clim-olit.o	: stub-olit.o stub-xt.o $(LIBXOL)
-	ld -r $(LDFLAGS) -o clim-olit.o stub-olit.o stub-xt.o $(LIBXOL)
-
-clim-motif_d.o	: stub-motif.o stub-xt.o $(MOTIFLIB_d)
-	ld -r  $(LDFLAGS) -o clim-motif_d.o stub-motif.o stub-xt.o $(MOTIFLIB_d)
-
-clim-olit_d.o	: stub-olit.o  stub-xt.o $(LIBXOL_d)
-	ld -r $(LDFLAGS) -o clim-olit_d.o stub-olit.o stub-xt.o $(LIBXOL_d)
-
-
-stub-motif.c	:  $(XT_UNDEFS)  $(XMC_UNDEFS) $(XM_UNDEFS) misc/make-stub-file misc/make-stub-file1
-	misc/make-stub-file "void ___lisp_load_motif_stub ()"  $(XT_UNDEFS) $(XM_UNDEFS) > /tmp/`whoami`stub-motif.c 
-	misc/make-stub-file1 "void ___lisp_load_motif_stub_vars ()"  $(XMC_UNDEFS) >> /tmp/`whoami`stub-motif.c 
-	$(MV) /tmp/`whoami`stub-motif.c  stub-motif.c 
-
-stub-olit.c	:   $(XT_UNDEFS) $(OL_UNDEFS) misc/make-stub-file misc/make-stub-file1
-	misc/make-stub-file "void ___lisp_load_olit_stub ()"   $(OL_UNDEFS) > /tmp/`whoami`stub-olit.c 
-	misc/make-stub-file1 "void ___lisp_load_olit_stub_vars ()"   $(OLC_UNDEFS) >> /tmp/`whoami`stub-olit.c 
-	$(MV) /tmp/`whoami`stub-olit.c  stub-olit.c 
-
-stub-x.c	:  $(UNDEFS) $(OL_UNDEFS) misc/make-stub-file
-	misc/make-stub-file "void ___lisp_load_x_stub ()"  $(UNDEFS) > stub-x.c 
-
-stub-xt.c	:  $(XT_UNDEFS) misc/make-stub-file
-	misc/make-stub-file "void ___lisp_load_xt_stub ()"  $(XT_UNDEFS)  > stub-xt.c 
-
-xlibsupport.o	: xlib/xlibsupport.c
-	$(CC) -c $(CFLAGS) -o xlibsupport.o xlib/xlibsupport.c
-
-
-xtsupport.o: misc/xtsupport.c
-	$(CC) -c $(CFLAGS) -o xtsupport.o misc/xtsupport.c
-
-MyDrawingA.o: misc/MyDrawingA.c
-	$(CC) -c $(CFLAGS) -o MyDrawingA.o misc/MyDrawingA.c
-
-olsupport.o: misc/olsupport.c
-	$(CC) -c $(CFLAGS) -o olsupport.o misc/olsupport.c
-
-FORCE	: 
-
-xm-composer : xm-dcl
-	cd /usr/composer2 ; make CL=$(CL) rebuild-c2
-
-ol-composer : ol-dcl
-	cd /usr/composer2 ; make CL=$(CL) rebuild-c2
-
 
+include Makefile.sun4
diff --git a/Makefile.dec3100 b/Makefile.dec3100
new file mode 100644
index 0000000000000000000000000000000000000000..db559fb00af702dede2c47e858cf88b45d38c1e6
--- /dev/null
+++ b/Makefile.dec3100
@@ -0,0 +1,16 @@
+# $fiHeader: Makefile,v 1.74 93/02/10 10:04:04 cer Exp $
+#
+#  Makefile.dec3100 for CLIM 2.0
+#
+
+include Makefile.defs
+
+MOTIFLIB=/usr/lib/DXM/lib/Xm/libXm.a
+MOTIFLIB_d=/usr/lib/DXM/lib/Xm/libXm.a
+XTLIB=/usr/lib/DXM/lib/Xt/libXt.a
+XLIB=/usr/lib/libX11.a
+MV=mv 
+XINCLUDES=-I/usr/lib/DXM/lib -I/usr/lib/DXM/lib/Xt
+TMP=.
+
+include Makefile.generic
diff --git a/Makefile.defs b/Makefile.defs
new file mode 100644
index 0000000000000000000000000000000000000000..dbb965e95194be5a7084fa898ef5eef2fc801511
--- /dev/null
+++ b/Makefile.defs
@@ -0,0 +1,518 @@
+# $fiHeader: Makefile,v 1.74 93/02/10 10:04:04 cer Exp $
+#
+#  Makefile.defs for CLIM 2.0
+#
+
+CL	= /net/vapor/scm2/4.2.beta/src/dcl
+PWD	= /usr/tech/cer/stuff/clim-2.0
+DUMP-CL	= $(CL)
+CLOPTS	= -qq
+
+DEVICE	= /dev/null
+RM	= /bin/rm
+CAT	= /bin/cat
+ECHO	= /bin/echo
+TAGS	= /usr/fi/lib/emacs/etc/etags
+TMP	= /tmp
+MV	= /usr/fi/mv-nfs
+
+# Training
+
+TRAIN_TIMES=2
+# view, file, print
+PSVIEW=file
+
+FRAME_TESTS=t
+
+TRAIN_LISP= \
+	(load \"misc/train.lisp\") \
+	(train-clim :frame-tests $(FRAME_TESTS) :train-times $(TRAIN_TIMES) :psview :$(PSVIEW)) \
+	(exit 0)
+
+TRAIN_TEXT = \
+	$(ECHO) "\
+	$(TRAIN_LISP) \
+" | $(CLIM) $(CLOPTS) -batch \
+	; echo CLIM trained!!!!	
+
+# Info
+LOAD_SOURCE_FILE_INFO=t
+LOAD_XREF_INFO=nil
+RECORD_SOURCE_FILE_INFO=t
+RECORD_XREF_INFO=nil
+
+# Lisp optimization for compiling
+SPEED	= 3
+SAFETY	= 1
+# This next should be set to 1 for distribution
+DEBUG   = 2
+
+COMPILE_PRINT=nil 
+# Where to dump all clim images
+DUMP-CLIM = $(TMP)/clim.temp_`whoami`
+# Where images are then move to (can be same as DUMP-CLIM)
+CLIM	= ./slim
+CLIMOL= $(CLIM)
+CLIMXM= $(CLIM)
+
+
+CFLAGS	= -O -D_NO_PROTO -DSTRINGS_ALIGNED -DNO_REGEX -DNO_ISDIR -DUSE_RE_COMP -DUSER_GETWD $(XINCLUDES)
+LDFLAGS=
+OLDSPACE = 15000000
+NEWSPACE = 5000000
+PREMALLOCS = '-m 401408'
+
+CLIM-SMALL	= ./slim-small
+
+PUBDIRS	= sys utils silica clim demo test genera clx pre-silica postscript compatibility
+DIRS0	=  tk tk-silica misc cloe climtoys
+DIRS	= $(PUBDIRS) xlib $(DIRS0)
+CHEAP_CLEAN	= $(PUBDIRS) $(DIRS0)
+
+SRC_FILES = */*.lisp *.lisp Makefile Makefile.* misc/make-stub-file \
+	    misc/undefinedsymbols misc/undefinedsymbols.olit misc/undefinedsymbols.colit \
+	    misc/undefinedsymbols.motif misc/undefinedsymbols.cmotif misc/undefinedsymbols.xt \
+	    xlib/xlibsupport.c misc/MyDrawingA*.[hc] misc/olsupport.c \
+	    misc/clos-preload.cl misc/xtsupport.c
+
+DEST=/dev/null
+
+CL_SRC=/usr/tech/cer/cl/src
+OPENWINHOME=/usr/openwin-3.0
+
+
+DEBUGLIB=
+XLIBS= $(XTLIB) $(XLIB)
+
+OLCOPYLIB=/vapor/x11/olit-3.0/lib3/sun4
+OLXLIBS=$(OLCOPYLIB)/libXt.a $(OLCOPYLIB)/libX11.a
+LIBXOL=$(OLCOPYLIB)/libXol.a
+LIBXOL_d=$(LIBXOL)
+
+# This has to be kept consistent with xlib.lisp
+UNDEFS=misc/undefinedsymbols
+
+# This should be the same as load-xt
+XT_UNDEFS=misc/undefinedsymbols.xt
+
+# This should be the same as load-xm
+XM_UNDEFS=misc/undefinedsymbols.motif
+XMC_UNDEFS=misc/undefinedsymbols.cmotif
+
+# This should be the same as load-ol
+OL_UNDEFS=misc/undefinedsymbols.olit
+OLC_UNDEFS=misc/undefinedsymbols.colit
+
+# These are the fasls and the .o that form the product
+
+CLIMFASLS= climg.fasl climol.fasl climxm.fasl clim-debug.fasl clim-debugol.fasl \
+	   clim-debugxm.fasl climps.fasl climgg.fasl # clim1compat.fasl
+
+PUBLIC_OBJS=  stub-xt.o stub-x.o stub-olit.o stub-motif.o \
+	  xlibsupport.o MyDrawingA.o \
+	  olsupport.o xtsupport.o
+
+OL_LICENSED_OBJS = clim-olit.o clim-olit_d.o
+XM_LICENSED_OBJS = clim-motif_d.o clim-motif.o 
+
+MOTIF_OBJS= clim-motif_d.o clim-motif.o xtsupport.o stub-xt.o stub-x.o stub-x.o  xlibsupport.o MyDrawingA.o
+OPENLOOK_OBJS= clim-olit_d.o clim-olit.o xtsupport.o stub-xt.o stub-x.o stub-x.o olsupport.o  xlibsupport.o
+
+CLIMOBJS=$(PUBLIC_OBJS) $(XM_LICENSED_OBJS) $(OL_LICENSED_OBJS)
+
+INSTALLED_CLIMOBJS=$(PUBLIC_OBJS) $(XM_LICENSED_OBJS) $(OL_LICENSED_OBJS)
+
+
+# These are linked into the distribution
+# `pwd`/clim-olit_d.o \ `pwd`/clim-olit.o \
+
+#FCLIMOBJS= `pwd`/clim-motif_d.o `pwd`/clim-motif.o \
+#	    `pwd`/stub-xt.o `pwd`/stub-x.o \
+#	   `pwd`/xlibsupport.o `pwd`/MyDrawingA.o `pwd`/olsupport.o `pwd`/xtsupport.o
+
+# These are built into xm-dcl and ol-dcl.
+COMPOSEROBJS= /scm/4.1/sparc/src/code/excldep.o /scm/4.1/sparc/src/code/socket.o \
+	      /scm/4.1/sparc/src/code/gc_cursor.o \
+	      /scm/4.1/sparc/src/code/unixsocket.o \
+	      /scm/4.1/sparc/src/code/io.o /scm/4.1/sparc/src/code/exclio.o \
+	      /scm/4.1/sparc/src/code/RunStatus.o
+
+MALLOCOBJS =
+# Uncomment to enable malloc debugging.
+#
+# MALLOCOBJS= $(PWD)/malloclib/malloc.o $(PWD)/malloclib/free.o $(PWD)/malloclib/realloc.o \
+#	    $(PWD)/malloclib/calloc.o $(PWD)/malloclib/string.o \
+#	    $(PWD)/malloclib/malloc_chk.o $(PWD)/malloclib/malloc_chn.o \
+#	    $(PWD)/malloclib/memory.o $(PWD)/malloclib/tostring.o \
+#	    $(PWD)/malloclib/m_perror.o $(PWD)/malloclib/m_init.o \
+#	    $(PWD)/malloclib/mallopt.o $(PWD)/malloclib/dump.o $(PWD)/malloclib/leak.o
+
+#
+# "Compile time objects" -- these go into clim-debug.fasl
+#
+DEBUG-OBJS = xlib/ffi.fasl xlib/xlib-defs.fasl xlib/xlib-funs.fasl \
+	     xlib/x11-keysyms.fasl xlib/last.fasl \
+	     tk/xt-defs.fasl tk/xt-funs.fasl 
+
+XM-DEBUG-OBJS = tk/xm-defs.fasl tk/xm-funs.fasl
+OL-DEBUG-OBJS = tk/ol-defs.fasl tk/ol-funs.fasl
+
+#
+# "Load time objects" -- these go into clim.fasl
+#
+CLIM-UTILS-OBJS = utils/excl-verification.fasl \
+                   utils/lisp-package-fixups.fasl \
+                   utils/defpackage.fasl \
+                   utils/packages.fasl \
+                   utils/defun-utilities.fasl \
+                   utils/reader.fasl \
+                   utils/clos-patches.fasl \
+                   utils/clos.fasl \
+                   utils/utilities.fasl \
+                   utils/lisp-utilities.fasl \
+                   utils/processes.fasl \
+                   utils/queue.fasl \
+		   utils/timers.fasl \
+                   utils/protocols.fasl \
+                   utils/clim-streams.fasl \
+                   utils/excl-streams.fasl \
+                   utils/clim-macros.fasl \
+                   utils/transformations.fasl \
+                   utils/regions.fasl \
+                   utils/region-arithmetic.fasl \
+                   utils/extended-regions.fasl \
+		   utils/base-designs.fasl \
+                   utils/designs.fasl
+
+CLIM-SILICA-OBJS = silica/classes.fasl \
+                    silica/text-style.fasl \
+                    silica/macros.fasl \
+                    silica/sheet.fasl \
+                    silica/mirror.fasl \
+                    silica/event.fasl \
+                    silica/port.fasl \
+                    silica/medium.fasl \
+                    silica/framem.fasl \
+                    silica/graphics.fasl \
+		    silica/pixmaps.fasl \
+                    silica/std-sheet.fasl \
+                    silica/layout.fasl \
+                    silica/db-layout.fasl \
+                    silica/db-box.fasl \
+                    silica/db-table.fasl \
+                    silica/gadgets.fasl \
+                    silica/db-scroll.fasl \
+                    silica/db-border.fasl
+
+CLIM-STANDALONE-OBJS = clim/gestures.fasl \
+                        clim/defprotocol.fasl \
+                        clim/stream-defprotocols.fasl \
+                        clim/defresource.fasl \
+                        clim/temp-strings.fasl \
+                        clim/clim-defs.fasl \
+                        clim/stipples.fasl \
+                        clim/stream-class-defs.fasl \
+                        clim/interactive-defs.fasl \
+                        clim/cursor.fasl \
+                        clim/view-defs.fasl \
+                        clim/input-defs.fasl \
+                        clim/input-protocol.fasl \
+                        clim/output-protocol.fasl \
+                        clim/recording-protocol.fasl \
+			clim/recording-defs.fasl \
+			clim/text-recording.fasl \
+			clim/graphics-recording.fasl \
+                        clim/interactive-protocol.fasl \
+                        clim/input-editor-commands.fasl \
+                        clim/formatted-output-defs.fasl \
+                        clim/incremental-redisplay.fasl \
+                        clim/coordinate-sorted-set.fasl \
+			clim/r-tree.fasl \
+                        clim/window-stream.fasl \
+                        clim/pixmap-streams.fasl \
+                        clim/ptypes1.fasl \
+                        clim/completer.fasl \
+                        clim/presentations.fasl \
+                        clim/translators.fasl \
+                        clim/histories.fasl \
+                        clim/ptypes2.fasl \
+			clim/excl-presentations.fasl \
+                        clim/standard-types.fasl \
+                        clim/table-formatting.fasl \
+                        clim/graph-formatting.fasl \
+                        clim/surround-output.fasl \
+                        clim/text-formatting.fasl \
+                        clim/tracking-pointer.fasl \
+                        clim/dragging-output.fasl \
+                        clim/db-stream.fasl \
+                        clim/gadget-output.fasl \
+                        clim/accept.fasl \
+                        clim/present.fasl \
+                        clim/command.fasl \
+                        clim/command-processor.fasl \
+                        clim/basic-translators.fasl \
+                        clim/frames.fasl \
+			clim/default-frame.fasl \
+                        clim/activities.fasl \
+			clim/noting-progress.fasl \
+                        clim/menus.fasl \
+                        clim/accept-values.fasl \
+			clim/drag-and-drop.fasl \
+                        clim/item-list-manager.fasl \
+			postscript/pkgdcl.fasl \
+			postscript/postscript-s.fasl \
+                        clim/stream-trampolines.fasl
+
+GENERIC-GADGETS = clim/db-menu.fasl clim/db-list.fasl clim/db-text.fasl silica/db-button.fasl \
+	    silica/db-slider.fasl silica/scroll-pane.fasl
+
+XLIB-CLIM-OBJS = xlib/pkg.fasl xlib/load-xlib.fasl
+
+
+LOAD-XM-OBJS=	tk/load-xm.fasl
+LOAD-OL-OBJS=	tk/load-ol.fasl
+
+XT-TK-OBJS =  	tk/pkg.fasl \
+                tk/foreign-obj.fasl \
+                tk/macros.fasl \
+                tk/xlib.fasl \
+                tk/font.fasl \
+                tk/gcontext.fasl \
+                tk/graphics.fasl \
+                tk/meta-tk.fasl \
+                tk/make-classes.fasl \
+                tk/foreign.fasl \
+                tk/widget.fasl \
+                tk/resources.fasl \
+                tk/event.fasl \
+                tk/callbacks.fasl \
+                tk/xt-classes.fasl \
+                tk/xt-init.fasl
+
+XM-TK-OBJS = tk/xm-classes.fasl \
+		tk/xm-callbacks.fasl \
+                tk/xm-init.fasl \
+                tk/xm-widgets.fasl \
+                tk/xm-font-list.fasl \
+                tk/xm-protocols.fasl \
+                tk/convenience.fasl \
+                tk/make-widget.fasl
+
+OL-CLIM-OBJS = tk/ol-classes.fasl \
+                tk/ol-init.fasl \
+		tk/ol-widgets.fasl \
+                tk/ol-callbacks.fasl \
+                tk/make-widget.fasl
+
+MOTIF-CLIM-OBJS = tk-silica/pkg.fasl \
+                   tk-silica/xt-silica.fasl \
+                   tk-silica/xm-silica.fasl \
+                   tk-silica/xt-graphics.fasl \
+                   tk-silica/xm-graphics.fasl \
+                   tk-silica/image.fasl \
+                   tk-silica/xt-frames.fasl \
+                   tk-silica/xm-frames.fasl \
+                   tk-silica/xm-dialogs.fasl \
+                   tk-silica/xt-gadgets.fasl \
+                   tk-silica/xm-gadgets.fasl \
+                   tk-silica/xm-menus.fasl \
+                   tk-silica/xt-pixmaps.fasl \
+                   tk-silica/xt-cursor.fasl \
+                   tk-silica/last.fasl
+
+
+OPENLOOK-CLIM-OBJS = tk-silica/pkg.fasl \
+                      tk-silica/xt-silica.fasl \
+                      tk-silica/ol-silica.fasl \
+                      tk-silica/xt-graphics.fasl \
+                      tk-silica/ol-graphics.fasl \
+                      tk-silica/image.fasl \
+                      tk-silica/xt-frames.fasl \
+                      tk-silica/ol-frames.fasl \
+                      tk-silica/xt-gadgets.fasl \
+                      tk-silica/ol-gadgets.fasl \
+		      tk-silica/xt-cursor.fasl \
+                      tk-silica/xt-pixmaps.fasl \
+		      tk-silica/last.fasl
+
+POSTSCRIPT_CLIM= postscript/postscript-port.fasl \
+	postscript/postscript-medium.fasl \
+	postscript/laserwriter-metrics.fasl 
+
+# Used for tags
+ALL_SRC =	   utils/excl-verification.lisp \
+                   utils/lisp-package-fixups.lisp \
+                   utils/defpackage.lisp \
+                   utils/packages.lisp \
+                   utils/defun-utilities.lisp \
+                   utils/reader.lisp \
+                   utils/clos-patches.lisp \
+                   utils/clos.lisp \
+                   utils/utilities.lisp \
+                   utils/lisp-utilities.lisp \
+                   utils/processes.lisp \
+                   utils/queue.lisp \
+                   utils/protocols.lisp \
+                   utils/clim-streams.lisp \
+                   utils/excl-streams.lisp \
+                   utils/clim-macros.lisp \
+                   utils/transformations.lisp \
+                   utils/regions.lisp \
+                   utils/region-arithmetic.lisp \
+                   utils/extended-regions.lisp \
+                   utils/designs.lisp \
+		    silica/classes.lisp \
+                    silica/text-style.lisp \
+                    silica/macros.lisp \
+                    silica/sheet.lisp \
+                    silica/mirror.lisp \
+                    silica/event.lisp \
+                    silica/port.lisp \
+                    silica/medium.lisp \
+                    silica/framem.lisp \
+                    silica/graphics.lisp \
+                    silica/pixmaps.lisp \
+                    silica/std-sheet.lisp \
+                    silica/layout.lisp \
+                    silica/db-layout.lisp \
+                    silica/db-box.lisp \
+                    silica/db-table.lisp \
+                    silica/gadgets.lisp \
+                    silica/db-border.lisp \
+                    silica/db-scroll.lisp \
+                    silica/db-button.lisp \
+                    silica/db-slider.lisp \
+			clim/gestures.lisp \
+                        clim/defprotocol.lisp \
+                        clim/stream-defprotocols.lisp \
+                        clim/defresource.lisp \
+                        clim/temp-strings.lisp \
+                        clim/clim-defs.lisp \
+                        clim/stipples.lisp \
+                        clim/stream-class-defs.lisp \
+                        clim/interactive-defs.lisp \
+                        clim/cursor.lisp \
+                        clim/view-defs.lisp \
+                        clim/input-defs.lisp \
+                        clim/input-protocol.lisp \
+                        clim/output-protocol.lisp \
+                        clim/recording-defs.lisp \
+                        clim/recording-protocol.lisp \
+                        clim/text-recording.lisp \
+                        clim/graphics-recording.lisp \
+                        clim/interactive-protocol.lisp \
+                        clim/input-editor-commands.lisp \
+                        clim/formatted-output-defs.lisp \
+                        clim/incremental-redisplay.lisp \
+                        clim/coordinate-sorted-set.lisp \
+                        clim/window-stream.lisp \
+                        clim/pixmap-streams.lisp \
+                        clim/ptypes1.lisp \
+                        clim/completer.lisp \
+                        clim/presentations.lisp \
+                        clim/translators.lisp \
+                        clim/histories.lisp \
+                        clim/ptypes2.lisp \
+                        clim/standard-types.lisp \
+                        clim/excl-presentations.lisp \
+                        clim/table-formatting.lisp \
+                        clim/graph-formatting.lisp \
+                        clim/surround-output.lisp \
+                        clim/text-formatting.lisp \
+                        clim/tracking-pointer.lisp \
+                        clim/dragging-output.lisp \
+                        clim/db-stream.lisp \
+                        clim/gadget-output.lisp \
+                        clim/accept.lisp \
+                        clim/present.lisp \
+                        clim/command.lisp \
+                        clim/command-processor.lisp \
+                        clim/basic-translators.lisp \
+                        clim/frames.lisp \
+                        clim/default-frame.lisp \
+                        clim/noting-progress.lisp \
+                        clim/menus.lisp \
+                        clim/accept-values.lisp \
+                        clim/drag-and-drop.lisp \
+                        clim/item-list-manager.lisp \
+                        clim/stream-trampolines.lisp \
+	     xlib/pkg.lisp \
+             xlib/ffi.lisp \
+             xlib/xlib-defs.lisp \
+             xlib/load-xlib.lisp \
+             xlib/xlib-funs.lisp \
+             xlib/x11-keysyms.lisp \
+             xlib/last.lisp \
+	      tk/load-xm.lisp \
+              tk/load-ol.lisp \
+	      tk/pkg.lisp \
+              tk/macros.lisp \
+              tk/xt-defs.lisp \
+              tk/foreign-obj.lisp \
+              tk/xlib.lisp \
+              tk/font.lisp \
+              tk/gcontext.lisp \
+              tk/graphics.lisp \
+              tk/meta-tk.lisp \
+              tk/make-classes.lisp \
+              tk/foreign.lisp \
+              tk/widget.lisp \
+              tk/resources.lisp \
+              tk/event.lisp \
+              tk/callbacks.lisp \
+              tk/xt-classes.lisp \
+              tk/xt-init.lisp \
+              tk/xm-defs.lisp \
+              tk/xm-classes.lisp \
+              tk/xm-callbacks.lisp \
+              tk/xt-funs.lisp \
+              tk/xm-funs.lisp \
+              tk/xm-classes.lisp \
+              tk/xm-init.lisp \
+              tk/xm-widgets.lisp \
+              tk/xm-font-list.lisp \
+              tk/xm-protocols.lisp \
+              tk/convenience.lisp \
+              tk/make-widget.lisp \
+		   tk-silica/pkg.lisp \
+                   tk-silica/xt-silica.lisp \
+                   tk-silica/xm-silica.lisp \
+                   tk-silica/xt-graphics.lisp \
+                   tk-silica/xm-graphics.lisp \
+                   tk-silica/image.lisp \
+                   tk-silica/xt-frames.lisp \
+                   tk-silica/xm-frames.lisp \
+                   tk-silica/xt-gadgets.lisp \
+                   tk-silica/xm-gadgets.lisp \
+                   tk-silica/xm-menus.lisp \
+                   tk-silica/xt-cursor.lisp \
+                   tk-silica/xt-pixmaps.lisp \
+	      tk/ol-defs.lisp \
+              tk/ol-funs.lisp \
+              tk/ol-classes.lisp \
+              tk/ol-init.lisp \
+              tk/ol-widgets.lisp \
+              tk/ol-callbacks.lisp \
+                      tk-silica/ol-silica.lisp \
+                      tk-silica/ol-graphics.lisp \
+                      tk-silica/ol-frames.lisp \
+                      tk-silica/ol-gadgets.lisp
+
+
+GENERIC-OBJS= $(CLIM-UTILS-OBJS) $(CLIM-SILICA-OBJS) $(CLIM-STANDALONE-OBJS)
+MOTIF-OBJS = $(LOAD-XM-OBJS) $(XT-TK-OBJS) $(XM-TK-OBJS) $(MOTIF-CLIM-OBJS) 
+OPENLOOK-OBJS = $(LOAD-OL-OBJS) $(XT-TK-OBJS) $(OL-CLIM-OBJS) $(OPENLOOK-CLIM-OBJS)
+
+make = make SPEED=${SPEED} SAFETY=${SAFETY} DEBUG=${DEBUG} \
+	LOAD_SOURCE_FILE_INFO=${LOAD_SOURCE_FILE_INFO} \
+	RECORD_SOURCE_FILE_INFO=${RECORD_SOURCE_FILE_INFO} \
+	LOAD_XREF_INFO=${LOAD_XREF_INFO} \
+	RECORD_XREF_INFO=${RECORD_XREF_INFO} \
+	CLIM=${CLIM} CLIMOL=${CLIMOL} CLIMXM=${CLIMXM} DUMP-CLIM=${DUMP-CLIM} \
+	COMPILE_PRINT=${COMPILE_PRINT}
+
+CLIM1COMPAT= compatibility/packages.fasl compatibility/clim1-compatibility.fasl
+
+BENCHMARK_FILE=nil
+
+
diff --git a/Makefile.generic b/Makefile.generic
new file mode 100644
index 0000000000000000000000000000000000000000..6c7854cc9e982ea43ab040bdd660ccaf42d35169
--- /dev/null
+++ b/Makefile.generic
@@ -0,0 +1,313 @@
+# $fiHeader: Makefile,v 1.74 93/02/10 10:04:04 cer Exp $
+#
+#  Makefile.generic for CLIM 2.0
+#
+
+default: all-xm
+
+trained-clim-xm:	
+	(${make} all-xm train ; ${make} clim-xm)
+
+trained-clim-ol:	
+	(${make} all-ol train ; ${make} clim-ol)
+
+all-xm:	compile-xm cat-xm clim-xm
+all-ol:	compile-ol cat-ol clim-ol
+
+compile-xm:	$(MOTIF_OBJS) FORCE
+	$(ECHO) "\
+	(si::system-compile-wrapper \
+	 (function \
+	  (lambda () \
+	    (setq *compile-print* $(COMPILE_PRINT)) \
+	    (setq sys::*libxt-pathname* \"$(XTLIB)\") \
+	    (setq sys::*libx11-pathname* \"$(XLIB)\") \
+	    (setq sys::*clim-motif-pathname* \"clim-motif$(DEBUGLIB).o\") \
+	    (load \"misc/compile-1.lisp\") \
+	    (compile-it 'motif-clim))) \
+	 :speed $(SPEED) :debug $(DEBUG) :safety $(SAFETY) \
+	 :record-source-file-info $(RECORD_SOURCE_FILE_INFO) \
+	 :record-xref-info $(RECORD_XREF_INFO) \
+	 :compile-print nil :compile-verbose nil \
+	 :redefinition-warnings t :gcprint nil)" | $(CL) $(CLOPTS) -batch
+
+compile-ol:	$(OPENLOOK_OBJS) FORCE
+	$(ECHO) "\
+	(si::system-compile-wrapper \
+	 (function \
+	  (lambda () \
+	    (setq *compile-print* $(COMPILE_PRINT)) \
+	    (setf excl:*load-xref-info* $(LOAD_XREF_INFO)) \
+	    (setq sys::*libxt-pathname* \"$(XTLIB)\") \
+	    (setq sys::*libx11-pathname* \"$(XLIB)\") \
+	    (setq sys::*clim-olit-pathname* \"clim-olit$(DEBUGLIB).o\") \
+	    (setq *ignore-package-name-case* t) \
+	    (set-case-mode :case-insensitive-lower) \
+	    (load \"misc/compile-1.lisp\") \
+	    (compile-it 'openlook-clim))) \
+	 :speed $(SPEED) :debug $(DEBUG) :safety $(SAFETY) \
+	 :record-source-file-info $(RECORD_SOURCE_FILE_INFO) \
+	 :record-xref-info $(RECORD_XREF_INFO) \
+	 :compile-print nil :compile-verbose nil \
+	 :redefinition-warnings t :gcprint nil)" | $(CL) $(CLOPTS) -batch
+
+# Concatenation
+
+cat:	cat-xm cat-ol
+cat-g:	climg.fasl clim-debug.fasl climps.fasl climgg.fasl # clim1compat.fasl
+cat-xm:	cat-g climxm.fasl clim-debugxm.fasl 
+cat-ol:	cat-g climol.fasl clim-debugol.fasl 
+
+climg.fasl	: $(GENERIC-OBJS) $(XLIB-CLIM-OBJS)
+	$(CAT) $(GENERIC-OBJS) $(XLIB-CLIM-OBJS) > $(TMP)/clim.fasl_`whoami`
+	$(MV) $(TMP)/clim.fasl_`whoami` climg.fasl
+	ls -lt climg.fasl >> Clim-sizes.n
+	ls -lt climg.fasl
+
+climgg.fasl	: $(GENERIC-GADGETS)
+	$(CAT) $(GENERIC-GADGETS) > $(TMP)/clim.fasl_`whoami`
+	$(MV) $(TMP)/clim.fasl_`whoami` climgg.fasl
+	ls -lt climgg.fasl >> Clim-sizes.n
+	ls -lt climgg.fasl
+
+
+climxm.fasl	: $(MOTIF-OBJS) $(XLIB-CLIM-OBJS)
+	$(CAT) $(MOTIF-OBJS) > $(TMP)/clim.fasl_`whoami`
+	$(MV) $(TMP)/clim.fasl_`whoami` climxm.fasl
+	ls -lt climxm.fasl >> Clim-sizes.n
+	ls -lt climxm.fasl
+
+climol.fasl	: $(OPENLOOK-OBJS)
+	$(CAT) $(OPENLOOK-OBJS) > $(TMP)/clim.fasl_`whoami`
+	$(MV) $(TMP)/clim.fasl_`whoami` climol.fasl
+	ls -lt climol.fasl >> Clim-sizes.n
+	ls -lt climol.fasl
+
+echo-fasls:
+	ls -lt $(MOTIF-OBJS) > /tmp/foo
+
+clim-debug.fasl:	$(DEBUG-OBJS)
+	$(CAT) $(DEBUG-OBJS) > $(TMP)/clim-debug.fasl_`whoami`
+	$(MV) $(TMP)/clim-debug.fasl_`whoami` clim-debug.fasl
+	ls -lt clim-debug.fasl >> Clim-sizes.n
+	ls -lt clim-debug.fasl
+
+clim-debugxm.fasl:	$(XM-DEBUG-OBJS)
+	$(CAT) $(XM-DEBUG-OBJS) > $(TMP)/clim-debugxm.fasl_`whoami`
+	$(MV) $(TMP)/clim-debugxm.fasl_`whoami` clim-debugxm.fasl
+	ls -lt clim-debugxm.fasl >> Clim-sizes.n
+	ls -lt clim-debugxm.fasl
+
+clim-debugol.fasl:	$(OL-DEBUG-OBJS)
+	$(CAT) $(OL-DEBUG-OBJS) > $(TMP)/clim-debugol.fasl_`whoami`
+	$(MV) $(TMP)/clim-debugol.fasl_`whoami` clim-debugol.fasl
+	ls -lt clim-debugol.fasl >> Clim-sizes.n
+	ls -lt clim-debugol.fasl
+
+climps.fasl: 	$(POSTSCRIPT_CLIM)
+	$(CAT) $(POSTSCRIPT_CLIM) > $(TMP)/climps.fasl_`whoami`
+	$(MV) $(TMP)/climps.fasl_`whoami` climps.fasl
+
+clim1compat.fasl : $(CLIM1COMPAT)
+	$(CAT) $(CLIM1COMPAT) > $(TMP)/clim1compat.fasl_`whoami`
+	$(MV) $(TMP)/clim1compat.fasl_`whoami` clim1compat.fasl
+	ls -lt clim1compat.fasl >> Clim-sizes.n
+	ls -lt clim1compat.fasl
+
+# We should only run these rules when
+# We do this because we because we might have only compiled one port
+
+tk/xm-defs.fasl : tk/xm-defs.lisp
+	echo Foo
+
+
+# Building
+
+clim-xm:	FORCE $(MOTIF_OBJS)
+	-$(RM) -f $(CLIM)
+	$(ECHO) " \
+		(setq sys::*libxt-pathname* \"$(XTLIB)\") \
+		(setq sys::*libx11-pathname* \"$(XLIB)\") \
+	        (setq sys::*clim-motif-pathname* \"clim-motif$(DEBUGLIB).o\") \
+		(load \"misc/dev-load-1.lisp\") \
+		(load-it 'motif-clim) \
+		(setq sys::*clim-dump-name* \"$(DUMP-CLIM)\") \
+		(load \"misc/dump.lisp\")" | $(DUMP-CL) $(CLOPTS) -batch
+	$(MV) $(DUMP-CLIM) $(CLIMXM)
+	ls -lLt $(CLIMXM) >> Clim-sizes.n
+	size $(CLIMXM) >> Clim-sizes.n
+	ls -lLt $(CLIMXM)
+	echo CLIM-XM built!!!!	
+
+clim-ol:	FORCE $(OPENLOOK_OBJS)
+	-$(RM) -f $(CLIMOL)
+	$(ECHO) " \
+		(setq sys::*libxt-pathname* \"$(XTLIB)\") \
+		(setq sys::*libx11-pathname* \"$(XLIB)\") \
+	        (setq sys::*clim-olit-pathname* \"clim-olit$(DEBUGLIB).o\") \
+		(load \"misc/dev-load-1.lisp\") \
+		(load-it 'openlook-clim) \
+		(setq sys::*clim-dump-name* \"$(DUMP-CLIM)\") \
+		(load \"misc/dump.lisp\")" | $(DUMP-CL) $(CLOPTS) -batch
+	$(MV) $(DUMP-CLIM) $(CLIMOL)
+	ls -lLt $(CLIMOL) >> Clim-sizes.n
+	size $(CLIMOL) >> Clim-sizes.n
+	ls -lLt $(CLIMOL)
+	echo CLIM-OL built!!!!		
+
+clim-small:	FORCE
+	$(ECHO) " \
+		(load \"misc/load-xm.lisp\") \
+		(setq sys::*clim-dump-name* \"$(DUMP-CLIM)\") \
+		(load \"misc/dump.lisp\")" | $(DUMP-CL) $(CLOPTS) -batch
+	$(MV) $(DUMP-CLIM) $(CLIM-SMALL)
+	ls -lt $(CLIM-SMALL) >> Clim-sizes.n
+	size $(CLIM-SMALL) >> Clim-sizes.n
+	ls -lt $(CLIM-SMALL)
+
+# Training
+
+train	:	FORCE
+	$(TRAIN_TEXT)
+
+benchmark:
+	$(ECHO) "\
+	(load \"climtoys/test-clim.lisp\") \
+	(clim-user::benchmark-clim $(BENCHMARK_FILE)) \
+"  | $(CLIM) $(CLOPTS) -batch
+
+testps :
+	$(ECHO) "\
+	(load \"climtoys/test-clim.lisp\") \
+	(load \"test/postscript-tests.lisp\") \
+	(clim-user::run-postscript-tests :output :$(PSVIEW)) \
+"  | $(CLIM) $(CLOPTS) -batch
+
+
+echo-train:
+	-$(ECHO) "$(TRAIN_LISP)"
+
+# Misc
+
+
+cleanobjs: 
+	rm -f $(CLIMOBJS) stub-motif.o stub-olit.o
+
+clean:
+	find $(DIRS) -name "*.fasl" -print | xargs rm -f ; rm -f $(CLIMFASLS) \
+	  $(CLIMOBJS) stub-motif.o stub-olit.o slim slim-small
+
+
+cheapclean:
+	find $(CHEAP_CLEAN) -name "*.fasl" -print | xargs rm -f
+
+
+tags:
+	$(TAGS) $(ALL_SRC)
+
+wc:
+	wc $(ALL_SRC)
+
+swm-tape:
+	tar cf $(DEVICE) `find $(PUBDIRS) '(' -name "*.cl" -o -name "*.lisp" ')' -print`
+
+dist:	FORCE
+	tar -cf -  $(SRC_FILES) | compress >  Dist/src.tar.Z
+
+rcscheck:
+	rcscheck $(DIRS) | grep -v .fasl
+
+FORCE:
+
+################## Make-dist stuff
+
+makeclimfasls	: makeclimxmfasls makeclimolfasls
+makeclimxmfasls	: compile-xm cat-xm
+makeclimolfasls	: compile-ol cat-ol
+
+
+install_clim	:
+	cp $(CLIMFASLS) $(DEST)
+	cp $(INSTALLED_CLIMOBJS) $(DEST)
+
+# Link in the libraries & distribution object files with standard names
+
+link-objects	:
+	ln -s $(XTLIB) $(DEST)/libXt.a
+	ln -s $(XLIB) $(DEST)/libX11.a
+#	ln -s $(INSTALLED_CLIMOBJS) $(DEST)
+
+# Backwards compatibility...
+link-motif-libraries:	link-objects
+
+echo_src_files:
+	@ls $(SRC_FILES) | cat
+	
+makeclimobjs	: $(CLIMOBJS)
+
+################## Lower level Makefile stuff
+
+
+ol-dcl	:  stub-x.o stub-xt.o clim-olit.o xlibsupport.o olsupport.o xtsupport.o  $(MALLOCOBJS)
+	cd $(CL_SRC) ; /bin/rm -f ucl ;\
+	make initial_oldspace=$(OLDSPACE) oldspace=$(OLDSPACE) newspace=$(NEWSPACE) premallocs=$(PREMALLOCS) ucl_xtras='$(PWD)/stub-x.o $(PWD)/stub-xt.o $(PWD)/clim-olit.o $(PWD)/xlibsupport.o $(PWD)/olsupport.o $(PWD)/xtsupport.o $(COMPOSEROBJS) $(MALLOCOBJS) $(OLXLIBS)' dcl
+
+xm-dcl	: stub-x.o stub-xt.o clim-motif.o xlibsupport.o xtsupport.o  MyDrawingA.o $(MALLOCOBJS)
+	cd $(CL_SRC) ; /bin/rm -f ucl ;\
+	make initial_oldspace=$(OLDSPACE) oldspace=$(OLDSPACE) newspace=$(NEWSPACE) premallocs=$(PREMALLOCS) ucl_xtras='$(PWD)/stub-x.o $(PWD)/stub-xt.o $(PWD)/clim-motif.o $(PWD)/xlibsupport.o $(PWD)/MyDrawingA.o $(PWD)/xtsupport.o $(COMPOSEROBJS) $(MOTIFLIB) $(MALLOCOBJS) $(XTLIB) $(XLIB) $(XMDCLXTRAS)' dcl	
+
+dcl	: 
+	cd $(CL_SRC) ; /bin/rm -f ucl ;\
+	make dcl	
+
+clim-motif.o	: stub-motif.o stub-xt.o $(MOTIFLIB)
+	ld -r $(LDFLAGS) -o clim-motif.o stub-motif.o stub-xt.o $(MOTIFLIB)
+
+clim-olit.o	: stub-olit.o stub-xt.o $(LIBXOL)
+	ld -r $(LDFLAGS) -o clim-olit.o stub-olit.o stub-xt.o $(LIBXOL)
+
+clim-motif_d.o	: stub-motif.o stub-xt.o $(MOTIFLIB_d)
+	ld -r  $(LDFLAGS) -o clim-motif_d.o stub-motif.o stub-xt.o $(MOTIFLIB_d)
+
+clim-olit_d.o	: stub-olit.o  stub-xt.o $(LIBXOL_d)
+	ld -r $(LDFLAGS) -o clim-olit_d.o stub-olit.o stub-xt.o $(LIBXOL_d)
+
+
+stub-motif.c	:  $(XT_UNDEFS)  $(XMC_UNDEFS) $(XM_UNDEFS) misc/make-stub-file misc/make-stub-file1
+	misc/make-stub-file "void ___lisp_load_motif_stub ()"  $(XT_UNDEFS) $(XM_UNDEFS) > /tmp/`whoami`stub-motif.c 
+	misc/make-stub-file1 "void ___lisp_load_motif_stub_vars ()"  $(XMC_UNDEFS) >> /tmp/`whoami`stub-motif.c 
+	$(MV) /tmp/`whoami`stub-motif.c  stub-motif.c 
+
+stub-olit.c	:   $(XT_UNDEFS) $(OL_UNDEFS) misc/make-stub-file misc/make-stub-file1
+	misc/make-stub-file "void ___lisp_load_olit_stub ()"   $(OL_UNDEFS) > /tmp/`whoami`stub-olit.c 
+	misc/make-stub-file1 "void ___lisp_load_olit_stub_vars ()"   $(OLC_UNDEFS) >> /tmp/`whoami`stub-olit.c 
+	$(MV) /tmp/`whoami`stub-olit.c  stub-olit.c 
+
+stub-x.c	:  $(UNDEFS) $(OL_UNDEFS) misc/make-stub-file
+	misc/make-stub-file "void ___lisp_load_x_stub ()"  $(UNDEFS) > stub-x.c 
+
+stub-xt.c	:  $(XT_UNDEFS) misc/make-stub-file
+	misc/make-stub-file "void ___lisp_load_xt_stub ()"  $(XT_UNDEFS)  > stub-xt.c 
+
+xlibsupport.o	: xlib/xlibsupport.c
+	$(CC) -c $(CFLAGS) -o xlibsupport.o xlib/xlibsupport.c
+
+
+xtsupport.o: misc/xtsupport.c
+	$(CC) -c $(CFLAGS) -o xtsupport.o misc/xtsupport.c
+
+MyDrawingA.o: misc/MyDrawingA.c
+	$(CC) -c $(CFLAGS) -o MyDrawingA.o misc/MyDrawingA.c
+
+olsupport.o: misc/olsupport.c
+	$(CC) -c $(CFLAGS) -o olsupport.o misc/olsupport.c
+
+FORCE	: 
+
+xm-composer : xm-dcl
+	cd /usr/composer2 ; make CL=$(CL) rebuild-c2
+
+ol-composer : ol-dcl
+	cd /usr/composer2 ; make CL=$(CL) rebuild-c2
+
+
diff --git a/Makefile.sun4 b/Makefile.sun4
new file mode 100644
index 0000000000000000000000000000000000000000..676b5a7a5ae7ba1e0af87fcc3cd046974b1c41b5
--- /dev/null
+++ b/Makefile.sun4
@@ -0,0 +1,14 @@
+# $fiHeader: Makefile,v 1.74 93/02/10 10:04:04 cer Exp $
+#
+#  Makefile.sun4 for CLIM 2.0
+#
+
+include Makefile.defs
+
+MOTIFLIB=/x11/R4/sun4-lib/libXm$(DEBUGLIB).a
+MOTIFLIB_d=/x11/R4/sun4-lib/libXm_d.a
+XLIB= /x11/R4/sun4-lib/libX11$(DEBUGLIB).a 
+XTLIB=/x11/R4/sun4-lib/libXt$(DEBUGLIB).a
+XINCLUDES=-I/x11/motif-1.1/lib
+
+include Makefile.generic
diff --git a/misc/xtsupport.c b/misc/xtsupport.c
index d97c49dfa8745be7a5eb3cfc5c4c3de15bce5678..641bcada14520812f7d90c2f939398f3655f3e63 100644
--- a/misc/xtsupport.c
+++ b/misc/xtsupport.c
@@ -1,6 +1,19 @@
-#include "/vapor/x11/R4/src/mit/lib/Xt/IntrinsicI.h"
+/* $fiHeader: xtsupport.c,v 1.1 92/08/19 10:23:08 cer Exp $ */
 
-/* $fiHeader$ */
+#ifdef sparc
+#include "IntrinsicI.h
+#endif
+
+#ifdef ultrix
+
+unsigned long XtAppIntervalNextTimer(app)
+{
+    return (1000);
+    }
+
+#endif
+
+#ifdef sparc
 
 /* Some systems running NTP daemons are known to return strange usec
  * values from gettimeofday.  At present (3/90) this has only been
@@ -87,4 +100,5 @@ unsigned long XtAppIntervalNextTimer(app)
     else 
 	return 0;
 	}
-	
+
+#endif
diff --git a/tk-silica/xm-gadgets.lisp b/tk-silica/xm-gadgets.lisp
index 5fe197ee00dbfde1678204b6765d42959fd8d6a0..8bb2567653a6b1ed06950b1c1e9472d2a12698a8 100644
--- a/tk-silica/xm-gadgets.lisp
+++ b/tk-silica/xm-gadgets.lisp
@@ -18,7 +18,7 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: xm-gadgets.lisp,v 1.62 93/01/21 14:59:24 cer Exp $
+;; $fiHeader: xm-gadgets.lisp,v 1.63 93/02/08 15:58:10 cer Exp $
 
 (in-package :xm-silica)
 
@@ -698,6 +698,7 @@
 							      (parent t)
 							      (sheet motif-row-column-gadget-mixin))
   (multiple-value-bind (class initargs)
+      (call-next-method)
       (let ((x (ecase (gadget-orientation sheet)
 		 (:vertical (gadget-columns sheet))
 		 (:horizontal (gadget-rows sheet)))))
diff --git a/tk/resources.lisp b/tk/resources.lisp
index 36bffe6969af7c9e9c0fe0cbfa95b8d997fcdc38..c20cdd1fff6239497f4b68749228e4d2f60eb9b5 100644
--- a/tk/resources.lisp
+++ b/tk/resources.lisp
@@ -20,7 +20,7 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: resources.lisp,v 1.39 92/12/17 15:33:40 cer Exp $
+;; $fiHeader: resources.lisp,v 1.40 93/01/11 15:45:46 colin Exp $
 
 (in-package :tk)
 
@@ -488,6 +488,12 @@
     (:vertical 1)
     (:horizontal 2)))
 
+#+dec3100
+(defmethod convert-resource-out ((parent t) (type (eql 'xm-orientation)) value)
+  (ecase value
+    (:vertical 1)
+    (:horizontal 2)))
+
 (defmethod convert-resource-out ((parent t) (type (eql 'menu-widget)) value)
   value)
 
@@ -496,12 +502,20 @@
     (:pixmap 1)
     (:string 2)))
 
+#+:dec3100
+(defmethod convert-resource-out ((parent t) (type (eql 'xm-label-type)) value)
+  (convert-resource-out parent 'label-type value))
+
 (defmethod convert-resource-out ((parent t) (type (eql 'alignment)) value)
   (ecase value
     (:center 1)
     (:beginning 0)
     (:end 2)))
 
+#+:dec3100
+(defmethod convert-resource-out ((parent t) (type (eql 'xm-alignment)) value)
+  (convert-resource-out parent 'alignment value))
+
 (defmethod convert-resource-in ((parent t) (type (eql 'alignment)) value)
   (ecase value
     (1 :center)
diff --git a/tk/xm-font-list.lisp b/tk/xm-font-list.lisp
index 5ddbc8436c0bad9395ceb39a5c2ce7065301df4f..6dfa142fc85eb9620c8fffb4b5040c6ce7c3dd68 100644
--- a/tk/xm-font-list.lisp
+++ b/tk/xm-font-list.lisp
@@ -20,7 +20,7 @@
 ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as
 ;; applicable.
 ;;
-;; $fiHeader: xm-font-list.lisp,v 1.7 92/04/21 20:27:46 cer Exp $
+;; $fiHeader: xm-font-list.lisp,v 1.8 92/11/20 08:46:19 cer Exp $
 
 (in-package :tk)
 
@@ -40,6 +40,10 @@
 			  charset)))
     font-list))
 
+#+:dec3100
+(defmethod convert-resource-out ((parent t) (type (eql 'xm-font-list)) value)
+  (convert-resource-out parent 'font-list value))
+
 (defmethod convert-resource-in (class (type (eql 'font-list)) value)
   (declare (ignore class))
   (import-font-list value))