[PATCH] Exclude .el files from byte-compilation and exclude them from installation given that the .elc file is not generated.
Brent Goodrick <bgoodr <at> gmail.com>
2009-01-05 15:24:39 GMT
Michael Olson writes:
> "Brent Goodrick" <bgoodr <at> gmail.com> writes:
>
> > Byte-compiling Muse from head git source on top-of-trunk CVS Emacs
> > reveals a failure if htmlize.el is not in the load-path:
>
> I've checked in a fix for each of these.
Hi Michael,
Thanks a heap. I pulled that change in and now see a new problem that
somehow I missed before. Since the hack file is not byte-compiled, the
install rule fails to find a file by that name, because it won't exist
if it is not generated. Find below the patch to the contrib/Makefile
that fixes it that I committed locally (well I _hope_ it is local ..:)
).
Be gentle with me kind sir, as I'm a git noob. I committed a change
and then ran git "git format-patch -M origin", and pasted the result of
the file here, modified the Subject line of the original message to
match what get format-patch had, which matches my git commit message
(hmm, should I have kept the commit message to a single line?) .
I used the patch instructions in
http://www.emacswiki.org/emacs/PlannerDevelopment because I didn't see
those instructions in the
http://mwolson.org/static/doc/muse/Development.html page. If I should
deliver these patches to you and/or the mailing list in a more
effective manner, let me know and I'll comply.
Thanks,
Brent
---
contrib/Makefile | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/contrib/Makefile b/contrib/Makefile
index e6103ca..859c71a 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
<at> <at> -7,7 +7,8 <at> <at> DEFS = $(shell test -f ../Makefile.defs && echo ../Makefile.defs \
include $(DEFS)
EL = $(wildcard *.el)
-ELC = $(patsubst %.el,%.elc,$(EL))
+EL_NOT_BYTE_COMPILED = htmlize-hack.el
+ELC = $(patsubst %.el,%.elc,$(filter-out $(EL_NOT_BYTE_COMPILED),$(EL)))
all: contrib
<at> <at> -16,9 +17,6 <at> <at> contrib: $(ELC)
$(PROJECT)-build.elc: ../scripts/$(PROJECT)-build.el
<at> echo $(PROJECT)-build.el is not byte-compiled
-htmlize-hack.elc: htmlize-hack.el
- <at> echo htmlize-hack.el is not byte-compiled
-
%.elc: %.el
<at> $(EMACS) -q $(SITEFLAG) -batch -l ../scripts/$(PROJECT)-build.el \
-f batch-byte-compile $<
--
--
1.5.6.5