changeset 5866:f9ac7ebf0e19

[project @ 2006-06-28 16:05:22 by jwe]
author jwe
date Wed, 28 Jun 2006 16:05:24 +0000
parents 4e6be3c306f1
children b305874f50ef
files ChangeLog doc/ChangeLog doc/interpreter/Makefile.in liboctave/ChangeLog liboctave/Makefile.in octMakefile.in scripts/audio/Makefile.in scripts/control/base/Makefile.in scripts/control/hinf/Makefile.in scripts/control/obsolete/Makefile.in scripts/control/system/Makefile.in scripts/control/util/Makefile.in scripts/deprecated/Makefile.in scripts/elfun/Makefile.in scripts/finance/Makefile.in scripts/general/Makefile.in scripts/image/Makefile.in scripts/io/Makefile.in scripts/linear-algebra/Makefile.in scripts/miscellaneous/Makefile.in scripts/optimization/Makefile.in scripts/path/Makefile.in scripts/pkg/Makefile.in scripts/plot/Makefile.in scripts/polynomial/Makefile.in scripts/quaternion/Makefile.in scripts/set/Makefile.in scripts/signal/Makefile.in scripts/sparse/Makefile.in scripts/specfun/Makefile.in scripts/special-matrix/Makefile.in scripts/startup/Makefile.in scripts/statistics/base/Makefile.in scripts/statistics/distributions/Makefile.in scripts/statistics/models/Makefile.in scripts/statistics/tests/Makefile.in scripts/strings/Makefile.in scripts/testfun/Makefile.in scripts/time/Makefile.in src/ChangeLog src/DLD-FUNCTIONS/regexp.cc src/Makefile.in src/sighandlers.cc test/ChangeLog test/Makefile.in
diffstat 45 files changed, 85 insertions(+), 53 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-27  John W. Eaton  <jwe@octave.org>
+
+	* octMakefile.in (maintainer-clean distclean): Remove
+	$(SHELL_SCRIPTS) instead of naming files individually.
+	Also remove .gdbinit.
+
 2006-06-21  John W. Eaton  <jwe@octave.org>
 
 	* examples/myfeval.c, examples/myfevalf.f, examples/myhello.c,
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-27  John W. Eaton  <jwe@octave.org>
+
+	* interpreter/Makefile.in: Elminate double-colon rules.
+
 2006-05-31  John W. Eaton  <jwe@octave.org>
 
 	* interpreter/images/Makefile.in (run-octave):
--- a/doc/interpreter/Makefile.in
+++ b/doc/interpreter/Makefile.in
@@ -133,12 +133,8 @@
 check: all
 .PHONY: check
 
-install install-strip uninstall clean mostlyclean distclean maintainer-clean::
+install install-strip: all
 	@$(subdir-for-command)
-.PHONY: install install-strip uninstall
-.PHONY: clean mostlyclean distclean maintainer-clean
-
-install install-strip:: all
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(man1dir) $(DESTDIR)$(infodir)
 	@if test -d $(DESTDIR)$(man1dir); then \
 	  for f in $(MAN_BASE); do \
@@ -177,10 +173,13 @@
 	    $(INSTALL_DATA) $(srcdir)/dir $(DESTDIR)$(infodir)/dir; \
 	  fi; \
 	fi
+.PHONY: install install-strip
 
-uninstall::
+uninstall:
+	@$(subdir-for-command)
 	rm -f $(infodir)/octave.info*
 	for f in $(MAN_BASE); do rm -f $(DESTDIR)$(man1dir)/$$f$(man1ext); done
+.PHONY: uninstall
 
 tags: $(SOURCES)
 	ctags $(SOURCES)
@@ -191,20 +190,25 @@
 spell: $(SPELL)
 .PHONY: spell
 
