aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2012-06-15 23:47:39 +0200
committerJuanma Barranquero2012-06-15 23:47:39 +0200
commitb6974efa3bd268e2ac72c3dc0e52585dc31d60f8 (patch)
tree3be5e593ffb28af85e2c14de354af19de52347ef
parent52f8337d7129eebc1bebcd07b61f3e0ec3a6bbc2 (diff)
downloademacs-b6974efa3bd268e2ac72c3dc0e52585dc31d60f8.tar.gz
emacs-b6974efa3bd268e2ac72c3dc0e52585dc31d60f8.zip
lisp/makefile.w32-in (COMPILE_FIRST): Synch with changes in 2008-06-22T13:57:28Z!monnier@iro.umontreal.ca.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/makefile.w32-in10
2 files changed, 8 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a56eb67e297..243a47180cb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-06-15 Juanma Barranquero <lekktu@gmail.com>
2
3 * makefile.w32-in (COMPILE_FIRST): Synch with makefile.in changes
4 in 2008-06-22T13:57:28Z!monnier@iro.umontreal.ca.
5
12012-06-15 Stefan Monnier <monnier@iro.umontreal.ca> 62012-06-15 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * emacs-lisp/cl-lib.el (cl--defsubst-expand): Autoload inliner 8 * emacs-lisp/cl-lib.el (cl--defsubst-expand): Autoload inliner
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index fc841a51e52..2137607281a 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -76,18 +76,14 @@ BIG_STACK_OPTS = --eval "(setq max-lisp-eval-depth $(BIG_STACK_DEPTH))"
76BYTE_COMPILE_FLAGS = $(BIG_STACK_OPTS) $(BYTE_COMPILE_EXTRA_FLAGS) 76BYTE_COMPILE_FLAGS = $(BIG_STACK_OPTS) $(BYTE_COMPILE_EXTRA_FLAGS)
77 77
78# Files to compile before others during a bootstrap. This is done to 78# Files to compile before others during a bootstrap. This is done to
79# speed up the bootstrap process. The CC files are compiled first 79# speed up the bootstrap process.
80# because CC mode tweaks the compilation process, and requiring
81# cc-mode when it is not compiled doesn't work during the
82# bootstrapping.
83 80
84COMPILE_FIRST = \ 81COMPILE_FIRST = \
85 $(lisp)/emacs-lisp/byte-opt.el \
86 $(lisp)/emacs-lisp/bytecomp.el \ 82 $(lisp)/emacs-lisp/bytecomp.el \
83 $(lisp)/emacs-lisp/byte-opt.el \
87 $(lisp)/emacs-lisp/macroexp.el \ 84 $(lisp)/emacs-lisp/macroexp.el \
88 $(lisp)/emacs-lisp/cconv.el \ 85 $(lisp)/emacs-lisp/cconv.el \
89 $(lisp)/progmodes/cc-mode.el \ 86 $(lisp)/emacs-lisp/autoload.el
90 $(lisp)/progmodes/cc-vars.el
91 87
92# The actual Emacs command run in the targets below. 88# The actual Emacs command run in the targets below.
93# The quotes around $(EMACS) are here because the user could type 89# The quotes around $(EMACS) are here because the user could type