[Emacs-diffs] Changes to emacs/Makefile.in [lexbind]

[Miles Bader]

Index: emacs/Makefile.in
diff -c emacs/Makefile.in:1.262.2.13 emacs/Makefile.in:1.262.2.14
*** emacs/Makefile.in:1.262.2.13        Thu Sep 16 00:12:20 2004
--- emacs/Makefile.in   Fri Nov 12 04:21:21 2004
***************
*** 51,56 ****
--- 51,65 ----
  #
  # make extraclean
  #      Still more severe - delete backup and autosave files, too.
+ #
+ # 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.
  
  SHELL = /bin/sh
  
***************
*** 726,731 ****
--- 735,742 ----
  ### 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,743 ****
          exit 1;\
        fi
  
! bootstrap: bootstrap-clean-before info FRC
        (cd lisp; $(MAKE) $(MFLAGS) bootstrap-prepare)
        (cd src; $(MAKE) $(MFLAGS) bootstrap)
        (cd lisp; $(MAKE) $(MFLAGS) bootstrap 
EMACS=../src/bootstrap-emacs${EXEEXT})
--- 748,758 ----
          exit 1;\
        fi
  
! 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,752 ****
        (cd lisp; $(MAKE) $(MFLAGS) bootstrap-after)
  
  ### Used for `bootstrap' to avoid deleting existing dumped Emacs executables.
! bootstrap-clean-before: FRC
        (cd src;      $(MAKE) $(MFLAGS) mostlyclean)
        (cd oldXMenu; $(MAKE) $(MFLAGS) clean)
        (cd lwlib;    $(MAKE) $(MFLAGS) clean)
--- 761,772 ----
        (cd lisp; $(MAKE) $(MFLAGS) bootstrap-after)
  
  ### Used for `bootstrap' to avoid deleting existing dumped Emacs executables.
! bootstrap-clean-before: bootstrap-clean-before-fast FRC
!       (cd lisp;     $(MAKE) $(MFLAGS) bootstrap-clean)
! 
! ### 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)
        (cd lwlib;    $(MAKE) $(MFLAGS) clean)