-mostlyclean clean::
+mostlyclean clean:
+	@$(subdir-for-command)
 	rm -f octave.cp octave.fn octave.in \
 	octave.ky octave.op octave.pg octave.rd octave.tp octave.vr \
 	octave.cps octave.fns octave.ins octave.kys octave.ops \
 	octave.pgs octave.rds octave.tps octave.vrs octave.aux \
 	octave.log octave.toc \
-	munge-texi$(BUILD_EXEEXT) munge-texi.o \
+	munge-texi$(BUILD_EXEEXT) munge-texi.o
+.PHONY: mostlyclean clean 
 
-distclean:: clean
+distclean: clean
+	@$(subdir-for-command)
 	rm -f Makefile 
+.PHONY: distclean
 
-maintainer-clean:: clean-texi
+maintainer-clean: clean-texi
 	rm -f Makefile tags TAGS $(FORMATTED)
 	rm -rf HTML
+.PHONY: maintainer-clean
 
 clean-texi:
 	rm -f $(SUB_TEXINFO)
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-27  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.in: Finish renaming of OBJECTS -> LIBOCTAVE_OBJECTS.
+
 2006-06-21  John W. Eaton  <jwe@octave.org>
 
 	* oct-shlib.cc (octave_dlopen_shlib::close,
--- a/liboctave/Makefile.in
+++ b/liboctave/Makefile.in
@@ -186,7 +186,7 @@
 all: libraries
 .PHONY: all
 
-objects: $(OBJECTS)
+objects: $(LIBOCTAVE_OBJECTS)
 
 stmp-pic: pic
 	@if [ -f stmp-pic ]; then \
@@ -309,7 +309,7 @@
 
 clean:
 	rm -f liboctave.$(LIBEXT) liboctave.$(SHLEXT_VER) liboctave.$(SHLEXT)
-	rm -f  $(OBJECTS) $(MAKEDEPS) $(LIBOCTAVE_PICOBJ) stmp-pic
+	rm -f $(LIBOCTAVE_OBJECTS) $(MAKEDEPS) $(LIBOCTAVE_PICOBJ) stmp-pic
 	-rmdir pic
 .PHONY: clean
 
--- a/octMakefile.in
+++ b/octMakefile.in
@@ -143,9 +143,9 @@
 
 maintainer-clean distclean::
 	rm -f octMakefile Makefile Makeconf Makefrag.f77 Makerules.f77
-	rm -f octave-bug octave-config mk-oct-links mkoctfile
 	rm -f config.cache config.h config.log config.status
 	rm -rf autom4te.cache
+	rm -f $(SHELL_SCRIPTS) .gdbinit
 
 maintainer-clean::
 	rm -f configure config.h.in BUGS INSTALL.OCTAVE
--- a/scripts/audio/Makefile.in
+++ b/scripts/audio/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/control/base/Makefile.in
+++ b/scripts/control/base/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/control/hinf/Makefile.in
+++ b/scripts/control/hinf/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/control/obsolete/Makefile.in
+++ b/scripts/control/obsolete/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/control/system/Makefile.in
+++ b/scripts/control/system/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/control/util/Makefile.in
+++ b/scripts/control/util/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/deprecated/Makefile.in
+++ b/scripts/deprecated/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/elfun/Makefile.in
+++ b/scripts/elfun/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/finance/Makefile.in
+++ b/scripts/finance/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/general/Makefile.in
+++ b/scripts/general/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/image/Makefile.in
+++ b/scripts/image/Makefile.in
@@ -68,7 +68,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/io/Makefile.in
+++ b/scripts/io/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/linear-algebra/Makefile.in
+++ b/scripts/linear-algebra/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/miscellaneous/Makefile.in
+++ b/scripts/miscellaneous/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/optimization/Makefile.in
+++ b/scripts/optimization/Makefile.in
@@ -57,7 +57,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/path/Makefile.in
+++ b/scripts/path/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/pkg/Makefile.in
+++ b/scripts/pkg/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/plot/Makefile.in
+++ b/scripts/plot/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/polynomial/Makefile.in
+++ b/scripts/polynomial/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/quaternion/Makefile.in
+++ b/scripts/quaternion/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/set/Makefile.in
+++ b/scripts/set/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/signal/Makefile.in
+++ b/scripts/signal/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/sparse/Makefile.in
+++ b/scripts/sparse/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/specfun/Makefile.in
+++ b/scripts/specfun/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/special-matrix/Makefile.in
+++ b/scripts/special-matrix/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/startup/Makefile.in
+++ b/scripts/startup/Makefile.in
@@ -78,7 +78,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/statistics/base/Makefile.in
+++ b/scripts/statistics/base/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/statistics/distributions/Makefile.in
+++ b/scripts/statistics/distributions/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/statistics/models/Makefile.in
+++ b/scripts/statistics/models/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/statistics/tests/Makefile.in
+++ b/scripts/statistics/tests/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/strings/Makefile.in
+++ b/scripts/strings/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/testfun/Makefile.in
+++ b/scripts/testfun/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/scripts/time/Makefile.in
+++ b/scripts/time/Makefile.in
@@ -55,7 +55,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile PKG_ADD
 .PHONY: distclean
 
 maintainer-clean: distclean
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2006-06-28  John W. Eaton  <jwe@octave.org>
+
+	* DLD-FUNCTIONS/regexp.cc (octregexp_list):
+	Avoid bug in older versions of g++.
+
+2006-06-27  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.in (clean): Also remove $(DLD_OBJ).
+
+	* sighandlers.cc (install_signal_handlers): Don't handle SIGPROF.
+	From Geoffrey Knauth <geoff@knauth.org>.
+
 2006-06-25  John W. Eaton  <jwe@octave.org>
 
 	* mk-pkg-add: Avoid apparently non-portable sed patterns.
--- a/src/DLD-FUNCTIONS/regexp.cc
+++ b/src/DLD-FUNCTIONS/regexp.cc
@@ -426,7 +426,8 @@
 
 	      idx += match[0].rm_eo;
 
-	      regexp_elem new_elem (string_vector (), t, m, te, s, e);
+	      string_vector sv;
+	      regexp_elem new_elem (sv, t, m, te, s, e);
 	      lst.push_back (new_elem);
 	      sz++;
 
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -466,7 +466,7 @@
 clean:
 	rm -f liboctinterp.$(LIBEXT)
 	rm -f liboctinterp.$(SHLEXT_VER) liboctinterp.$(SHLEXT)
-	rm -f $(OBJECTS) $(MAKEDEPS) $(DOC_FILES) $(OCT_FILES)
+	rm -f $(OBJECTS) $(DLD_OBJ) $(MAKEDEPS) $(DOC_FILES) $(OCT_FILES)
 	rm -f $(PICOBJ) $(DLD_PICOBJ) stmp-pic gendoc$(EXEEXT)
 	rm -f builtins.cc ops.cc defaults.h oct-conf.h def-files
 	rm -f PKG_ADD
--- a/src/sighandlers.cc
+++ b/src/sighandlers.cc
@@ -630,10 +630,7 @@
   octave_set_signal_handler (SIGPOLL, SIG_IGN);
 #endif
 
-#ifdef SIGPROF
-  octave_set_signal_handler (SIGPROF, generic_sig_handler);
-#endif
-
+  // SIGPROF
   // SIGPWR
 
 #ifdef SIGQUIT
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-27  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.in (distclean): Also remove test_sparse.m.
+
 2006-06-07  John W. Eaton  <jwe@octave.org>
 
 	* fntests.m: Keep track of files with tests and report total.
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -62,7 +62,7 @@
 .PHONY: mostlyclean
 
 distclean: clean
-	rm -f Makefile
+	rm -f Makefile test_sparse.m
 .PHONY: distclean
 
 maintainer-clean: distclean