diff --git a/ChangeLog.n b/ChangeLog.n index 8f361bca2604471b9c628b5c84a11ee131b89c27..cc8f352352c0b85106b72425c5200ff86f2644c2 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 9fe5ea2d08c420ca970eba2f873a4ff607543f9b..0a912c76c1db1fffb08039d3b9ae562d72e71a5a 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 30047b4570f3af6342cbcbb06e2a95fd215f36f5..bca524fde6961f555c43b7f21d4c08ba83c08d9b 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 1eaaf6b3882f4456affa4c71e80af4920e3dd4a7..1ace63464c3c0b4264a22b43b8bb63b28f04fdb1 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*))