aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2002-09-11 21:00:08 +0000
committerStefan Monnier2002-09-11 21:00:08 +0000
commitffb0b9d7675cf83af7808ebc55b90044aec7653b (patch)
tree1201160f9c6f9451b32046ee461f9a3f29f6cbfd
parentedeabf087f741c1317e47992376cf7f1f29d1a31 (diff)
downloademacs-ffb0b9d7675cf83af7808ebc55b90044aec7653b.tar.gz
emacs-ffb0b9d7675cf83af7808ebc55b90044aec7653b.zip
(bootstrap-lisp-1, bootstrap-lisp, bootstrap)
(bootstrap-clean-after): Delete. (bootstrap): Make the sequencing explicit.
-rw-r--r--Makefile.in16
1 files changed, 5 insertions, 11 deletions
diff --git a/Makefile.in b/Makefile.in
index 577d5fb94e8..fde9f14c40c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -711,7 +711,7 @@ dvi:
711### special emacs executable is built from Lisp sources, which is then 711### special emacs executable is built from Lisp sources, which is then
712### used to compile Lisp files. The last step is a "normal" make. 712### used to compile Lisp files. The last step is a "normal" make.
713 713
714.PHONY: bootstrap bootstrap-lisp-1 boostrap-src bootstrap-lisp bootstrap-clean 714.PHONY: bootstrap
715.PHONY: maybe_bootstrap 715.PHONY: maybe_bootstrap
716 716
717maybe_bootstrap: 717maybe_bootstrap:
@@ -721,16 +721,12 @@ maybe_bootstrap:
721 exit 1;\ 721 exit 1;\
722 fi 722 fi
723 723
724bootstrap: bootstrap-clean-before bootstrap-lisp-1 bootstrap-src bootstrap-lisp bootstrap-clean-after all info 724bootstrap: bootstrap-clean-before info FRC
725
726bootstrap-lisp-1:
727 (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean) 725 (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean)
728
729bootstrap-lisp:
730 (cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/bootstrap-emacs)
731
732bootstrap-src:
733 (cd src; $(MAKE) $(MFLAGS) bootstrap) 726 (cd src; $(MAKE) $(MFLAGS) bootstrap)
727 (cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/bootstrap-emacs)
728 (cd src; $(MAKE) $(MFLAGS) mostlyclean)
729 $(MAKE) $(MFLAGS) all
734 730
735### Used for `bootstrap' to avoid deleting existing dumped Emacs executables. 731### Used for `bootstrap' to avoid deleting existing dumped Emacs executables.
736bootstrap-clean-before: FRC 732bootstrap-clean-before: FRC
@@ -743,5 +739,3 @@ bootstrap-clean-before: FRC
743 -(cd lispintro && $(MAKE) $(MFLAGS) clean) 739 -(cd lispintro && $(MAKE) $(MFLAGS) clean)
744 (cd leim; $(MAKE) $(MFLAGS) clean) 740 (cd leim; $(MAKE) $(MFLAGS) clean)
745 741
746bootstrap-clean-after:
747 (cd src; $(MAKE) $(MFLAGS) mostlyclean)