# HG changeset patch # User jwe # Date 1112979515 0 # Node ID 233140bc8068f79c15f761a6f8428d7de060c2d1 # Parent 23b37da9fd5b67e7a8dfda2422b14244a0085ca2 [project @ 2005-04-08 16:58:34 by jwe] diff -r 23b37da9fd5b -r 233140bc8068 ChangeLog --- a/ChangeLog Fri Apr 08 16:07:37 2005 +0000 +++ b/ChangeLog Fri Apr 08 16:58:35 2005 +0000 @@ -1,5 +1,10 @@ 2005-04-08 John W. Eaton + * octMakefile.in (maintainer-clean distclean): + Remove install-octave from the list of files to remove. + (install-octave.in): Delete file. + (DISTFILES): Remove it from the list. + * Initial merge of 64-bit changes from Clinton Chee: 2005-04-07 John W. Eaton diff -r 23b37da9fd5b -r 233140bc8068 libcruft/ChangeLog --- a/libcruft/ChangeLog Fri Apr 08 16:07:37 2005 +0000 +++ b/libcruft/ChangeLog Fri Apr 08 16:58:35 2005 +0000 @@ -1,3 +1,8 @@ +2005-04-08 John W. Eaton + + * Makefile.in, Makerules.in (clean, distclean, maintainer-clean): + Avoid duplication in rules. + 2005-03-17 Andy Adler * Makerules.in (install-strip): Include double-colon target here too. diff -r 23b37da9fd5b -r 233140bc8068 libcruft/Makefile.in --- a/libcruft/Makefile.in Fri Apr 08 16:07:37 2005 +0000 +++ b/libcruft/Makefile.in Fri Apr 08 16:58:35 2005 +0000 @@ -157,18 +157,15 @@ TAGS:: $(SOURCES) etags $(SOURCES) -clean mostlyclean:: - rm -f *.$(LIBEXT) *.o - if $(SHARED_LIBS); then rm -f *.$(SHLEXT_VER) *.$(SHLEXT); fi +clean mostlyclean distclean:: + rm -f libcruft.$(LIBEXT) $(CRUFT_OBJ) + rm -f libcruft.$(SHLEXT_VER) libcruft.$(SHLEXT) -distclean:: - rm -f *.$(LIBEXT) *.o Makefile Makerules so_locations - if $(SHARED_LIBS); then rm -f *.$(SHLEXT_VER) *.$(SHLEXT); fi +distclean maintainer-clean:: + rm -f Makefile Makerules so_locations maintainer-clean:: - rm -f *.$(LIBEXT) *.o configure Makefile Makerules - rm -f so_locations tags TAGS - if $(SHARED_LIBS); then rm -f *.$(SHLEXT_VER) *.$(SHLEXT); fi + rm -f tags TAGS dist: for dir in $(DISTSUBDIRS); do mkdir ../`cat ../.fname`/libcruft/$$dir; $(MAKE) -C $$dir $@; done diff -r 23b37da9fd5b -r 233140bc8068 libcruft/Makerules.in --- a/libcruft/Makerules.in Fri Apr 08 16:07:37 2005 +0000 +++ b/libcruft/Makerules.in Fri Apr 08 16:58:35 2005 +0000 @@ -76,30 +76,17 @@ TAGS: $(SOURCES) etags $(SOURCES) -clean:: - rm -f *.d *.a *.o pic/*.o +clean mostlyclean distclean maintainer-clean:: + rm -f $(MAKEDEPS) $(CRUFT_OBJ) $(CRUFT_PICOBJ) -rmdir pic rm -f stmp-pic -.PHONY: clean +.PHONY: clean mostlyclean -mostlyclean:: - rm -f *.d *.o pic/*.o - -rmdir pic - rm -f stmp-pic -.PHONY: mostlyclean - -distclean:: - rm -f *.d *.a *.o pic/*.o - -rmdir pic - rm -f stmp-pic +distclean maintainer-clean:: rm -f Makefile .PHONY: 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 -r 23b37da9fd5b -r 233140bc8068 liboctave/ChangeLog --- a/liboctave/ChangeLog Fri Apr 08 16:07:37 2005 +0000 +++ b/liboctave/ChangeLog Fri Apr 08 16:58:35 2005 +0000 @@ -1,5 +1,7 @@ 2005-04-08 John W. Eaton + * Makefile.in (clean): Use exact filenames instead of *.xxx. + * Initial merge of 64-bit changes from Clinton Chee: 2005-04-07 John W. Eaton diff -r 23b37da9fd5b -r 233140bc8068 liboctave/Makefile.in --- a/liboctave/Makefile.in Fri Apr 08 16:07:37 2005 +0000 +++ b/liboctave/Makefile.in Fri Apr 08 16:58:35 2005 +0000 @@ -305,10 +305,9 @@ etags $(SOURCES) clean: - rm -f *.$(LIBEXT) *.o *.d pic/*.o + rm -f liboctave.$(LIBEXT) liboctave.$(SHLEXT_VER) liboctave.$(SHLEXT) + rm -f $(OBJECTS) $(MAKEDEPS) $(LIBOCTAVE_PICOBJ) stmp-pic -rmdir pic - rm -f stmp-pic - if $(SHARED_LIBS); then rm -f *.$(SHLEXT_VER) *.$(SHLEXT); fi .PHONY: clean mostlyclean: clean diff -r 23b37da9fd5b -r 233140bc8068 octMakefile.in --- a/octMakefile.in Fri Apr 08 16:07:37 2005 +0000 +++ b/octMakefile.in Fri Apr 08 16:58:35 2005 +0000 @@ -28,7 +28,7 @@ NEWS.[0-9] PROJECTS README README.Linux README.Windows \ README.MachTen README.kpathsea ROADMAP SENDING-PATCHES \ THANKS move-if-change octave-sh octave-bug.in \ - octave-config.in install-octave.in mk-opts.pl mkinstalldirs \ + octave-config.in mk-opts.pl mkinstalldirs \ mkoctfile.in ChangeLog ChangeLog.[0-9] # Complete directory trees to distribute. @@ -136,7 +136,7 @@ maintainer-clean distclean:: rm -f octMakefile Makefile Makeconf Makefrag.f77 Makerules.f77 - rm -f octave-bug octave-config mk-oct-links mkoctfile install-octave + rm -f octave-bug octave-config mk-oct-links mkoctfile rm -f config.cache config.h config.log config.status rm -rf autom4te.cache diff -r 23b37da9fd5b -r 233140bc8068 scripts/ChangeLog --- a/scripts/ChangeLog Fri Apr 08 16:07:37 2005 +0000 +++ b/scripts/ChangeLog Fri Apr 08 16:58:35 2005 +0000 @@ -1,3 +1,8 @@ +2005-04-08 John W. Eaton + + * Makefile.in (clean, distclean, maintainer-clean): + Avoid duplication in rules. + 2005-03-28 John W. Eaton * plot/contour.m, plot/mesh.m: Continue to use __gnuplot_raw__ for diff -r 23b37da9fd5b -r 233140bc8068 scripts/Makefile.in --- a/scripts/Makefile.in Fri Apr 08 16:07:37 2005 +0000 +++ b/scripts/Makefile.in Fri Apr 08 16:58:35 2005 +0000 @@ -74,19 +74,14 @@ TAGS:: $(SOURCES) etags $(SOURCES) -clean:: +clean distclean maintainer-clean:: rm -f gethelp$(BUILD_EXEEXT) -distclean:: - rm -f gethelp$(BUILD_EXEEXT) +distclean maintainer-clean:: rm -f Makefile config.log config.status DOCSTRINGS - -rm -rf autom4te.cache maintainer-clean:: - 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 -r 23b37da9fd5b -r 233140bc8068 src/ChangeLog --- a/src/ChangeLog Fri Apr 08 16:07:37 2005 +0000 +++ b/src/ChangeLog Fri Apr 08 16:58:35 2005 +0000 @@ -1,5 +1,10 @@ 2005-04-08 John W. Eaton + * Makefile.in (clean): Use exact filenames instead of *.xxx. + Also remove PKG_ADD. + (DISTFILES): Add gplot.cc to the list. + (maintainer-clean): Remove gplot.cc here. + * Initial merge of 64-bit changes from Clinton Chee: 2005-04-07 John W. Eaton diff -r 23b37da9fd5b -r 233140bc8068 src/Makefile.in --- a/src/Makefile.in Fri Apr 08 16:07:37 2005 +0000 +++ b/src/Makefile.in Fri Apr 08 16:58:35 2005 +0000 @@ -249,7 +249,7 @@ DISTFILES = Makefile.in ChangeLog mkdefs mkops mkgendoc \ DOCSTRINGS mkbuiltins mk-oct-links \ defaults.h.in oct-conf.h.in octave.gperf oct-gperf.h \ - octave.cc parse.cc lex.cc y.tab.h \ + octave.cc parse.cc lex.cc y.tab.h gplot.cc \ $(INCLUDES) $(DIST_SRC) $(OPT_HANDLERS) $(EXTRAS) all: octave$(EXEEXT) stamp-oct-links PKG_ADD DOCSTRINGS @@ -466,10 +466,13 @@ etags $(SOURCES) $(DLD_SRC) clean: - rm -f *.$(LIBEXT) *.o *.d *.df *.oct pic/*.o stmp-pic gendoc$(EXEEXT) + rm -f liboctinterp.$(LIBEXT) + rm -f liboctinterp.$(SHLEXT_VER) liboctinterp.$(SHLEXT) + rm -f $(OBJECTS) $(MAKEDEPS) $(DEF_FILES) $(VAR_FILES) $(OCT_FILES) + rm -f $(PICOBJ) stmp-pic gendoc$(EXEEXT) rm -f builtins.cc ops.cc defaults.h oct-conf.h def-files var-files + rm -f PKG_ADD -rmdir pic - if $(SHARED_LIBS); then rm -f *.$(SHLEXT_VER) *.$(SHLEXT); fi .PHONY: clean mostlyclean: clean @@ -483,7 +486,7 @@ maintainer-clean: distclean rm -f tags TAGS y.tab.c y.tab.h y.output yy.lex.c lex.cc parse.cc - rm -f oct-gperf.h $(OPT_HANDLERS) + rm -f oct-gperf.h gplot.cc $(OPT_HANDLERS) .PHONY: maintainer-clean dist: parse.cc lex.cc oct-gperf.h