From 3fc61fde57cae39c7b4c922355ac056b71b17abf Mon Sep 17 00:00:00 2001
From: Kim F. Storm
Date: Sun, 7 Nov 2004 23:27:18 +0000
Subject: (bootstrap, bootstrap-clean-before): Remove .elc files before
 building. (bootfast, bootstrap-clean-before-fast): New targets, like
 bootstrap but don't remove .elc files.

---
 Makefile.in | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 34b9965b60e..8bc43d4ce80 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -726,6 +726,8 @@ dvi:
 ### used to compile Lisp files.  The last step is a "normal" make.
 
 .PHONY: bootstrap
+.PHONY: bootstrap-build
+.PHONY: bootfast
 .PHONY: maybe_bootstrap
 
 maybe_bootstrap:
@@ -737,7 +739,11 @@ maybe_bootstrap:
 	  exit 1;\
 	fi
 
-bootstrap: bootstrap-clean-before info FRC
+bootstrap: bootstrap-clean-before info bootstrap-build FRC
+
+bootfast: bootstrap-clean-before-fast info bootstrap-build FRC
+
+bootstrap-build: FRC
 	(cd lisp; $(MAKE) $(MFLAGS) bootstrap-prepare)
 	(cd src; $(MAKE) $(MFLAGS) bootstrap)
 	(cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/bootstrap-emacs${EXEEXT})
@@ -746,7 +752,11 @@ bootstrap: bootstrap-clean-before info FRC
 	(cd lisp; $(MAKE) $(MFLAGS) bootstrap-after)
 
 ### Used for `bootstrap' to avoid deleting existing dumped Emacs executables.
-bootstrap-clean-before: FRC
+bootstrap-clean-before: bootstrap-clean-before-fast FRC
+	(cd lisp;     $(MAKE) $(MFLAGS) bootstrap-clean)
+
+### Used for `bootstrap' to avoid deleting existing dumped Emacs executables.
+bootstrap-clean-before-fast: FRC
 	(cd src;      $(MAKE) $(MFLAGS) mostlyclean)
 	(cd oldXMenu; $(MAKE) $(MFLAGS) clean)
 	(cd lwlib;    $(MAKE) $(MFLAGS) clean)
-- 
cgit v1.2.1


From 51769fccbc9b631c98cbfe4dd4b50437ee9da6d5 Mon Sep 17 00:00:00 2001
From: Richard M. Stallman
Date: Mon, 8 Nov 2004 16:40:33 +0000
Subject: Comment changes.

---
 Makefile.in | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 8bc43d4ce80..c62c9e2b41f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -51,6 +51,15 @@
 #
 # make extraclean
 #      Still more severe - delete backup and autosave files, too.
+#
+# make bootstrap-build
+#      Recompiles changed Emacs Lisp files using the latest C source,
+#      then rebuilds Emacs.  This is faster than `make bootstrap'
+#      but once in a while an old .elc file can cause trouble.
+#
+# make bootfast
+#      Recompiles all the Emacs Lisp files using the latest source,
+#      then rebuilds Emacs.
 
 SHELL = /bin/sh
 
@@ -755,7 +764,8 @@ bootstrap-build: FRC
 bootstrap-clean-before: bootstrap-clean-before-fast FRC
 	(cd lisp;     $(MAKE) $(MFLAGS) bootstrap-clean)
 
-### Used for `bootstrap' to avoid deleting existing dumped Emacs executables.
+### Used for `bootfast' to avoid deleting existing dumped Emacs executables
+### and compiled .elc files.
 bootstrap-clean-before-fast: FRC
 	(cd src;      $(MAKE) $(MFLAGS) mostlyclean)
 	(cd oldXMenu; $(MAKE) $(MFLAGS) clean)
-- 
cgit v1.2.1


From cd9ebbbbca90b7c6ab1e9938cb682c5b424baaf9 Mon Sep 17 00:00:00 2001
From: Richard M. Stallman
Date: Thu, 11 Nov 2004 14:54:26 +0000
Subject: Comment change.

---
 Makefile.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index c62c9e2b41f..ce476a95cf0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -52,14 +52,14 @@
 # make extraclean
 #      Still more severe - delete backup and autosave files, too.
 #
-# make bootstrap-build
+# make bootstrap
+#      Recompiles all the Emacs Lisp files using the latest source,
+#      then rebuilds Emacs.
+#
+# make bootfast
 #      Recompiles changed Emacs Lisp files using the latest C source,
 #      then rebuilds Emacs.  This is faster than `make bootstrap'
 #      but once in a while an old .elc file can cause trouble.
-#
-# make bootfast
-#      Recompiles all the Emacs Lisp files using the latest source,
-#      then rebuilds Emacs.
 
 SHELL = /bin/sh
 
-- 
cgit v1.2.1