# HG changeset patch # User jwe # Date 1057185929 0 # Node ID 0bca8443db393d4cf6ba20835b5fe28e7a3e48e6 # Parent 64a91c8251e25d62d3677da3b0768fe749e2f85a [project @ 2003-07-02 22:45:29 by jwe] diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-07-02 John W. Eaton + + * octMakefile.in (distclean): remove install-octave here. + 2003-06-27 John W. Eaton * configure.in: If user doesn't specify --enable-rpath, then diff --git a/doc/ChangeLog b/doc/ChangeLog --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2003-07-02 John W. Eaton + + * faq/Makefile.in (FORMATTED): Include all Octave-FAQ_*.html files + here, not just the toc. + 2003-05-14 John W. Eaton * interpreter/Makefile.in, doc/liboctave/Makefile.in: Handle DESTDIR. diff --git a/doc/faq/Makefile.in b/doc/faq/Makefile.in --- a/doc/faq/Makefile.in +++ b/doc/faq/Makefile.in @@ -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) diff --git a/glob/ChangeLog b/glob/ChangeLog --- a/glob/ChangeLog +++ b/glob/ChangeLog @@ -1,3 +1,7 @@ +2003-07-02 John W. Eaton + + * Makefile.in (distclean): Also remove autom4te.cache directory. + 2002-10-10 Paul Kienzle * configure.in: Use AH_BOTTOM to maybe define WINDOWS32. diff --git a/glob/Makefile.in b/glob/Makefile.in --- a/glob/Makefile.in +++ b/glob/Makefile.in @@ -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 diff --git a/libcruft/ChangeLog b/libcruft/ChangeLog --- a/libcruft/ChangeLog +++ b/libcruft/ChangeLog @@ -1,3 +1,13 @@ +2003-07-02 John W. Eaton + + * 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 * dasrt/ddasrt.f (DDASRT): Print correct message for invalid MXSTP. diff --git a/libcruft/Makefile.in b/libcruft/Makefile.in --- a/libcruft/Makefile.in +++ b/libcruft/Makefile.in @@ -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 diff --git a/libcruft/Makerules.in b/libcruft/Makerules.in --- a/libcruft/Makerules.in +++ b/libcruft/Makerules.in @@ -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 diff --git a/octMakefile.in b/octMakefile.in --- a/octMakefile.in +++ b/octMakefile.in @@ -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. diff --git a/scripts/ChangeLog b/scripts/ChangeLog --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,9 @@ +2003-07-02 John W. Eaton + + * Makefile.in (distclean, maintainer-clean): Also remove + gethelp$(BUILD_EXEEXT), $(DOCSTRINGS), and autom4te.cache + directory. + 2003-06-17 Aaron A. King * plot/hist.m: Don't forget to define n if x is a vector. diff --git a/scripts/Makefile.in b/scripts/Makefile.in --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -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 diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2003-06-28 Arno J. Klaassen + + * toplev.cc (octave_config_info): Key for OCTAVE_CONF_DEFS should + be DEFS, not UGLY_DEFS. + 2003-06-26 John W. Eaton * variables.cc (symbol_exist): Distinguish between user and dld diff --git a/src/toplev.cc b/src/toplev.cc --- a/src/toplev.cc +++ b/src/toplev.cc @@ -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++];