diff --git a/ChangeLog.n b/ChangeLog.n index 4fc78c54e473444a6f81593a2ef96624491e24c6..baf56ffc69be95da426ebf3fb02b8db76073c124 100644 --- a/ChangeLog.n +++ b/ChangeLog.n @@ -4,13 +4,23 @@ For more detailed instructions on filling in the ChangeLog form, see <version for this commit, if applicable> Documentation changes: <`none' or give pointer to them> -Bootstrapping needed: <`none' or give pointer to instructions> Tests for new features: <`no new features', `no tests for new features', or give pointer to test files> <standard changelog date stamp> * <changes go here...> +******************************************************************************* +Documentation changes: none +Tests for new features: no new features + +Fri May 30 10:54:31 1997 Kevin Layer <layer@ultra> + + * Makefile.defs: use lispi and dcli.dxl, by default + * Makefile.generic: parameterize libwnn.a + * Makefile.wnn: add rule for wnn.so + * wnn/load-wnn.lisp: allow dynamic loading of wnn.so + ******************************************************************************* Fri May 23 20:28:44 PDT 1997 Tom McClure <tomj@romeo> diff --git a/Makefile.defs b/Makefile.defs index 950c48cc2ead29eb0850e6d915666cfd6a8da85e..76277833f5ddaa72648837c60fce19c14d2c8a75 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1,9 +1,10 @@ -# $Header: /repo/cvs.copy/clim2/Makefile.defs,v 1.40 1997/05/05 22:35:16 layer Exp $ +# $Header: /repo/cvs.copy/clim2/Makefile.defs,v 1.41 1997/05/30 17:56:31 layer Exp $ # # Makefile.defs for CLIM 2.0 # -CL = ../src/lisp -I ../src/dcl.dxl +#CL = ../src/lisp -I ../src/dcl.dxl +CL = ../src/lispi -I ../src/dcli.dxl CLOPTS = -qq -batch -backtrace-on-error DEVICE = /dev/null diff --git a/Makefile.generic b/Makefile.generic index 947a5a04bc60b07c0102753b6d15b0fcb31085f6..31c00b93ef43e524aaf7005a626ef11182584ab0 100644 --- a/Makefile.generic +++ b/Makefile.generic @@ -1,4 +1,4 @@ -# $Header: /repo/cvs.copy/clim2/Makefile.generic,v 1.40 1997/05/05 22:35:16 layer Exp $ +# $Header: /repo/cvs.copy/clim2/Makefile.generic,v 1.41 1997/05/30 17:56:31 layer Exp $ # # Makefile.generic for CLIM 2.0 # @@ -264,7 +264,7 @@ xm-dcl : stub-x.o stub-xt.o stub-motif.o \ /bin/mv dcl.climsave dcl ; /bin/mv ucl.climsave ucl; $(RESTEXP) xm-dcli : stub-x.o stub-xt.o stub-motif.o stub-wnn.o \ - xlibsupport.o xtsupport.o xmsupport.o libwnn.a + xlibsupport.o xtsupport.o xmsupport.o $(WNNLIB) cd $(CL_SRC) ; \ /bin/mv dcli dcli.climsave ; /bin/mv ucli ucli.climsave ; $(SAVEEXPI) ; \ make initial_oldspace=$(OLDSPACE) oldspace=$(OLDSPACE) \ @@ -273,7 +273,7 @@ xm-dcli : stub-x.o stub-xt.o stub-motif.o stub-wnn.o \ $(PWD)/stub-wnn.o \ $(PWD)/xlibsupport.o $(PWD)/xmsupport.o $(PWD)/xtsupport.o \ $(CL_SRC)/code/excldep.o $(CL_SRC)/code/socket.o \ - $(TKLIB) $(XTLIB) $(XLIB) $(PWD)/libwnn.a $(MOTIFXTRAS)' dcli ;\ + $(TKLIB) $(XTLIB) $(XLIB) $(PWD)/$(WNNLIB) $(MOTIFXTRAS)' dcli ;\ /bin/mv dcli xm-dcli ; /bin/mv ucli ucli.clim ;\ /bin/mv dcli.climsave dcli ; /bin/mv ucli.climsave ucli; $(RESTEXPI) diff --git a/Makefile.wnn b/Makefile.wnn index 2b1ea47962483f7f73344ebcc4c732f7f18a08fa..9bac0c0a31070a5f91633a9533153bbc107460df 100644 --- a/Makefile.wnn +++ b/Makefile.wnn @@ -1,4 +1,4 @@ -# $Header: /repo/cvs.copy/clim2/Makefile.wnn,v 1.2 1997/02/05 01:42:18 tomj Exp $ +# $Header: /repo/cvs.copy/clim2/Makefile.wnn,v 1.3 1997/05/30 17:56:31 layer Exp $ # # Makefile.wnn for CLIM 2.0 # @@ -70,3 +70,5 @@ rk_vars.o : wnn/rk_vars.c libwnn.a: $(WNN_OBJS) $(AR) $@ $(WNN_OBJS) +wnn.so: $(WNN_OBJS) + $(MAKE_SHARED) $(SHAREFLAGS) -o wnn.so $(WNN_OBJS) diff --git a/wnn/load-wnn.lisp b/wnn/load-wnn.lisp index a3613297ee4893fdab2306e1d06e67c05eaf1ab5..9aabf97b02552de747fdfe33dc8862d2bd9d42b8 100644 --- a/wnn/load-wnn.lisp +++ b/wnn/load-wnn.lisp @@ -18,7 +18,7 @@ ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as ;; applicable. ;; -;; $Header: /repo/cvs.copy/clim2/wnn/load-wnn.lisp,v 1.5 1997/02/05 01:55:45 tomj Exp $ +;; $Header: /repo/cvs.copy/clim2/wnn/load-wnn.lisp,v 1.6 1997/05/30 17:56:33 layer Exp $ (in-package :user) @@ -39,8 +39,7 @@ #+dlfcn (unless (ff:get-entry-point (ff:convert-to-lang "jl_open_lang")) - (cerror "Continue without wnn" - "Can't load Wnn/jlib dynamically - need to rebuild Lisp")) + (load "clim2:;wnn.so")) (provide :wnn) (pushnew :wnn *features*)