[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r107821: Rename leim/Makefile's BUILT
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r107821: Rename leim/Makefile's BUILT_EMACS to EMACS |
Date: |
Mon, 09 Apr 2012 16:37:08 -0400 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 107821
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-04-09 16:37:08 -0400
message:
Rename leim/Makefile's BUILT_EMACS to EMACS
* leim/Makefile.in (EMACS): Rename from BUILT_EMACS.
(RUN_EMACS, compile-main): Update for this change.
* src/Makefile.in ($(leimdir)/leim-list.el):
Pass EMACS rather than BUILT_EMACS.
modified:
leim/ChangeLog
leim/Makefile.in
src/ChangeLog
src/Makefile.in
=== modified file 'leim/ChangeLog'
--- a/leim/ChangeLog 2012-04-09 20:34:05 +0000
+++ b/leim/ChangeLog 2012-04-09 20:37:08 +0000
@@ -1,5 +1,8 @@
2012-04-09 Glenn Morris <address@hidden>
+ * Makefile.in (EMACS): Rename from BUILT_EMACS.
+ (RUN_EMACS, compile-main): Update for this change.
+
* Makefile.in (../src/emacs): Remove this rule, no longer relevant
since leim distributed with Emacs (eg lisp/ has no such rule).
(all): Remove $BUILT_EMACS dependence.
=== modified file 'leim/Makefile.in'
--- a/leim/Makefile.in 2012-04-09 20:34:05 +0000
+++ b/leim/Makefile.in 2012-04-09 20:37:08 +0000
@@ -41,13 +41,13 @@
# Which Emacs to use to convert TIT files to Emacs Lisp files,
# byte-compile Emacs Lisp files, and generate the file leim-list.el.
-BUILT_EMACS = ../src/emacs
+EMACS = ../src/emacs
buildlisppath=${srcdir}/../lisp
# How to run Emacs.
RUN_EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \
- ${BUILT_EMACS} -batch --no-site-file --no-site-lisp
+ ${EMACS} -batch --no-site-file --no-site-lisp
# Subdirectories to be made if ${srcdir} is different from the current
# directory.
@@ -171,7 +171,7 @@
echo "$${el}c"; \
done | xargs echo) | \
while read chunk; do \
- $(MAKE) $(MFLAGS) compile-targets BUILT_EMACS="$(BUILT_EMACS)"
TARGETS="$$chunk"; \
+ $(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk";
\
done
MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-04-09 12:46:16 +0000
+++ b/src/ChangeLog 2012-04-09 20:37:08 +0000
@@ -1,3 +1,8 @@
+2012-04-09 Glenn Morris <address@hidden>
+
+ * Makefile.in ($(leimdir)/leim-list.el):
+ Pass EMACS rather than BUILT_EMACS.
+
2012-04-09 Teodor Zlatanov <address@hidden>
* process.c (make_process):
=== modified file 'src/Makefile.in'
--- a/src/Makefile.in 2012-04-09 06:47:33 +0000
+++ b/src/Makefile.in 2012-04-09 20:37:08 +0000
@@ -395,7 +395,7 @@
all: emacs$(EXEEXT) $(OTHER_FILES)
$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
- cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el
BUILT_EMACS=$(bootstrap_exe)
+ cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el EMACS=$(bootstrap_exe)
## Does anyone ever pay attention to the load-path-shadows output here?
## The dumped Emacs is as functional and more efficient than
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r107821: Rename leim/Makefile's BUILT_EMACS to EMACS,
Glenn Morris <=