Mercurial > hg > octave-lyh
changeset 6798:18b7ab1ad68b
[project @ 2007-07-25 19:23:26 by jwe]
author | jwe |
---|---|
date | Wed, 25 Jul 2007 19:23:57 +0000 |
parents | 5b00586ccd27 |
children | d91d4062281d |
files | dlfcn/Makefile.in doc/ChangeLog doc/faq/Makefile.in doc/interpreter/Makefile.in doc/liboctave/Makefile.in octMakefile.in src/ChangeLog src/pt-bp.h |
diffstat | 8 files changed, 33 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/dlfcn/Makefile.in +++ b/dlfcn/Makefile.in @@ -26,7 +26,7 @@ MAKEDEPS := $(SOURCES:.c=.d) -DISTFILES := $(addprefix $srcdir)/, $(SOURCES) $(INCLUDES) README dl.exp Makefile.in ftp-site) +DISTFILES := $(addprefix $(srcdir)/, $(SOURCES) $(INCLUDES) README dl.exp Makefile.in ftp-site) all: libdlfcn.a .PHONY: all
--- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2007-07-25 John W. Eaton <jwe@octave.org> + + * interpreter/Makefile.in (run-octave): Don't set DISPLAY. + 2007-07-25 David Bateman <dbateman@free.fr> * Makefile.in, faq/Makefile.in, interpreter/Makwfile.in,
--- a/doc/faq/Makefile.in +++ b/doc/faq/Makefile.in @@ -24,7 +24,7 @@ FORMATTED := Octave-FAQ.info Octave-FAQ.dvi Octave-FAQ.ps Octave-FAQ.pdf -DISTFILES := $(addprefix $srcdir)/, Makefile.in $(TEXINFO) $(FORMATTED)) +DISTFILES := $(addprefix $(srcdir)/, Makefile.in $(TEXINFO) $(FORMATTED)) DISTDIRS := HTML @@ -86,5 +86,8 @@ dist: all ln $(DISTFILES) ../../`cat ../../.fname`/doc/faq - for dir in $(DISTDIRS); do ln ../../doc/faq/$$dir ../../`cat ../../.fname`/doc/faq/$$dir; done + for dir in $(DISTDIRS); do \ + mkdir ../../`cat ../../.fname`/doc/faq/$$dir; \ + ln ../../doc/faq/$$dir/* ../../`cat ../../.fname`/doc/faq/$$dir; \ + done .PHONY: dist
--- a/doc/interpreter/Makefile.in +++ b/doc/interpreter/Makefile.in @@ -97,8 +97,9 @@ MAN_SRC := $(addsuffix .1, $(MAN_BASE)) # FIXME -- need to include generated figures here... -DISTFILES = $(addprefix $(srcdir)/, Makefile.in contributors.in mkcontrib.awk dir \ - munge-texi.cc $(MAN_SRC) $(SOURCES) $(TEXINFO_SOURCE)) $(FORMATTED) $(IMAGES) +DISTFILES = $(addprefix $(srcdir)/, Makefile.in contributors.in \ + mkcontrib.awk dir munge-texi.cc $(MAN_SRC) $(SOURCES) $(MAIN_TEXINFO)) \ + $(SUB_TEXINFO) contributors.texi $(FORMATTED) $(IMAGES) DISTDIRS = HTML @@ -202,12 +203,10 @@ fi cp $(filter-out html-dir, $<) HTML -## Unset DISPLAY here to avoid problems with the -title option for -## gnuplot (it doesn't work if we are calling pgnuplot). Sleep for -## a second to allow gnuplot to finish writing its output before -## Octave exits. +## Sleep for a second after plotting to allow gnuplot to finish +## writing its output before Octave exits. define run-octave - DISPLAY= $(TOPDIR)/run-octave -f -q -H -p $(srcdir) \ + $(TOPDIR)/run-octave -f -q -H -p $(srcdir) \ --eval "$(notdir $(basename $<)) ('$(notdir $(basename $@))', '$(patsubst .%,%, $(suffix $@))'); sleep (1);" endef @@ -306,6 +305,9 @@ dist: clean-texi all ln $(DISTFILES) ../../`cat ../../.fname`/doc/interpreter - for dir in $(DISTDIRS); do ln ../../doc/interpreter/$$dir ../../`cat ../../.fname`/doc/interpreter/$$dir; done + for dir in $(DISTDIRS); do \ + mkdir ../../`cat ../../.fname`/doc/interpreter/$$dir; \ + ln ../../doc/interpreter/$$dir/* ../../`cat ../../.fname`/doc/interpreter/$$dir; \ + done for dir in $(DISTSUBDIRS); do mkdir ../../`cat ../../.fname`/doc/interpreter/$$dir; $(MAKE) -C $$dir $@; done .PHONY: dist
--- a/doc/liboctave/Makefile.in +++ b/doc/liboctave/Makefile.in @@ -105,5 +105,8 @@ dist: all ln $(DISTFILES) ../../`cat ../../.fname`/doc/liboctave - for dir in $(DISTDIRS); do ln ../../doc/liboctave/$$dir ../../`cat ../../.fname`/doc/liboctave/$$dir; done + for dir in $(DISTDIRS); do \ + mkdir ../../`cat ../../.fname`/doc/liboctave/$$dir; \ + ln ../../doc/liboctave/$$dir/* ../../`cat ../../.fname`/doc/liboctave/$$dir; \ + done .PHONY: dist
--- a/octMakefile.in +++ b/octMakefile.in @@ -174,7 +174,7 @@ echo octave-$(version) > .fname rm -rf `cat .fname` mkdir `cat .fname` - ln $(addprefix, $(srcdir)/, $(DISTFILES)) `cat .fname` + ln $(addprefix $(srcdir)/, $(DISTFILES)) `cat .fname` ln $(BUILT_DISTFILES) `cat .fname` for dir in $(DISTSUBDIRS); do \ mkdir `cat .fname`/$$dir; \
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2007-07-25 John W. Eaton <jwe@octave.org> + + * pt-bp.h (MAYBE_DO_BREAKPOINT): Rename fcn to curr_fcn. + 2007-07-25 David Bateman <dbateman@free.fr> * Makefile.in: Adjust DISTFILES to allow out of tree "make dist"
--- a/src/pt-bp.h +++ b/src/pt-bp.h @@ -160,12 +160,12 @@ #define MAYBE_DO_BREAKPOINT \ do \ { \ - octave_function *fcn = octave_call_stack::current (); \ + octave_function *curr_fcn = octave_call_stack::current (); \ \ if (octave_debug_on_interrupt_state \ || (tree::break_next && tree::last_line == 0) \ || (tree::break_next \ - && fcn == tree::break_function \ + && curr_fcn == tree::break_function \ && tree::last_line != line ()) \ || is_breakpoint ()) \ { \ @@ -173,8 +173,8 @@ \ tree::break_next = false; \ \ - if (fcn) \ - octave_stdout << fcn->name () << ": "; \ + if (curr_fcn) \ + octave_stdout << curr_fcn->name () << ": "; \ \ octave_stdout << "line " << line () << ", " \ << "column " << column () \