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

[Miles Bader]

Index: emacs/lisp/Makefile.in
diff -c emacs/lisp/Makefile.in:1.44 emacs/lisp/Makefile.in:1.45
*** emacs/lisp/Makefile.in:1.44 Mon Sep  1 11:45:04 2003
--- emacs/lisp/Makefile.in      Mon Sep 15 01:36:56 2003
***************
*** 80,85 ****
--- 80,86 ----
        $(lisp)/language/utf-8-lang.el \
        $(lisp)/language/georgian.el \
        $(lisp)/loaddefs.el \
+       $(lisp)/loaddefs-boot.el \
        $(lisp)/loadup.el \
        $(lisp)/mail/blessmail.el \
        $(lisp)/patcomp.el \
***************
*** 186,196 ****
        $(emacs) -f batch-update-authors $(srcdir)/AUTHORS $(srcdir)
  
  TAGS: $(lisptagsfiles1) $(lisptagsfiles2)
!       els=`echo $(lisptagsfiles1) $(lisptagsfiles2) | sed -e 
"s,$(lisp)/loaddefs.el,,"`; \
        ${ETAGS} $$els
  
  TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2)
!       els=`echo $(lisptagsfiles1) $(lisptagsfiles2) | sed -e 
"s,$(lisp)/loaddefs.el,,"`; \
        ${ETAGS} -o TAGS-LISP $$els
  
  .SUFFIXES: .elc .el
--- 187,197 ----
        $(emacs) -f batch-update-authors $(srcdir)/AUTHORS $(srcdir)
  
  TAGS: $(lisptagsfiles1) $(lisptagsfiles2)
!       els=`echo $(lisptagsfiles1) $(lisptagsfiles2) | sed -e 
"s,$(lisp)/loaddefs.*\.el,,"`; \
        ${ETAGS} $$els
  
  TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2)
!       els=`echo $(lisptagsfiles1) $(lisptagsfiles2) | sed -e 
"s,$(lisp)/loaddefs.*\.el,,"`; \
        ${ETAGS} -o TAGS-LISP $$els
  
  .SUFFIXES: .elc .el
***************
*** 274,287 ****
  recompile: doit
        $(EMACS) $(EMACSOPT) -f batch-byte-recompile-directory $(lisp)
  
! # Prepare a bootstrap in the lisp subdirectory.  Build loaddefs.el,
! # because it's not sure it's up-to-date, and if it's not, that might
! # lead to errors during the bootstrap because something fails to
! # autoload as expected.  Remove compiled Lisp files so that
! # bootstrap-emacs will be built from sources only.
  
  bootstrap-clean:
!       if test -x $(EMACS); then $(MAKE) $(MFLAGS) autoloads; fi
        cd $(lisp); rm -f *.elc */*.elc
  
  # Generate/update files for the bootstrap process.
--- 275,301 ----
  recompile: doit
        $(EMACS) $(EMACSOPT) -f batch-byte-recompile-directory $(lisp)
  
! # Prepare a bootstrap in the lisp subdirectory.
! #
! # Build loaddefs.el, because it's not sure it's up-to-date, and if it's not,
! # that might lead to errors during the bootstrap because something fails to
! # autoload as expected.  However, if there is no emacs binary, then we can't
! # build autoloads yet, so just make sure there's some loaddefs.el file, as
! # it's necessary for generating the binary (because loaddefs.el is an
! # automatically generated file, we don't want to store it in the source
! # repository).
! #
! # Remove compiled Lisp files so that bootstrap-emacs will be built from
! # sources only.
  
  bootstrap-clean:
!       if test -x $(EMACS); then                               \
!         $(MAKE) $(MFLAGS) autoloads;                          \
!       else                                                    \
!         if ! test -r $(lisp)/loaddefs.el; then                \
!           cp $(lisp)/loaddefs-boot.el $(lisp)/loaddefs.el;    \
!         fi                                                    \
!       fi
        cd $(lisp); rm -f *.elc */*.elc
  
  # Generate/update files for the bootstrap process.