Mercurial > hg > octave-nkf
changeset 5527:ce71ed4c6da6
[project @ 2005-11-01 22:15:49 by jwe]
author | jwe |
---|---|
date | Tue, 01 Nov 2005 22:15:49 +0000 |
parents | 8c56849b1509 |
children | 480035e1c2b0 |
files | ChangeLog doc/ChangeLog doc/faq/Makefile.in doc/liboctave/Makefile.in examples/Makefile.in liboctave/ChangeLog liboctave/Makefile.in octMakefile.in scripts/ChangeLog scripts/Makefile.in src/ChangeLog src/DLD-FUNCTIONS/spchol.cc src/Makefile.in |
diffstat | 13 files changed, 65 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2005-11-01 John W. Eaton <jwe@octave.org> + + * examples/Makefile.in (distclean, maintainer-clean): + Also remove octave.desktop. + From Quentin Spencer <qspencer@ieee.org>. + +2005-11-01 Quentin Spencer <qspencer@ieee.org> + + * octMakefile.in (CONF_DISTFILES): Delete acx_include_dirs.m4 from + the list. + 2005-10-28 John W. Eaton <jwe@octave.org> * configure.in (AC_ARG_WITH(cholmod, ...)): Fix typo.
--- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,9 @@ +2005-11-01 John W. Eaton <jwe@octave.org> + + * liboctave/Makefile.in (maintainer-clean): Also remove liboctave.pdf + * faq/Makefile.in (maintainer-clean): Also remove Octave-FAQ.pdf. + From Quentin Spencer <qspencer@ieee.org>. + 2005-10-23 David Bateman <dbateman@free.fr> * sparse.txi: Updates for new ufsparse licensing, new functions and
--- a/doc/faq/Makefile.in +++ b/doc/faq/Makefile.in @@ -77,7 +77,7 @@ maintainer-clean: distclean rm -f tags TAGS Octave-FAQ.info Octave-FAQ.info-* - rm -f Octave-FAQ.dvi Octave-FAQ.ps + rm -f Octave-FAQ.dvi Octave-FAQ.ps Octave-FAQ.pdf rm -rf HTML .PHONY: maintainer-clean
--- a/doc/liboctave/Makefile.in +++ b/doc/liboctave/Makefile.in @@ -93,7 +93,7 @@ maintainer-clean: distclean rm -f tags TAGS liboctave.info liboctave.info-* - rm -f liboctave.dvi liboctave.ps + rm -f liboctave.dvi liboctave.ps liboctave.pdf rm -rf HTML .PHONY: maintainer-clean
--- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -73,7 +73,7 @@ .PHONY: distclean maintainer-clean: distclean - rm -f tags TAGS + rm -f tags TAGS octave.desktop .PHONY: maintainer-clean dist:
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,8 @@ +2005-11-01 John W. Eaton <jwe@octave.org> + + * Makefile.in (distclean): Also remove oct-types.h. + From Quentin Spencer <qspencer@ieee.org>. + 2005-10-31 David Bateman <dbateman@free.fr> * dSparse.cc, CSparse.cc: Use C++ true/false instead of
--- a/liboctave/Makefile.in +++ b/liboctave/Makefile.in @@ -310,7 +310,7 @@ .PHONY: mostlyclean distclean: clean - rm -f Makefile so_locations stamp-prereq $(OPTS_INC) + rm -f Makefile so_locations stamp-prereq oct-types.h $(OPTS_INC) rm -f mx-ops.h $(MX_OP_INC) $(VX_OP_INC) $(MX_OP_SRC) $(VX_OP_SRC) rm -f $(SPARSE_MX_OP_INC) $(SPARSE_MX_OP_SRC) .PHONY: distclean
--- a/octMakefile.in +++ b/octMakefile.in @@ -21,8 +21,7 @@ CONF_DISTFILES = Makefile Makefile.in octMakefile.in Makeconf.in \ configure configure.in config.guess config.sub aclocal.m4 \ - acx_blas.m4 acx_lapack.m4 acx_include_dirs.m4 config.h.in \ - install-sh autogen.sh + acx_blas.m4 acx_lapack.m4 config.h.in install-sh autogen.sh DISTFILES = $(CONF_DISTFILES) \ BUGS COPYING FLEX.patch INSTALL INSTALL.OCTAVE NEWS \
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,9 @@ +2005-11-01 John W. Eaton <jwe@octave.org> + + * Makefile.in (distclean, maintainer-clean): + Also remove autom4te.cache directory. + From Quentin Spencer <qspencer@ieee.org>. + 2005-10-28 John W. Eaton <jwe@octave.org> * general/shiftdim.m: Compatibility fix for row vectors.
--- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -79,6 +79,7 @@ distclean maintainer-clean:: rm -f Makefile config.log config.status DOCSTRINGS + rm -rf autom4te.cache maintainer-clean:: rm -f tags TAGS configure
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,15 @@ +2005-11-01 John W. Eaton <jwe@octave.org> + + * Makefile.in (oct-gperf.h): Avoid extra temporary file. + (distclean): Delete oct-errno.cc here. + From Quentin Spencer <qspencer@ieee.org>. + +2005-11-01 Quentin Spencer <qspencer@ieee.org> + + * DLD-FUNCTIONS/spchol.cc: Use C++ true/false instead of + preprocessor defined TRUE/FALSE. + * Makefile.in (DISTFILES): Add mk-errno-list to the list. + 2005-10-30 John W. Eaton <jwe@octave.org> * DLD-FUNCTIONS/gplot.l (gnuplot::set_gnuplot_exe,
--- a/src/DLD-FUNCTIONS/spchol.cc +++ b/src/DLD-FUNCTIONS/spchol.cc @@ -437,8 +437,8 @@ double dummy; cholmod_sparse Astore; cholmod_sparse *A = &Astore; - A->packed = TRUE; - A->sorted = TRUE; + A->packed = true; + A->sorted = true; A->nz = NULL; #ifdef IDX_TYPE_LONG A->itype = CHOLMOD_LONG; @@ -478,7 +478,7 @@ else gripe_wrong_type_arg ("symbfact", arg(0)); - octave_idx_type coletree = FALSE; + octave_idx_type coletree = false; octave_idx_type n = A->nrow; if (nargin > 1) @@ -491,7 +491,7 @@ else if (ch == 'c') { n = A->ncol; - coletree = TRUE; + coletree = true; A->stype = 0; } else if (ch == 's') @@ -600,7 +600,7 @@ W [j] = L.xcidx(j); // get workspace for computing one row of L - cholmod_sparse *R = cholmod_allocate_sparse (n, 1, n, FALSE, TRUE, + cholmod_sparse *R = cholmod_allocate_sparse (n, 1, n, false, true, 0, CHOLMOD_PATTERN, cm); octave_idx_type *Rp = static_cast<octave_idx_type *>(R->p); octave_idx_type *Ri = static_cast<octave_idx_type *>(R->i);
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -253,7 +253,7 @@ $(COLAMD_LIBS) $(CCOLAMD_LIBS) $(BLAS_LIBS) $(FFTW_LIBS) $(LIBS) $(FLIBS) DISTFILES = Makefile.in ChangeLog mkdefs mkops mkgendoc \ - DOCSTRINGS mkbuiltins mk-oct-links \ + DOCSTRINGS mkbuiltins mk-errno-list mk-oct-links \ defaults.h.in oct-conf.h.in oct-errno.cc.in octave.gperf oct-gperf.h \ octave.cc parse.cc lex.cc y.tab.h gplot.cc \ $(INCLUDES) $(DIST_SRC) $(OPT_HANDLERS) $(EXTRAS) @@ -350,8 +350,8 @@ PKG_ADD: $(DLD_SRC) $(SED) -n -e 's,^//* *PKG_ADD: *,,p' \ -e 's,^/\* *PKG_ADD: *\(.*\) \*/$$,\1,p' \ - $(addprefix $(srcdir)/, $(DLD_SRC)) > PKG_ADD.t - mv PKG_ADD.t PKG_ADD + $(addprefix $(srcdir)/, $(DLD_SRC)) > PKG_ADD-t + mv PKG_ADD-t PKG_ADD DOCSTRINGS: gendoc$(BUILD_EXEEXT) ./gendoc > $@-t @@ -490,7 +490,7 @@ .PHONY: mostlyclean distclean: clean - rm -f Makefile octave$(EXEEXT) .fname so_locations + rm -f Makefile octave$(EXEEXT) .fname so_locations oct-errno.cc rm -f stamp-prereq stamp-liboctave-prereq stamp-oct-links rm -f doc-files gendoc.cc DOCSTRINGS .PHONY: distclean @@ -548,25 +548,25 @@ oct-errno.cc: oct-errno.cc.in ../Makeconf Makefile @echo "making $@ from $<" @if test -n "$(PERL)"; then \ - $(srcdir)/mk-errno-list --perl "$(PERL)" < $< > $@.t; \ + $(srcdir)/mk-errno-list --perl "$(PERL)" < $< > $@-t; \ elif test -n "$(PYTHON)"; then \ - $(srcdir)/mk-errno-list --python "$(PYTHON)" < $< > $@.t; \ + $(srcdir)/mk-errno-list --python "$(PYTHON)" < $< > $@-t; \ else \ - $(SED) '/@SYSDEP_ERRNO_LIST@/D' $< > $@.t; \ + $(SED) '/@SYSDEP_ERRNO_LIST@/D' $< > $@-t; \ fi - @if [ -s $@.t ]; then \ - $(top_srcdir)/move-if-change $@.t $@; \ + @if [ -s $@-t ]; then \ + $(top_srcdir)/move-if-change $@-t $@; \ else \ exit 1; \ fi oct-gperf.h: octave.gperf @echo "making $@ from $<" - @$(GPERF) -t -C -D -G -L C++ -Z octave_kw_hash $< > $@-t1 \ - || (rm -f $@-t1; exit 1) - @$(SED) 's,lookup\[,gperf_lookup[,' $@-t1 > $@-t2 || rm -f $@-t2 - @if [ -s $@-t2 ]; then \ - $(top_srcdir)/move-if-change $@-t2 $@; \ + @$(GPERF) -t -C -D -G -L C++ -Z octave_kw_hash $< | \ + $(SED) 's,lookup\[,gperf_lookup[,' > $@-t \ + || (rm -f $@-t; exit 1) + @if [ -s $@-t ]; then \ + $(top_srcdir)/move-if-change $@-t $@; \ else \ exit 1; \ fi