From 2ed1443b66369b62790a825e347ff67cd68eb803 Mon Sep 17 00:00:00 2001
From: georgej <georgej>
Date: Tue, 11 Jan 1994 23:34:54 +0000
Subject: [PATCH] see ChangeLog for Tue Jan 11 15:30:15 1994

---
 ChangeLog.n                  | 8 ++++++++
 Makefile.cobjs               | 6 +++---
 tk-silica/xt-silica.lisp     | 2 +-
 utils/excl-verification.lisp | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.n b/ChangeLog.n
index 8f361bca..cc8f3523 100644
--- a/ChangeLog.n
+++ b/ChangeLog.n
@@ -1,3 +1,11 @@
+Tue Jan 11 15:30:15 1994  George Jacob  (georgej@lava)
+
+* utils/excl-verification.lisp: Changed version to CLIM2.0
+
+* tk-silica/xt-silica.lisp: Commented out duplicate keysym definition
+
+* Makefile.cobjs: Changed the MAIN_OBJ rule to use stub files directly
+
 from colin: Mon Dec  6 21:46:54 PST 1993
 
 tk-silica/ol-silica.lisp	fixed typo
diff --git a/Makefile.cobjs b/Makefile.cobjs
index 9fe5ea2d..0a912c76 100644
--- a/Makefile.cobjs
+++ b/Makefile.cobjs
@@ -28,6 +28,6 @@ MyDrawingA.o: misc/MyDrawingA.c misc/climgccursor.c
 olsupport.o: misc/olsupport.c misc/climgccursor.c
 	$(CC) -c $(CFLAGS) $(OLINCLUDES) -o olsupport.o misc/olsupport.c
 
-$(MAIN_OBJ):
-	ld -r $(LDFLAGS) -o $(MAIN_OBJ) $(ACL_MAIN_OBJ) clim-motif.o stub-x.o \
-		$(MOTIFLIB) $(XTLIB) $(XLIB)
+$(MAIN_OBJ): stub-motif.o stub-xt.o stub-x.o $(ACL_MAIN_OBJ)
+	ld -r $(LDFLAGS) -o $(MAIN_OBJ) $(ACL_MAIN_OBJ) stub-motif.o \
+		stub-xt.o stub-x.o $(MOTIFLIB) $(XTLIB) $(XLIB)
diff --git a/tk-silica/xt-silica.lisp b/tk-silica/xt-silica.lisp
index 30047b45..bca524fd 100644
--- a/tk-silica/xt-silica.lisp
+++ b/tk-silica/xt-silica.lisp
@@ -1072,7 +1072,7 @@
 (define-xt-keysym (keysym 255 255) :rubout)
 (define-xt-keysym (keysym 255 008) :backspace)
 (define-xt-keysym (keysym 009 227) :page)
-(define-xt-keysym (keysym 255 010) :linefeed)
+;;(define-xt-keysym (keysym 255 010) :linefeed)
 (define-xt-keysym (keysym 255 027) :escape)
 ;;;---
 (define-xt-keysym (keysym 255 010) :newline)
diff --git a/utils/excl-verification.lisp b/utils/excl-verification.lisp
index 1eaaf6b3..1ace6346 100644
--- a/utils/excl-verification.lisp
+++ b/utils/excl-verification.lisp
@@ -59,7 +59,7 @@ You do not have patches ~{~S ~}"
 	   dont-have)))
 
 (defvar *clim-version* 
-    '("CLIM 2.0.beta2.0"
+    '("CLIM 2.0"
       "$fiHeader: excl-verification.lisp,v 1.16 93/04/28 17:19:31 layer Exp $"))
 
 (si::rcsnote (first *clim-version*) (second *clim-version*))
-- 
GitLab