[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/makefile.w32-in
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/makefile.w32-in |
Date: |
Mon, 15 Sep 2003 22:38:36 -0400 |
Index: emacs/lisp/makefile.w32-in
diff -c emacs/lisp/makefile.w32-in:1.31 emacs/lisp/makefile.w32-in:1.32
*** emacs/lisp/makefile.w32-in:1.31 Mon Sep 1 11:45:13 2003
--- emacs/lisp/makefile.w32-in Mon Sep 15 22:38:36 2003
***************
*** 87,92 ****
--- 87,93 ----
$(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 \
***************
*** 352,373 ****
recompile: doit
$(emacs) -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.
# Need separate version for sh and native cmd.exe
bootstrap-clean: bootstrap-clean-$(SHELLTYPE) loaddefs.el
bootstrap-clean-CMD:
# if exist $(EMACS) $(MAKE) $(MFLAGS) autoloads
-for %f in (. $(WINS)) do for %g in (%f\*.elc) do @$(DEL) %g
bootstrap-clean-SH:
# if test -f $(EMACS); then $(MAKE) $(MFLAGS) autoloads; fi
# -rm -f $(lisp)/*.elc $(lisp)/*/*.elc
-for dir in . $(WINS); do rm -f $$dir/*.elc; done
# Generate/update files for the bootstrap process.
--- 353,385 ----
recompile: doit
$(emacs) -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.
# Need separate version for sh and native cmd.exe
bootstrap-clean: bootstrap-clean-$(SHELLTYPE) loaddefs.el
bootstrap-clean-CMD:
# if exist $(EMACS) $(MAKE) $(MFLAGS) autoloads
+ if not exist $(lisp)\loaddefs.el cp $(lisp)/loaddefs-boot.el
$(lisp)/loaddefs.el
-for %f in (. $(WINS)) do for %g in (%f\*.elc) do @$(DEL) %g
bootstrap-clean-SH:
# if test -f $(EMACS); then $(MAKE) $(MFLAGS) autoloads; fi
# -rm -f $(lisp)/*.elc $(lisp)/*/*.elc
+ if ! test -r $(lisp)/loaddefs.el; then \
+ cp $(lisp)/loaddefs-boot.el $(lisp)/loaddefs.el; \
+ fi
-for dir in . $(WINS); do rm -f $$dir/*.elc; done
# Generate/update files for the bootstrap process.