Mercurial > octave
changeset 8873:e258715b2e78
fixes for clean targets in Makefiles
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 25 Feb 2009 15:34:23 -0500 |
| parents | 0d7ebf353400 |
| children | bd1b1fe9c6e9 |
| files | doc/ChangeLog doc/Makefile.in doc/interpreter/Makefile.in libcruft/ChangeLog libcruft/Makefile.in libcruft/Makerules.in liboctave/ChangeLog liboctave/Makefile.in scripts/ChangeLog scripts/Makefile.in src/ChangeLog src/Makefile.in |
| diffstat | 12 files changed, 46 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/ChangeLog Wed Feb 25 13:01:35 2009 -0500 +++ b/doc/ChangeLog Wed Feb 25 15:34:23 2009 -0500 @@ -1,3 +1,13 @@ +2009-02-25 John W. Eaton <jwe@octave.org> + + * interpreter/Makefile.in (distclean): Remove tags and TAGS here + instead of in maintainer-clean target. + (maintainer-clean): Depend on distclean, not clean. Remove DOC. + (DISTFILES): Add stmp-html to the list. + + * Makefile.in: Remove conf.texi in maintainer-clean target but not + distclean target. + 2009-02-24 Jaroslav Hajek <highegg@gmail.com> * interpreter/diagperm.txi: Remove redundant url references.
--- a/doc/Makefile.in Wed Feb 25 13:01:35 2009 -0500 +++ b/doc/Makefile.in Wed Feb 25 15:34:23 2009 -0500 @@ -67,11 +67,11 @@ TAGS:: $(SOURCES) etags $(SOURCES) -distclean:: - rm -f Makefile +distclean maintainer-clean:: + rm -f tags TAGS Makefile maintainer-clean:: - rm -f tags TAGS Makefile + rm -f conf.texi dist: conf.texi ln $(DISTFILES) ../`cat ../.fname`/doc
--- a/doc/interpreter/Makefile.in Wed Feb 25 13:01:35 2009 -0500 +++ b/doc/interpreter/Makefile.in Wed Feb 25 15:34:23 2009 -0500 @@ -150,7 +150,7 @@ DISTFILES = $(addprefix $(srcdir)/, Makefile.in contributors.in \ mkcontrib.awk dir munge-texi.cc $(MAN_SRC) $(SOURCES) $(MAIN_TEXINFO)) \ $(SUB_TEXINFO) contributors.texi $(FORMATTED) $(IMAGES) mk_doc_cache.m \ - DOC + DOC stmp-html DISTDIRS = HTML @@ -372,11 +372,11 @@ distclean: clean @$(subdir-for-command) - rm -f Makefile + rm -f tags TAGS Makefile .PHONY: distclean -maintainer-clean: clean clean-texi - rm -f Makefile tags TAGS $(FORMATTED) $(IMAGES) +maintainer-clean: distclean clean-texi + rm -f DOC stmp-html $(FORMATTED) $(IMAGES) rm -rf HTML .PHONY: maintainer-clean
--- a/libcruft/ChangeLog Wed Feb 25 13:01:35 2009 -0500 +++ b/libcruft/ChangeLog Wed Feb 25 15:34:23 2009 -0500 @@ -1,3 +1,9 @@ +2009-02-25 John W. Eaton <jwe@octave.org> + + * Makefile.in (maintainer-clean): Also remove libraries. + + * Makerules.in: Make maintainer-clean and distclean the same. + 2009-02-23 Jaroslav Hajek <highegg@gmail.com> * misc/quit.h (octave_signal_caught): Declare as volatile.
--- a/libcruft/Makefile.in Wed Feb 25 13:01:35 2009 -0500 +++ b/libcruft/Makefile.in Wed Feb 25 15:34:23 2009 -0500 @@ -186,7 +186,7 @@ TAGS:: $(SOURCES) etags $(SOURCES) -clean mostlyclean distclean:: +clean mostlyclean distclean maintainer-clean:: rm -f $(LIBPRE)cruft.$(LIBEXT) rm -f $(SHLLIBPRE)cruft.$(SHLEXT_VER) $(SHLLIBPRE)cruft.$(SHLEXT) rm -f $(SHLBINPRE)cruft.$(SHLBIN_VER) $(SHLBINPRE)cruft.$(SHLBIN)
--- a/libcruft/Makerules.in Wed Feb 25 13:01:35 2009 -0500 +++ b/libcruft/Makerules.in Wed Feb 25 15:34:23 2009 -0500 @@ -137,12 +137,8 @@ .PHONY: clean mostlyclean distclean maintainer-clean:: - rm -f Makefile -.PHONY: distclean - -maintainer-clean:: - rm -f tags TAGS -.PHONY: maintainer-clean + rm -f tags TAGS Makefile +.PHONY: distclean maintainer-clean dist: ln $(EXTERNAL_DISTFILES) ../../`cat ../../.fname`/libcruft/$(THISDIR)
--- a/liboctave/ChangeLog Wed Feb 25 13:01:35 2009 -0500 +++ b/liboctave/ChangeLog Wed Feb 25 15:34:23 2009 -0500 @@ -1,3 +1,7 @@ +2009-02-25 John W. Eaton <jwe@octave.org> + + * Makefile.in: Make maintainer-clean and distclean the same. + 2009-02-25 Jaroslav Hajek <highegg@gmail.com> * oct-inttypes.cc (pow (const octave_int<T>&, const octave_int<T>&)):
--- a/liboctave/Makefile.in Wed Feb 25 13:01:35 2009 -0500 +++ b/liboctave/Makefile.in Wed Feb 25 15:34:23 2009 -0500 @@ -356,13 +356,10 @@ mostlyclean: clean .PHONY: mostlyclean -distclean: clean +distclean maintainer-clean: clean + rm -f tags TAGS rm -f Makefile so_locations oct-types.h $(PREREQ) -.PHONY: distclean - -maintainer-clean: distclean - rm -f tags TAGS -.PHONY: maintainer-clean +.PHONY: distclean maintainer-clean dist: $(PREREQ) ln $(DISTFILES) ../`cat ../.fname`/liboctave
--- a/scripts/ChangeLog Wed Feb 25 13:01:35 2009 -0500 +++ b/scripts/ChangeLog Wed Feb 25 15:34:23 2009 -0500 @@ -1,3 +1,8 @@ +2009-02-25 John W. Eaton <jwe@octave.org> + + * Makefile.in (distclean maintainer-clean): Remove tags and TAGS + in distclean target. + 2009-02-25 Jaroslav Hajek <highegg@gmail.com> * help/lookfor.m: Vectorize the path splitting using mat2cell.
--- a/scripts/Makefile.in Wed Feb 25 13:01:35 2009 -0500 +++ b/scripts/Makefile.in Wed Feb 25 15:34:23 2009 -0500 @@ -99,11 +99,11 @@ rm -f gethelp$(BUILD_EXEEXT) distclean maintainer-clean:: - rm -f Makefile config.log config.status DOCSTRINGS + rm -f tags TAGS Makefile config.log config.status DOCSTRINGS rm -rf autom4te.cache maintainer-clean:: - rm -f tags TAGS configure + rm -f configure dist: ln $(DISTFILES) ../`cat ../.fname`/scripts
--- a/src/ChangeLog Wed Feb 25 13:01:35 2009 -0500 +++ b/src/ChangeLog Wed Feb 25 15:34:23 2009 -0500 @@ -1,5 +1,9 @@ 2009-02-25 John W. Eaton <jwe@octave.org> + * Makefile.in (distclean): Remove tags TAGS y.tab.h y.output + yy.lex.c here, not in maintainer-clean target. Also remove + parse.output. + * DLD-FUNCTIONS/rand.cc: Note that the tests for the old random number generator will fail if using 64-bit indexing.
--- a/src/Makefile.in Wed Feb 25 13:01:35 2009 -0500 +++ b/src/Makefile.in Wed Feb 25 15:34:23 2009 -0500 @@ -562,12 +562,13 @@ distclean: clean rm -f Makefile octave$(EXEEXT) .fname so_locations oct-errno.cc + rm -f tags TAGS y.tab.h y.output yy.lex.c parse.output rm -f stamp-liboctave-prereq rm -f doc-files gendoc.cc graphics.h graphics-props.cc mxarray.h DOCSTRINGS .PHONY: distclean maintainer-clean: distclean - rm -f tags TAGS y.tab.h y.output yy.lex.c lex.cc parse.cc + rm -f lex.cc parse.cc rm -f oct-gperf.h $(OPT_HANDLERS) .PHONY: maintainer-clean