diff --git a/ChangeLog.n b/ChangeLog.n index cd4179e4aae3bc22d768a6d2ffc634301f0b3164..3e67b46b9aea1fb189c5cb8f4e02ad9fd85c6cbb 100644 --- a/ChangeLog.n +++ b/ChangeLog.n @@ -10,6 +10,14 @@ If there are user-visible changes in this commit, then list the <standard changelog date stamp> * <changes go here...> +******************************************************************************* +2.2.2.17 + +2000-07-06 Kevin Layer <layer@ultra> + + * Makefile.generic: fix make clean to not die of no .out files + * Makefile.hpprism: make sure motif 1.2 is used + ******************************************************************************* 2.2.2.16 diff --git a/Makefile.generic b/Makefile.generic index ccd79d2ff4e8faee144268f6343bf6f932d1ec93..b7a27fad33f89bfb8c4b133d0a85b91bb2a09e31 100644 --- a/Makefile.generic +++ b/Makefile.generic @@ -1,4 +1,4 @@ -# $Id: Makefile.generic,v 1.51 2000/06/27 05:23:20 layer Exp $ +# $Id: Makefile.generic,v 1.52 2000/07/06 20:43:09 layer Exp $ # Makefile.generic for CLIM 2.0 all: compile cat # $(CLIM) @@ -176,7 +176,7 @@ cleanfasls: FORCE find . -name '*.fasl' -print | xargs rm -f clean: - rm *.out + rm -f *.out find . -name '*.fasl' -print | xargs rm -f rm -f *.o *.$(SHARED_EXT) *.a slim \ stub-motif.c stub-olit.c stub-xt.c stub-x.c stub-wnn.c diff --git a/Makefile.hpprism b/Makefile.hpprism index 4d94004dc6900e64056966e9de5d97b330d9620f..f0e10d736e2fece59155be2c1b5126fe46c707d3 100644 --- a/Makefile.hpprism +++ b/Makefile.hpprism @@ -1,4 +1,4 @@ -# $Header: /repo/cvs.copy/clim2/Makefile.hpprism,v 1.16 1999/02/25 08:23:21 layer Exp $ +# $Header: /repo/cvs.copy/clim2/Makefile.hpprism,v 1.17 2000/07/06 20:43:09 layer Exp $ # # Makefile.hpprism for CLIM 2.0 # @@ -20,7 +20,8 @@ SET_LIBRARY_PATH = \ STD_DEFINES = -DSYSV AR = ar clq -TKLIB=-lXm +#TKLIB=-lXm +TKLIB=/lib/libXm.3 XTLIB=-lXt XLIB=-lX11 diff --git a/utils/packages.lisp b/utils/packages.lisp index c447aaf3f5eb6f1b5f3dbd9db4972d9e3074a59e..25af39527a9af47785aecaf87da91bd40d7fe10e 100644 --- a/utils/packages.lisp +++ b/utils/packages.lisp @@ -16,7 +16,7 @@ ;; Commercial Software developed at private expense as specified in ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable. ;; -;; $Id: packages.lisp,v 1.101 2000/06/27 05:23:21 layer Exp $ +;; $Id: packages.lisp,v 1.102 2000/07/06 20:43:10 layer Exp $ (in-package :common-lisp-user) @@ -3295,7 +3295,7 @@ (cl:defvar *clim-major-version* 2) (cl:defvar *clim-minor-version* 2) (cl:defvar *clim-generation-version* 2) -(cl:defvar *clim-build-version* 16) +(cl:defvar *clim-build-version* 17) (cl:defparameter *clim-version* (cl:format () "~d.~d.~d.~a"