]> code.delx.au - gnu-emacs/commitdiff
(bootstrap-lisp-1, bootstrap-lisp, bootstrap)
authorStefan Monnier <monnier@iro.umontreal.ca>
Wed, 11 Sep 2002 21:00:08 +0000 (21:00 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Wed, 11 Sep 2002 21:00:08 +0000 (21:00 +0000)
(bootstrap-clean-after): Delete.
(bootstrap): Make the sequencing explicit.

Makefile.in

index 577d5fb94e8274a8e6470765711244300f122767..fde9f14c40c40b9dc516082128e019e7333edaba 100644 (file)
@@ -711,7 +711,7 @@ dvi:
 ### special emacs executable is built from Lisp sources, which is then
 ### used to compile Lisp files.  The last step is a "normal" make.
 
-.PHONY: bootstrap bootstrap-lisp-1 boostrap-src bootstrap-lisp bootstrap-clean
+.PHONY: bootstrap
 .PHONY: maybe_bootstrap
 
 maybe_bootstrap:
@@ -721,16 +721,12 @@ maybe_bootstrap:
          exit 1;\
        fi
 
-bootstrap: bootstrap-clean-before bootstrap-lisp-1 bootstrap-src bootstrap-lisp bootstrap-clean-after all info
-
-bootstrap-lisp-1:
+bootstrap: bootstrap-clean-before info FRC
        (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean)
-
-bootstrap-lisp:
-       (cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/bootstrap-emacs)
-
-bootstrap-src:
        (cd src; $(MAKE) $(MFLAGS) bootstrap)
+       (cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/bootstrap-emacs)
+       (cd src; $(MAKE) $(MFLAGS) mostlyclean)
+       $(MAKE) $(MFLAGS) all
 
 ### Used for `bootstrap' to avoid deleting existing dumped Emacs executables.
 bootstrap-clean-before: FRC
@@ -743,5 +739,3 @@ bootstrap-clean-before: FRC
        -(cd lispintro &&   $(MAKE) $(MFLAGS) clean)
        (cd leim;     $(MAKE) $(MFLAGS) clean)
 
-bootstrap-clean-after:
-       (cd src; $(MAKE) $(MFLAGS) mostlyclean)