Mercurial > hg > octave-nkf

changeset 5276:233140bc8068

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2005-04-08 16:58:34 by jwe]
author jwe
date Fri, 08 Apr 2005 16:58:35 +0000
parents 23b37da9fd5b
children b1f1338f7931
files ChangeLog libcruft/ChangeLog libcruft/Makefile.in libcruft/Makerules.in liboctave/ChangeLog liboctave/Makefile.in octMakefile.in scripts/ChangeLog scripts/Makefile.in src/ChangeLog src/Makefile.in
diffstat 11 files changed, 45 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-04-08  John W. Eaton  <jwe@octave.org>
 
+	* 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  <jwe@octave.org>
--- a/libcruft/ChangeLog
+++ b/libcruft/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-08  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.in, Makerules.in (clean, distclean, maintainer-clean):
+	Avoid duplication in rules.
+
 2005-03-17  Andy Adler  <adler@site.uottawa.ca>
 
 	* Makerules.in (install-strip): Include double-colon target here too.
--- a/libcruft/Makefile.in
+++ b/libcruft/Makefile.in
@@ -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
--- a/libcruft/Makerules.in
+++ b/libcruft/Makerules.in
@@ -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
 
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,5 +1,7 @@
 2005-04-08  John W. Eaton  <jwe@octave.org>
 
+	* Makefile.in (clean): Use exact filenames instead of *.xxx.
+
 	* Initial merge of 64-bit changes from Clinton Chee:
 
 	2005-04-07  John W. Eaton  <jwe@octave.org>
--- a/liboctave/Makefile.in
+++ b/liboctave/Makefile.in
@@ -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
--- a/octMakefile.in
+++ b/octMakefile.in
@@ -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
 
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-08  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.in (clean, distclean, maintainer-clean):
+	Avoid duplication in rules.
+
 2005-03-28  John W. Eaton  <jwe@octave.org>
 
 	* plot/contour.m, plot/mesh.m: Continue to use __gnuplot_raw__ for
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -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
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2005-04-08  John W. Eaton  <jwe@octave.org>
 
+	* 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  <jwe@octave.org>
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -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