Mercurial > octave-nkf

changeset 4440:0bca8443db39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2003-07-02 22:45:29 by jwe]
author jwe
date Wed, 02 Jul 2003 22:45:29 +0000
parents 64a91c8251e2
children d46651d0cd0e
files ChangeLog doc/ChangeLog doc/faq/Makefile.in glob/ChangeLog glob/Makefile.in libcruft/ChangeLog libcruft/Makefile.in libcruft/Makerules.in octMakefile.in scripts/ChangeLog scripts/Makefile.in src/ChangeLog src/toplev.cc
diffstat 13 files changed, 59 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jun 27 19:15:42 2003 +0000
+++ b/ChangeLog	Wed Jul 02 22:45:29 2003 +0000
@@ -1,3 +1,7 @@
+2003-07-02  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* octMakefile.in (distclean): remove install-octave here.
+
 2003-06-27  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* configure.in: If user doesn't specify --enable-rpath, then
--- a/doc/ChangeLog	Fri Jun 27 19:15:42 2003 +0000
+++ b/doc/ChangeLog	Wed Jul 02 22:45:29 2003 +0000
@@ -1,3 +1,8 @@
+2003-07-02  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* faq/Makefile.in (FORMATTED): Include all Octave-FAQ_*.html files
+	here, not just the toc.
+
 2003-05-14  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* interpreter/Makefile.in, doc/liboctave/Makefile.in: Handle DESTDIR.
--- a/doc/faq/Makefile.in	Fri Jun 27 19:15:42 2003 +0000
+++ b/doc/faq/Makefile.in	Wed Jul 02 22:45:29 2003 +0000
@@ -22,7 +22,7 @@
 
 TEXINFO := Octave-FAQ.texi
 
-FORMATTED := Octave-FAQ.info Octave-FAQ.dvi Octave-FAQ.ps Octave-FAQ_toc.html
+FORMATTED := Octave-FAQ.info Octave-FAQ.dvi Octave-FAQ.ps Octave-FAQ_*.html
 
 DISTFILES := Makefile.in $(TEXINFO) $(FORMATTED)
 
--- a/glob/ChangeLog	Fri Jun 27 19:15:42 2003 +0000
+++ b/glob/ChangeLog	Wed Jul 02 22:45:29 2003 +0000
@@ -1,3 +1,7 @@
+2003-07-02  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makefile.in (distclean): Also remove autom4te.cache directory.
+
 2002-10-10  Paul Kienzle <pkienzle@users.sf.net>
 
 	* configure.in: Use AH_BOTTOM to maybe define WINDOWS32.
--- a/glob/Makefile.in	Fri Jun 27 19:15:42 2003 +0000
+++ b/glob/Makefile.in	Wed Jul 02 22:45:29 2003 +0000
@@ -61,6 +61,7 @@
 distclean glob-maintainer-clean: clean
 	-rm -f TAGS tags Makefile config.status config.cache \
 	config.h config.log
+	-rm -rf autom4te.cache
 
 maintainer-clean: distclean
 	-rm -f configure
