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

[Miles Bader]

Index: emacs/lisp/Makefile.in
diff -c emacs/lisp/Makefile.in:1.34.2.3 emacs/lisp/Makefile.in:1.34.2.4
*** emacs/lisp/Makefile.in:1.34.2.3     Fri Apr  4 01:20:00 2003
--- emacs/lisp/Makefile.in      Tue Oct 14 19:50:46 2003
***************
*** 1,5 ****
  # Maintenance productions for the Lisp directory
! # Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
  
  # This file is part of GNU Emacs.
  
--- 1,5 ----
  # Maintenance productions for the Lisp directory
! # Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
  
  # This file is part of GNU Emacs.
  
***************
*** 80,85 ****
--- 80,86 ----
        $(lisp)/language/utf-8-lang.el \
        $(lisp)/language/georgian.el \
        $(lisp)/loaddefs.el \
+       $(lisp)/ldefs-boot.el \
        $(lisp)/loadup.el \
        $(lisp)/mail/blessmail.el \
        $(lisp)/patcomp.el \
***************
*** 130,136 ****
  
  setwins=subdirs=`find $$wd -type d -print`; \
        for file in $$subdirs; do \
!          case $$file in */Old | */RCS | */CVS | */CVS/* | */=* ) ;; \
                *) wins="$$wins $$file" ;; \
           esac; \
          done
--- 131,137 ----
  
  setwins=subdirs=`find $$wd -type d -print`; \
        for file in $$subdirs; do \
!          case $$file in */Old | */RCS | */CVS | */CVS/* | */.arch-ids | 
*/.arch-ids/* | */=* ) ;; \
                *) wins="$$wins $$file" ;; \
           esac; \
          done
***************
*** 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
--- 188,198 ----
        $(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
***************
*** 219,235 ****
  
  compile: $(lisp)/subdirs.el doit
        find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1; \
!       wd=$(lisp); $(setwins);                                             \
!       elpat=`echo $$wins | tr '       ' '\012\012' |                      \
!               sed -e 's|\(.\)$$|\1/|' -e 's|^\./||' -e 's|$$|*.el|'`;     \
!       els=`echo $$elpat $(DONTCOMPILE) $(DONTCOMPILE) $(COMPILE_FIRST) |  \
!               tr '     ' '\012\012' | sort | uniq -u`;                    \
!       for el in $(COMPILE_FIRST) $$els; do                                \
!         if test -f $$el;                                                  \
!         then                                                              \
!           echo Compiling $$el;                                            \
!           $(emacs) -f batch-byte-compile-if-not-done $$el || exit 1;      \
!         fi                                                                \
        done
  
  # Compile all Lisp files, except those from DONTCOMPILE.  This
--- 220,236 ----
  
  compile: $(lisp)/subdirs.el doit
        find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1; \
!       wd=$(lisp); $(setwins); \
!       elpat=`echo $$wins | tr '       ' '\012\012' | \
!               sed -e 's|\(.\)$$|\1/|' -e 's|^\./||' -e 's|$$|*.el|'`; \
!       els=`echo $$elpat $(DONTCOMPILE) $(DONTCOMPILE) $(COMPILE_FIRST) | \
!               tr '     ' '\012\012' | sort | uniq -u`; \
!       for el in $(COMPILE_FIRST) $$els; do \
!         if test -f $$el; \
!         then \
!           echo Compiling $$el; \
!           $(emacs) --eval '(setq max-lisp-eval-depth 1000)' -f 
batch-byte-compile-if-not-done $$el || exit 1; \
!         fi \
        done
  
  # Compile all Lisp files, except those from DONTCOMPILE.  This
***************
*** 275,288 ****
  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.
--- 276,302 ----
  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)/ldefs-boot.el $(lisp)/loaddefs.el;       \
!         fi                                                    \
!       fi
        cd $(lisp); rm -f *.elc */*.elc
  
  # Generate/update files for the bootstrap process.
***************
*** 297,300 ****
--- 311,315 ----
  distclean:
        -rm -f ./Makefile
  
+ # arch-tag: d4ea703a-b91c-405c-a171-8dde30b163a7
  # Makefile ends here.