aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2013-11-27 13:25:44 -0500
committerGlenn Morris2013-11-27 13:25:44 -0500
commit7e3bf78c8900d7bac3bbeca038a99f5ce7afeeee (patch)
treeab254409204419f0e2250372d260c85abe377aa4 /src
parentccd4fb3d2ec32d1db12412231d6a7d507039de9d (diff)
downloademacs-7e3bf78c8900d7bac3bbeca038a99f5ce7afeeee.tar.gz
emacs-7e3bf78c8900d7bac3bbeca038a99f5ce7afeeee.zip
Stop keeping generated Unicode lisp files in the repository
Ref: http://lists.gnu.org/archive/html/emacs-devel/2013-11/msg01023.html * admin/unidata/Makefile.in (all, install, clean, bootstrap-clean) (distclean, maintainer-clean): Declare as PHONY. (compile, extraclean): New. (${DSTDIR}/charprop.el): Depend on source files rather than intermediate products. * lisp/international/charprop.el, lisp/international/uni-bidi.el: * lisp/international/uni-category.el, lisp/international/uni-combining.el: * lisp/international/uni-comment.el, lisp/international/uni-decimal.el: * lisp/international/uni-decomposition.el, lisp/international/uni-digit.el: * lisp/international/uni-lowercase.el, lisp/international/uni-mirrored.el: * lisp/international/uni-name.el, lisp/international/uni-numeric.el: * lisp/international/uni-old-name.el, lisp/international/uni-titlecase.el: * lisp/international/uni-uppercase.el: Remove generated files from VCS repository. * src/Makefile.in ($(lispsource)/international/charprop.el): New. (emacs$(EXEEXT)): Depend on charprop.el. * Makefile.in: Comment. * .bzrignore: Add generated Unicode files.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/Makefile.in6
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 89d1fb30774..78dd2362018 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-11-27 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in ($(lispsource)/international/charprop.el): New.
4 (emacs$(EXEEXT)): Depend on charprop.el.
5
12013-11-27 Eli Zaretskii <eliz@gnu.org> 62013-11-27 Eli Zaretskii <eliz@gnu.org>
2 7
3 * fileio.c (Finsert_file_contents): Invalidate buffer caches when 8 * fileio.c (Finsert_file_contents): Invalidate buffer caches when
diff --git a/src/Makefile.in b/src/Makefile.in
index bdc79677c86..7d91928acfe 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -417,13 +417,17 @@ all: emacs$(EXEEXT) $(OTHER_FILES)
417$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT) 417$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
418 cd ../leim && $(MAKE) $(MFLAGS) leim-list.el EMACS="$(bootstrap_exe)" 418 cd ../leim && $(MAKE) $(MFLAGS) leim-list.el EMACS="$(bootstrap_exe)"
419 419
420$(lispsource)/international/charprop.el: bootstrap-emacs$(EXEEXT)
421 cd ../admin/unidata && $(MAKE) $(MFLAGS) all EMACS="../$(bootstrap_exe)"
422
420## The dumped Emacs is as functional and more efficient than 423## The dumped Emacs is as functional and more efficient than
421## bootstrap-emacs, so we replace the latter with the former. 424## bootstrap-emacs, so we replace the latter with the former.
422## Strictly speaking, emacs does not depend directly on all of $lisp, 425## Strictly speaking, emacs does not depend directly on all of $lisp,
423## since not all pieces are used on all platforms. But DOC depends 426## since not all pieces are used on all platforms. But DOC depends
424## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here. 427## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here.
425emacs$(EXEEXT): temacs$(EXEEXT) $(ADDSECTION) \ 428emacs$(EXEEXT): temacs$(EXEEXT) $(ADDSECTION) \
426 $(etc)/DOC $(lisp) $(leimdir)/leim-list.el 429 $(etc)/DOC $(lisp) $(leimdir)/leim-list.el \
430 $(lispsource)/international/charprop.el
427 if test "$(CANNOT_DUMP)" = "yes"; then \ 431 if test "$(CANNOT_DUMP)" = "yes"; then \
428 rm -f emacs$(EXEEXT); \ 432 rm -f emacs$(EXEEXT); \
429 ln temacs$(EXEEXT) emacs$(EXEEXT); \ 433 ln temacs$(EXEEXT) emacs$(EXEEXT); \