diff options
| author | Glenn Morris <rgm@gnu.org> | 2015-05-23 16:38:13 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2015-05-23 16:38:13 -0700 |
| commit | 9f89ea1f84dbf708228ced0202774b36f30f2b01 (patch) | |
| tree | e339b10b0b9b90bc15a2bb14e6970215171267f3 /src/Makefile.in | |
| parent | fb11a5e11769a7ca909bf5a7798f9e7193fabb13 (diff) | |
Remove charset map files from repository, generate in first bootstrap
* admin/charsets/Makefile.in (${srcdir}/charsets.stamp): New.
(all): Create the stamp file.
(extraclean): Delete the stamp file.
* src/Makefile.in (lispintdir, charsets): New variables.
(${lispintdir}/cp51932.el, ${lispintdir}/eucjp-ms.el, ${charsets}):
New rules.
(emacs$(EXEEXT), temacs$(EXEEXT)): Depend on $charsets.
* lisp/international/cp51932.el, lisp/international/eucjp-ms.el:
* etc/charsets/*.map: Remove from repository.
; * admin/charsets/mapconv: Fix typo in output comment.
; * etc/charsets/README: Small update.
; * .gitignore: Update for charset changes.
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index ad235bbcd4d..172fa8e47cd 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -480,6 +480,14 @@ $(srcdir)/macuvs.h $(lispsource)/international/charprop.el: \ bootstrap-emacs$(EXEEXT) FORCE $(MAKE) -C ../admin/unidata all EMACS="../$(bootstrap_exe)" +lispintdir = ${lispsource}/international +${lispintdir}/cp51932.el ${lispintdir}/eucjp-ms.el: FORCE + ${MAKE} -C ../admin/charsets $(notdir $@) + +charsets = ${top_srcdir}/admin/charsets/charsets.stamp +${charsets}: FORCE + ${MAKE} -C ../admin/charsets all + ## The dumped Emacs is as functional and more efficient than ## bootstrap-emacs, so we replace the latter with the former. ## Strictly speaking, emacs does not depend directly on all of $lisp, @@ -487,7 +495,7 @@ $(srcdir)/macuvs.h $(lispsource)/international/charprop.el: \ ## on all of $lisp, and emacs depends on DOC, so it is ok to use $lisp here. emacs$(EXEEXT): temacs$(EXEEXT) \ lisp.mk $(etc)/DOC $(lisp) $(leimdir)/leim-list.el \ - $(lispsource)/international/charprop.el + $(lispsource)/international/charprop.el ${charsets} ifeq ($(CANNOT_DUMP),yes) ln -f temacs$(EXEEXT) $@ else @@ -549,7 +557,7 @@ $(lib)/libgnu.a: $(config_h) ## This goes on to affect various things, and the emacs binary fails ## to start if Vinstallation_directory has the wrong value. temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) \ - $(lib)/libgnu.a $(EMACSRES) + $(lib)/libgnu.a $(EMACSRES) ${charsets} $(AM_V_CCLD)$(CC) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \ -o temacs $(ALLOBJS) $(lib)/libgnu.a $(W32_RES_LINK) $(LIBES) $(MKDIR_P) $(etc) |