From: Lars Ingebrigtsen <larsi@gnus.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: A target that's even more bootstrap?
Date: Thu, 20 Jun 2019 13:32:28 +0200 [thread overview]
Message-ID: <m336k4331v.fsf@gnus.org> (raw)
In-Reply-To: <83ef3pqvzs.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 19 Jun 2019 21:18:47 +0300")
Eli Zaretskii <eliz@gnu.org> writes:
> Great, thanks. What's left is to update every Makefile.in with its
> share of files to delete in the extraclean target.
With the patch below, the only remaining files (not in a clean
check-out) are:
+./info
+./src/config.in
+./lib/sys
+./configure
Should the ./configure file also be deleted by extraclean?
If I remove src/config.in, then the subsequent "make" after "make
extraclean" fails with
config.status: error: cannot find input file: `src/config.in'
GNUmakefile:72: recipe for target 'Makefile' failed
and I have to run autogen.sh again...
The two directories
+./info
+./lib/sys
perhaps don't matter, and I'd rather not do an rm -rf on a directory...
diff --git a/Makefile.in b/Makefile.in
index 21362a9196..26463cec64 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -933,14 +933,15 @@ maintainer-clean: bootstrap-clean $(maintainer_clean_dirs:
### 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
+ -rm -f ./*~ \#* etc/refcards/emacsver.tex doc/emacs/emacsver.texi
+ -rm -f ${infodir}/*.info ${infodir}/dir
# 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 31efba0227..a522b0c3aa 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -116,6 +116,6 @@ maintainer-clean:
## 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 4307d50087..d5619d9c67 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -159,7 +159,7 @@ maintainer-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 ac32c7070f..bf9b01f143 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -126,6 +126,8 @@ distclean bootstrap-clean:
rm -fr $(DEPDIR)
maintainer-clean: distclean
rm -f TAGS gnulib.mk
+extraclean: distclean
+
.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 9bcd5a8824..6d37884c7e 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -453,7 +453,7 @@ $(CAL_DIR)/hol-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)
@@ -465,6 +465,8 @@ distclean:
maintainer-clean: distclean bootstrap-clean
rm -f TAGS
+extraclean: bootstrap-clean distclean
+
.PHONY: check-declare
check-declare:
diff --git a/src/Makefile.in b/src/Makefile.in
index 02a1a2c4cf..44c22ef5de 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -723,7 +723,7 @@ maintainer-clean:
versionclean:
-rm -f emacs$(EXEEXT) emacs-*.*.*[0-9]$(EXEEXT) ../etc/DOC*
extraclean: distclean
- -rm -f ./*~ \#*
+ -rm -f ./*~ \#* TAGS
ETAGS = ../lib-src/etags${EXEEXT}
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
next prev parent reply other threads:[~2019-06-20 11:32 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-18 11:22 A target that's even more bootstrap? Lars Ingebrigtsen
2019-06-18 12:16 ` Andreas Schwab
2019-06-18 12:27 ` Lars Ingebrigtsen
2019-06-18 12:53 ` Phillip Lord
2019-06-18 13:20 ` Stefan Monnier
2019-06-18 13:28 ` Lars Ingebrigtsen
2019-06-18 16:03 ` Eli Zaretskii
2019-06-19 9:29 ` Phillip Lord
2019-06-19 15:21 ` Eli Zaretskii
2019-06-19 13:15 ` Lars Ingebrigtsen
2019-06-19 14:00 ` Andreas Schwab
2019-06-19 15:28 ` Eli Zaretskii
2019-06-19 15:32 ` Lars Ingebrigtsen
2019-06-18 15:53 ` Eli Zaretskii
2019-06-18 15:58 ` Lars Ingebrigtsen
2019-06-18 16:54 ` Eli Zaretskii
2019-06-18 17:47 ` Andy Moreton
2019-06-18 19:22 ` Óscar Fuentes
2019-06-19 4:32 ` Elias Mårtenson
2019-06-19 5:29 ` Teemu Likonen
2019-06-19 15:12 ` Eli Zaretskii
2019-06-19 20:06 ` Juanma Barranquero
2019-06-19 20:19 ` Lars Ingebrigtsen
2019-06-19 20:26 ` Óscar Fuentes
2019-06-20 2:30 ` Eli Zaretskii
2019-06-19 11:53 ` Lars Ingebrigtsen
2019-06-19 12:33 ` Andy Moreton
2019-06-19 12:45 ` Óscar Fuentes
2019-06-19 13:35 ` Juanma Barranquero
2019-06-19 13:46 ` Lars Ingebrigtsen
2019-06-19 15:34 ` Eli Zaretskii
2019-06-19 15:43 ` Lars Ingebrigtsen
2019-06-19 15:48 ` Eli Zaretskii
2019-06-19 16:12 ` Lars Ingebrigtsen
2019-06-19 17:03 ` Eli Zaretskii
2019-06-19 17:29 ` Lars Ingebrigtsen
2019-06-19 18:18 ` Eli Zaretskii
2019-06-20 11:32 ` Lars Ingebrigtsen [this message]
2019-06-20 13:06 ` Eli Zaretskii
2019-06-20 14:23 ` Lars Ingebrigtsen
2019-06-20 15:10 ` Lars Ingebrigtsen
2019-06-20 16:29 ` Eli Zaretskii
2019-06-21 10:51 ` Lars Ingebrigtsen
2019-06-21 22:03 ` Paul Eggert
2019-06-23 2:48 ` Richard Stallman
2019-06-20 16:23 ` Eli Zaretskii
2019-06-20 16:27 ` Lars Ingebrigtsen
2019-06-20 16:46 ` Eli Zaretskii
2019-06-20 16:47 ` Lars Ingebrigtsen
2019-06-20 18:24 ` Paul Eggert
2019-06-19 15:29 ` Phillip Lord
2019-06-19 15:59 ` Óscar Fuentes
2019-06-19 16:18 ` Stefan Monnier
2019-06-19 16:35 ` Óscar Fuentes
2019-06-19 17:03 ` Out of tree builds [was Re: A target that's even more bootstrap?] Glenn Morris
2019-06-19 17:30 ` Óscar Fuentes
2019-06-19 17:13 ` A target that's even more bootstrap? Stefan Monnier
2019-06-19 17:43 ` Óscar Fuentes
2019-06-20 13:49 ` Phillip Lord
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m336k4331v.fsf@gnus.org \
--to=larsi@gnus.org \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).