Remove stale .pdmp files with ‘make clean’

Problem reported by Sven Joachim (Bug#36907).
* admin/make-emacs: Simplify, now that clean does versionclean.
* src/Makefile.in ($(etc)/DOC, versionclean, extraclean):
Don’t ignore rm -f failures.
(versionclean): Also remove emacs-*.*.*[0-9].pdmp and ../etc/DOC*.
(clean): Depend on versionclean and simplify.

diff --git a/admin/make-emacs b/admin/make-emacs
index b7cca06e1c67af2bdbd205ca6e4319fa088c5895..e1be944e4cbf9c5a6b32285a15c419395dbde238 100755 (executable)
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -109,7 +109,7 @@ if (@ARGV && $ARGV[0] eq "all")
     shift @ARGV;
   }
 
-system ("$make clean versionclean") if $all;
+system ("$make clean") if $all;
 
 if ($wall)
   {

diff --git a/src/Makefile.in b/src/Makefile.in
index fd05a45df54b4d7e3cfa979e98c1488ea2a5dd3a..76aa6a1ec5cecccf27ed0deb0458a9b2cbf83a47 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -598,7 +598,7 @@ endif
 ##
 $(etc)/DOC: lisp.mk $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp)
        $(AM_V_GEN)$(MKDIR_P) $(etc)
-       -$(AM_V_at)rm -f $(etc)/DOC
+       $(AM_V_at)rm -f $(etc)/DOC
        $(AM_V_at)$(libsrc)/make-docfile -d $(srcdir) \
          $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC
        $(AM_V_at)$(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) \
@@ -699,9 +699,11 @@ mostlyclean:
        rm -f buildobj.h
        rm -f globals.h gl-stamp
        rm -f ./*.res ./*.tmp
-clean: mostlyclean
-       rm -f emacs-*.*.*[0-9]$(EXEEXT) emacs-*.*.*[0-9].pdmp
-       rm -f emacs$(EXEEXT) $(DEPDIR)/*
+versionclean:
+       rm -f emacs$(EXEEXT) emacs-*.*.*[0-9]$(EXEEXT) emacs-*.*.*[0-9].pdmp
+       rm -f ../etc/DOC*
+clean: mostlyclean versionclean
+       rm -f $(DEPDIR)/*
 
 ## bootstrap-clean is used to clean up just before a bootstrap.
 ## It should remove all files generated during a compilation/bootstrap,
@@ -720,10 +722,8 @@ distclean: bootstrap-clean
 
 maintainer-clean: distclean
        rm -f TAGS
-versionclean:
-       -rm -f emacs$(EXEEXT) emacs-*.*.*[0-9]$(EXEEXT) ../etc/DOC*
 extraclean: distclean
-       -rm -f ./*~ \#* TAGS config.in
+       rm -f ./*~ \#* TAGS config.in
 
 
 ETAGS = ../lib-src/etags${EXEEXT}