Mercurial > octave-nkf
changeset 4014:8eaf7182d48a
[project @ 2002-08-01 20:55:57 by jwe]
| author | jwe |
|---|---|
| date | Thu, 01 Aug 2002 20:55:58 +0000 |
| parents | 9b99d84ded1b |
| children | 6476dd85a65f |
| files | ChangeLog Makeconf.in liboctave/ChangeLog liboctave/Makefile.in src/ChangeLog src/Makefile.in src/error.cc |
| diffstat | 7 files changed, 39 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Aug 01 20:36:15 2002 +0000 +++ b/ChangeLog Thu Aug 01 20:55:58 2002 +0000 @@ -1,3 +1,7 @@ +2002-08-01 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makeconf.in: Use $@-t instead of $@.tmp or $@.t. + 2002-07-19 John W. Eaton <jwe@bevo.che.wisc.edu> * mk-opts.pl: New file.
--- a/Makeconf.in Thu Aug 01 20:36:15 2002 +0000 +++ b/Makeconf.in Thu Aug 01 20:55:58 2002 +0000 @@ -312,8 +312,8 @@ sed \ $(DEPEND_EXTRA_SED_PATTERN) \ -e 's,^[^:]*/\(.*\.o\):,\1:,' \ - -e 's,$*\.o,pic/& & $@,g' > $@.tmp - @mv $@.tmp $@ + -e 's,$*\.o,pic/& & $@,g' > $@-t + @mv $@-t $@ # And one for .c files.too: @@ -324,8 +324,8 @@ sed \ $(DEPEND_EXTRA_SED_PATTERN) \ -e 's,^[^:]*/\(.*\.o\):,\1:,' \ - -e 's,$*\.o,pic/& & $@,g' > $@.tmp - @mv $@.tmp $@ + -e 's,$*\.o,pic/& & $@,g' > $@-t + @mv $@-t $@ define do-subdir-for-command echo making $@ in $d; cd $d; $(MAKE) $@; cd ..; @@ -418,13 +418,13 @@ -e "s;%OCTAVE_CONF_YACC%;\"${YACC}\";" \ -e "s;%OCTAVE_CONF_YFLAGS%;\"${YFLAGS}\";" \ -e "s;%OCTAVE_CONF_config_opts%;\"${config_opts}\";" | \ - sed -e "s;%OCTAVE_CONF_DEFS%;\"${UGLY_DEFS}\";" > $@.tmp -$(top_srcdir)/move-if-change $@.tmp $@ + sed -e "s;%OCTAVE_CONF_DEFS%;\"${UGLY_DEFS}\";" > $@-t +$(top_srcdir)/move-if-change $@-t $@ endef define do-subst-default-vals echo "making $@ from $<" -sed < $< > $@.tmp \ +sed < $< > $@-t \ -e "s;%OCTAVE_ARCHLIBDIR%;\"${archlibdir}\";" \ -e "s;%OCTAVE_BINDIR%;\"${bindir}\";" \ -e "s;%OCTAVE_CANONICAL_HOST_TYPE%;\"${canonical_host_type}\";" \ @@ -456,5 +456,5 @@ -e "s;%OCTAVE_OCTLIBDIR%;\"${octlibdir}\";" \ -e "s;%OCTAVE_PREFIX%;\"${prefix}\";" \ -e "s;%OCTAVE_VERSION%;\"${version}\";" -$(top_srcdir)/move-if-change $@.tmp $@ +$(top_srcdir)/move-if-change $@-t $@ endef
--- a/liboctave/ChangeLog Thu Aug 01 20:36:15 2002 +0000 +++ b/liboctave/ChangeLog Thu Aug 01 20:55:58 2002 +0000 @@ -1,3 +1,7 @@ +2002-08-01 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makefile.in: Use $@-t instead of $@.t. + 2002-07-25 John W. Eaton <jwe@bevo.che.wisc.edu> * lo-specfun.cc (gammainc): New arg, err, for scalar version.
--- a/liboctave/Makefile.in Thu Aug 01 20:36:15 2002 +0000 +++ b/liboctave/Makefile.in Thu Aug 01 20:55:58 2002 +0000 @@ -380,8 +380,8 @@ $(OPTS_INC) : %.h : %.in $(top_srcdir)/mk-opts.pl @echo making $@ from $< - @perl $(top_srcdir)/mk-opts.pl --opt-class-header $< > $@.t - @$(top_srcdir)/move-if-change $@.t $@ + @perl $(top_srcdir)/mk-opts.pl --opt-class-header $< > $@-t + @$(top_srcdir)/move-if-change $@-t $@ # If missing, GNU make attempts to create them in the reverse of the # order in which they are listed here. We rely on that fact to ensure
--- a/src/ChangeLog Thu Aug 01 20:36:15 2002 +0000 +++ b/src/ChangeLog Thu Aug 01 20:55:58 2002 +0000 @@ -1,5 +1,10 @@ 2002-08-01 John W. Eaton <jwe@bevo.che.wisc.edu> + * Makefile.in: Use $@-t instead of $@.t. + (doc-files): Use move-if-change when creating doc-files. + + * error.cc (warning): Don't print warning backtrace at top level. + * ov-cell.cc (octave_cell::print_raw): Print empty dimensions too. (octave_cell::print_name_tag): Don't print new line if cell is empty.
--- a/src/Makefile.in Thu Aug 01 20:36:15 2002 +0000 +++ b/src/Makefile.in Thu Aug 01 20:55:58 2002 +0000 @@ -24,8 +24,8 @@ %.df : %.cc @echo making $@ from $< @$(CXXCPP) $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) -DMAKE_BUILTINS $< \ - | $(srcdir)/mkdefs > $@.t - @mv $@.t $@ + | $(srcdir)/mkdefs > $@-t + @mv $@-t $@ # How to make a .oct file from a .o file: @@ -292,17 +292,18 @@ @echo VAR_FILES = $(VAR_FILES) @echo $(DEF_FILES) > def-files @echo $(VAR_FILES) > var-files - @$(srcdir)/mkbuiltins def-files var-files > $@.t - @$(top_srcdir)/move-if-change $@.t $@ + @$(srcdir)/mkbuiltins def-files var-files > $@-t + @$(top_srcdir)/move-if-change $@-t $@ DOCSTRINGS: gendoc - ./gendoc > $@.t - mv $@.t $@ + ./gendoc > $@-t + mv $@-t $@ doc-files: $(DOC_FILES) @echo making $@ @echo DOC_FILES = $(DOC_FILES) @echo $(DOC_FILES) > $@-t + @$(top_srcdir)/move-if-change $@-t $@ gendoc.cc: doc-files mkgendoc @echo making $@ @@ -314,8 +315,8 @@ ops.cc: $(OP_SRC) mkops @echo making $@ from $(OP_SRC) - @$(srcdir)/mkops $(OP_SRC) > $@.t - @$(top_srcdir)/move-if-change $@.t $@ + @$(srcdir)/mkops $(OP_SRC) > $@-t + @$(top_srcdir)/move-if-change $@-t $@ $(DEF_FILES): mkdefs defun-int.h defun-dld.h defun.h defaults.h oct-conf.h @@ -460,8 +461,8 @@ $(OPT_HANDLERS) : %.cc : $(top_srcdir)/liboctave/%.in $(top_srcdir)/mk-opts.pl @echo making $@ from $< - @perl $(top_srcdir)/mk-opts.pl --opt-handler-fcns $< > $@.t - @$(top_srcdir)/move-if-change $@.t $@ + @perl $(top_srcdir)/mk-opts.pl --opt-handler-fcns $< > $@-t + @$(top_srcdir)/move-if-change $@-t $@ parse.cc : parse.y @echo "expect 11 shift/reduce conflicts" @@ -481,8 +482,8 @@ @echo "making $@ from $<" @$(GPERF) -t -C -D -E -G -L ANSI-C \ -H octave_kw_hash -N octave_kw_lookup \ - $< | sed 's,lookup\[,gperf_lookup[,' > $@.t - @$(top_srcdir)/move-if-change $@.t $@ + $< | sed 's,lookup\[,gperf_lookup[,' > $@-t + @$(top_srcdir)/move-if-change $@-t $@ check: all .PHONY: check
--- a/src/error.cc Thu Aug 01 20:36:15 2002 +0000 +++ b/src/error.cc Thu Aug 01 20:55:58 2002 +0000 @@ -352,7 +352,9 @@ { if (Vwarning_option != "off") { - if (Vwarning_option == "backtrace" && ! warning_state) + if (curr_sym_tab != top_level_sym_tab + && Vwarning_option == "backtrace" + && ! warning_state) pr_where ("warning"); va_list args;