--- a/libcruft/ChangeLog	Fri Jun 27 19:15:42 2003 +0000
+++ b/libcruft/ChangeLog	Wed Jul 02 22:45:29 2003 +0000
@@ -1,3 +1,13 @@
+2003-07-02  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makerules.in (maintainer-clean, distclean): Don't use
+	dependencies on double colon rules.
+	(distclean): Also remove *.d, *.a, *.o, pic/*.o, pic, and stmp-pic.
+	(maintainer-clean): Also remove *.d, *.a, *.o, pic/*.o, pic, and
+	stmp-pic, and Makefile.
+
+	* Makefile.in (maintainer-clean, distclean): Also remove *.$(SHLEXT).
+
 2003-06-16  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* dasrt/ddasrt.f (DDASRT): Print correct message for invalid MXSTP.
--- a/libcruft/Makefile.in	Fri Jun 27 19:15:42 2003 +0000
+++ b/libcruft/Makefile.in	Wed Jul 02 22:45:29 2003 +0000
@@ -165,12 +165,12 @@
 
 distclean::
 	rm -f *.$(LIBEXT) *.o Makefile Makerules so_locations
-	if $(SHARED_LIBS); then rm -f *.$(SHLEXT_VER); fi
+	if $(SHARED_LIBS); then rm -f *.$(SHLEXT_VER) *.$(SHLEXT); fi
 
 maintainer-clean::
 	rm -f *.$(LIBEXT) *.o configure Makefile Makerules 
 	rm -f so_locations tags TAGS
-	if $(SHARED_LIBS); then rm -f *.$(SHLEXT_VER); fi
+	if $(SHARED_LIBS); then rm -f *.$(SHLEXT_VER) *.$(SHLEXT); fi
 
 dist:
 	for dir in $(DISTSUBDIRS); do mkdir ../`cat ../.fname`/libcruft/$$dir; $(MAKE) -C $$dir $@; done
--- a/libcruft/Makerules.in	Fri Jun 27 19:15:42 2003 +0000
+++ b/libcruft/Makerules.in	Wed Jul 02 22:45:29 2003 +0000
@@ -85,11 +85,18 @@
 	rm -f stmp-pic
 .PHONY: mostlyclean
 
-distclean:: clean
+distclean::
+	rm -f *.d *.a *.o pic/*.o
+	-rmdir pic
+	rm -f stmp-pic
 	rm -f Makefile
 .PHONY: distclean
 	
-maintainer-clean:: distclean
+maintainer-clean::
+	rm -f *.d *.a *.o pic/*.o
+	-rmdir pic
+	rm -f stmp-pic
+	rm -f Makefile
 	rm -f tags TAGS
 .PHONY: maintainer-clean
 
--- a/octMakefile.in	Fri Jun 27 19:15:42 2003 +0000
+++ b/octMakefile.in	Wed Jul 02 22:45:29 2003 +0000
@@ -149,10 +149,10 @@
 maintainer-clean distclean::
 	rm -f octMakefile octave-bug octave-config Makeconf config.cache \
 	config.h config.log config.status Makerules.f77 mk-oct-links \
-	mkoctfile Makefrag.f77
+	mkoctfile Makefrag.f77 install-octave
 
 maintainer-clean::
-	rm -f configure config.h.in BUGS INSTALL.OCTAVE install-octave
+	rm -f configure config.h.in BUGS INSTALL.OCTAVE
 
 # Rules for making a source distribution.
 
--- a/scripts/ChangeLog	Fri Jun 27 19:15:42 2003 +0000
+++ b/scripts/ChangeLog	Wed Jul 02 22:45:29 2003 +0000
@@ -1,3 +1,9 @@
+2003-07-02  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makefile.in (distclean, maintainer-clean): Also remove
+	gethelp$(BUILD_EXEEXT), $(DOCSTRINGS), and autom4te.cache
+	directory.
+
 2003-06-17  Aaron A. King <king@quercus.tiem.utk.edu>
 
 	* plot/hist.m: Don't forget to define n if x is a vector.
--- a/scripts/Makefile.in	Fri Jun 27 19:15:42 2003 +0000
+++ b/scripts/Makefile.in	Wed Jul 02 22:45:29 2003 +0000
@@ -80,10 +80,15 @@
 	rm -f gethelp$(BUILD_EXEEXT)
 
 distclean::
-	rm -f Makefile config.log config.status
+	rm -f gethelp$(BUILD_EXEEXT)
+	rm -f Makefile config.log config.status $(DOCSTRINGS)
+	-rm -rf autom4te.cache
 
 maintainer-clean::
-	rm -f tags TAGS configure Makefile config.log config.status
+	rm -f gethelp$(BUILD_EXEEXT)
+	rm -f Makefile config.log config.status $(DOCSTRINGS)
+	rm -f tags TAGS configure
+	-rm -rf autom4te.cache
 
 dist:
 	ln $(DISTFILES) ../`cat ../.fname`/scripts
--- a/src/ChangeLog	Fri Jun 27 19:15:42 2003 +0000
+++ b/src/ChangeLog	Wed Jul 02 22:45:29 2003 +0000
@@ -1,3 +1,8 @@
+2003-06-28  Arno J. Klaassen  <arno@heho.snv.jussieu.fr>
+
+	* toplev.cc (octave_config_info): Key for OCTAVE_CONF_DEFS should
+	be DEFS, not UGLY_DEFS.
+
 2003-06-26  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* variables.cc (symbol_exist): Distinguish between user and dld
--- a/src/toplev.cc	Fri Jun 27 19:15:42 2003 +0000
+++ b/src/toplev.cc	Wed Jul 02 22:45:29 2003 +0000
@@ -736,7 +736,7 @@
       "SH_LDFLAGS", OCTAVE_CONF_SH_LDFLAGS,
       "SONAME_FLAGS", OCTAVE_CONF_SONAME_FLAGS,
       "STATIC_LIBS", OCTAVE_CONF_STATIC_LIBS,
-      "UGLY_DEFS", OCTAVE_CONF_DEFS,
+      "DEFS", OCTAVE_CONF_DEFS,
       "UGLY_DEFS", OCTAVE_CONF_UGLY_DEFS,
       "ENABLE_DYNAMIC_LINKING", OCTAVE_CONF_ENABLE_DYNAMIC_LINKING,
       "XTRA_CFLAGS", OCTAVE_CONF_XTRA_CFLAGS,
@@ -784,7 +784,8 @@
       m ["dld"](0) = octave_value (octave_supports_dynamic_linking);
 
       int i = 0;
-      while (1)
+
+      while (true)
 	{
 	  const char *key = conf_info[i++];