[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master de4e1bd 3/3: Make extraclean return tree to pristin
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master de4e1bd 3/3: Make extraclean return tree to pristine state by deleting more |
Date: |
Thu, 20 Jun 2019 11:11:26 -0400 (EDT) |
branch: master
commit de4e1bddb1c4823af4d04f0bff5b4a0217e9701d
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Make extraclean return tree to pristine state by deleting more
* src/Makefile.in (extraclean): Remove TAGS and config.in.
* Makefile.in (extraclean): Remove info, configure and
emacsver.texi in extraclean.
* admin/unidata/Makefile.in (extraclean): Make it depend on
distclean to remove .elc files.
* leim/Makefile.in (extraclean): Depend on bootstrap-clean to
remove generated .el files.
* lib/Makefile.in (extraclean): Added target to remove sys
directory and run distclean.
* lisp/Makefile.in (extraclean): Also remove loaddefs*.el~ files.
---
Makefile.in | 8 +++++---
admin/unidata/Makefile.in | 2 +-
leim/Makefile.in | 2 +-
lib/Makefile.in | 3 +++
lisp/Makefile.in | 8 ++++++--
src/Makefile.in | 2 +-
6 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 21362a9..5e23d72 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -933,14 +933,16 @@ maintainer-clean: bootstrap-clean
$(maintainer_clean_dirs:=_maintainer-clean)
### Note that we abuse this in some subdirectories (eg leim),
### to delete some generated files that are slow to rebuild.
extraclean_dirs = ${NTDIR} lib-src src leim \
- admin/charsets admin/grammars admin/unidata
+ admin/charsets admin/grammars admin/unidata lisp lib
$(foreach dir,$(extraclean_dirs),$(eval $(call
submake_template,$(dir),extraclean)))
extraclean: $(extraclean_dirs:=_extraclean)
${top_maintainer_clean}
- -rm -f config-tmp-*
- -rm -f ./*~ \#*
+ -rm -f config-tmp-* aclocal.m4 configure
+ -rm -f ./*~ \#* etc/refcards/emacsver.tex doc/emacs/emacsver.texi
+ -rm -f info/*.info info/dir
+ -[ -d info ] && rmdir --ignore-fail-on-non-empty info
# The src subdir knows how to do the right thing
# even when the build directory and source dir are different.
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index 31efba0..a522b0c 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -116,6 +116,6 @@ maintainer-clean: distclean
## Do not remove these files, even in a bootstrap, because they rarely
## change and it slows down bootstrap (a tiny bit).
## Cf leim/ja-dic (which is much slower).
-extraclean:
+extraclean: distclean
rm -f ${top_srcdir}/src/macuvs.h ${unidir}/charscript.el*
rm -f ${unifiles} ${unidir}/charprop.el
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 4307d50..d5619d9 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -159,7 +159,7 @@ maintainer-clean: distclean bootstrap-clean
## We do not delete ja-dic, even in a bootstrap, because it rarely
## changes and is slow to regenerate.
-extraclean:
+extraclean: bootstrap-clean
rm -rf ${leimdir}/ja-dic
### Makefile.in ends here
diff --git a/lib/Makefile.in b/lib/Makefile.in
index ac32c70..12a1be7 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -126,6 +126,9 @@ distclean bootstrap-clean: mostlyclean
rm -fr $(DEPDIR)
maintainer-clean: distclean
rm -f TAGS gnulib.mk
+extraclean: distclean
+ -[ -d sys ] && rmdir --ignore-fail-on-non-empty sys
+
.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 9bcd5a8..ee2c209 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -453,18 +453,22 @@ $(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC)
$(CAL_DIR)/diary-loaddefs.el
--eval "(setq generated-autoload-file (expand-file-name
(unmsys--file-name \"$@\")))" \
-f batch-update-autoloads $(CAL_DIR)
-.PHONY: bootstrap-clean distclean maintainer-clean
+.PHONY: bootstrap-clean distclean maintainer-clean extraclean
bootstrap-clean:
find $(lisp) -name '*.elc' $(FIND_DELETE)
rm -f $(AUTOGENEL)
distclean:
- -rm -f ./Makefile $(lisp)/loaddefs.el~
+ -rm -f ./Makefile $(lisp)/loaddefs.el
maintainer-clean: distclean bootstrap-clean
rm -f TAGS
+extraclean: bootstrap-clean distclean
+ -for file in $(LOADDEFS); do rm -f $${file}~; done
+ -rm -f $(lisp)/loaddefs.el~
+
.PHONY: check-declare
check-declare:
diff --git a/src/Makefile.in b/src/Makefile.in
index 02a1a2c..fd05a45 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -723,7 +723,7 @@ maintainer-clean: distclean
versionclean:
-rm -f emacs$(EXEEXT) emacs-*.*.*[0-9]$(EXEEXT) ../etc/DOC*
extraclean: distclean
- -rm -f ./*~ \#*
+ -rm -f ./*~ \#* TAGS config.in
ETAGS = ../lib-src/etags${EXEEXT}