diff options
Diffstat (limited to 'leim')
| -rw-r--r-- | leim/.arch-inventory | 4 | ||||
| -rw-r--r-- | leim/ChangeLog | 24 | ||||
| -rw-r--r-- | leim/Makefile.in | 20 | ||||
| -rw-r--r-- | leim/makefile.w32-in | 15 | ||||
| -rw-r--r-- | leim/quail/.arch-inventory | 4 |
5 files changed, 41 insertions, 26 deletions
diff --git a/leim/.arch-inventory b/leim/.arch-inventory deleted file mode 100644 index 3e125ae6e9c..00000000000 --- a/leim/.arch-inventory +++ /dev/null @@ -1,4 +0,0 @@ -# Auto-generated files, which ignore. -precious ^(stamp-subdir|changed\..*|leim-list\.el)$ - -# arch-tag: a4cda8ae-2a52-4d85-bd29-14e25c7ed2a2 diff --git a/leim/ChangeLog b/leim/ChangeLog index dd33ae5a32f..36788bbd5e7 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -21,6 +21,10 @@ * quail/greek.el ("greek"): Add rules for Greek style quotes. +2010-05-15 Glenn Morris <rgm@gnu.org> + + * Makefile.in (install): Remove references to CVS-related files. + 2010-05-07 Chong Yidong <cyd@stupidchicken.com> * Version 23.2 released. @@ -29,6 +33,24 @@ * quail/vntelex.el: Fix "af" rule (Bug#5836). +2010-03-27 Eli Zaretskii <eliz@gnu.org> + + * makefile.w32-in ($(TIT), $(MISC_DIC), leim-list.el): Enclose the + argument of "-l" in $(ARGQUOTE), in case it includes blanks or + other special characters. + +2010-03-18 Glenn Morris <rgm@gnu.org> + + * Makefile.in (maintainer-clean): Use bootstrap-clean. + (extraclean): Fix deletion patterns. + + * Makefile.in (dot): Remove, since ../ is used throughout the + other Makefiles. + +2010-03-10 Chong Yidong <cyd@stupidchicken.com> + + * Branch for 23.2. + 2010-02-16 Kenichi Handa <handa@m17n.org> * SKK-DIC/SKK-JISYO.L: Updated to the latest version. @@ -1190,7 +1212,7 @@ 2001-03-31 Kenichi Handa <handa@etl.go.jp> - * Makefile.in (TIT-GB): Delete quail/PY.elc and quail/ZIRANMA.elc + * Makefile.in (TIT-GB): Delete quail/PY.elc and quail/ZIRANMA.elc. (NON-TIT-BIG5): Delete ${srcdir}/quail/quick-b5.elc ${srcdir}/quail/tsang-b5.elc. (CHINESE-NON-TIT): Delete ${NON-TIT-CNS}. diff --git a/leim/Makefile.in b/leim/Makefile.in index 244063bb2c4..6eb18bc76d9 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -40,14 +40,11 @@ INSTALLDIR=$(DESTDIR)${datadir}/emacs/${version}/leim GZIP_PROG = @GZIP_PROG@ -# On IBM RS6000, double-dot gets screwed up. -dot = . - # 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 = ${dot}${dot}/src/emacs +BUILT-EMACS = ../src/emacs -buildlisppath=${srcdir}/${dot}${dot}/lisp +buildlisppath=${srcdir}/../lisp # How to run Emacs. RUN-EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \ @@ -161,7 +158,7 @@ all: ${BUILT-EMACS} ${SUBDIRS} leim-list.el ${WORLD} # To ensure that we can run Emacs. This target is ignored (never # being hit) if a user changes default value of EMACS. -${dot}${dot}/src/emacs: +../src/emacs: cd ../src; ${MAKE} ${MFLAGS} emacs ${SUBDIRS}: @@ -224,7 +221,7 @@ MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done install: all if [ ! -d ${INSTALLDIR} ] ; then \ - umask 022; ${srcdir}/${dot}${dot}/mkinstalldirs ${INSTALLDIR}; \ + umask 022; ${srcdir}/../mkinstalldirs ${INSTALLDIR}; \ else true; fi if [ x`(cd ${INSTALLDIR} && /bin/pwd)` != x`(/bin/pwd)` ] ; then \ rm -f ${INSTALLDIR}/leim-list.el; \ @@ -240,8 +237,6 @@ install: all tar -chf - quail/* ja-dic \ | (cd ${INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\ fi; \ - rm -rf ${INSTALLDIR}/CVS ${INSTALLDIR}/*/CVS; \ - rm -f ${INSTALLDIR}/.cvsignore ${INSTALLDIR}/*/.cvsignore; \ rm -f ${INSTALLDIR}/.gitignore ${INSTALLDIR}/*/.gitignore; \ rm -f ${INSTALLDIR}/.arch-inventory ${INSTALLDIR}/*/.arch-inventory; \ rm -f ${INSTALLDIR}/\#* ${INSTALLDIR}/*/\#* ; \ @@ -278,16 +273,17 @@ clean mostlyclean: # bootstrapping should not leave non-fresh .elc files behind. bootstrap-clean: clean rm -f ${WORLD} +## FIXME some compiled files go to srcdir, some don't? +# cd ${srcdir}; rm -f *.elc */*.elc distclean: clean if test -f stamp-subdir; then rm -rf ${SUBDIRS} stamp-subdir; fi rm -f Makefile -maintainer-clean: distclean - rm -f ${WORLD} +maintainer-clean: distclean bootstrap-clean extraclean: maintainer-clean - -rm -f *~ \#* m/?*~ s/?*~ + -rm -f *~ \#* */*~ */\#* .PHONY: check-declare diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in index c36e98af618..dbebc32602c 100644 --- a/leim/makefile.w32-in +++ b/leim/makefile.w32-in @@ -170,17 +170,21 @@ $(SUBDIRS): # WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as # this can break with GNU Make 3.81 and later if sh.exe is used. $(TIT): - $(RUN_EMACS) -l $(buildlisppath)/international/titdic-cnv \ + $(RUN_EMACS) -l \ + $(ARGQUOTE)$(buildlisppath)/international/titdic-cnv$(ARGQUOTE) \ --eval $(ARGQUOTE)(batch-titdic-convert t)$(ARGQUOTE) \ -dir quail $(srcdir)/CXTERM-DIC - $(RUN_EMACS) -l $(buildlisppath)/international/quail \ + $(RUN_EMACS) -l \ + $(ARGQUOTE)$(buildlisppath)/international/quail$(ARGQUOTE) \ -f batch-byte-compile $(TIT:.elc=.el) # Rule to generate quail/*.el from MISC_DIC/*.tit. $(MISC_DIC): - $(RUN_EMACS) -l $(buildlisppath)/international/titdic-cnv \ + $(RUN_EMACS) -l \ + $(ARGQUOTE)$(buildlisppath)/international/titdic-cnv$(ARGQUOTE) \ -f batch-miscdic-convert -dir quail $(srcdir)/MISC-DIC - $(RUN_EMACS) -l $(buildlisppath)/international/quail \ + $(RUN_EMACS) -l \ + $(ARGQUOTE)$(buildlisppath)/international/quail$(ARGQUOTE) \ -f batch-byte-compile $(MISC_DIC:.elc=.el) # @@ -188,7 +192,8 @@ $(MISC_DIC): # this can break with GNU Make 3.81 and later if sh.exe is used. leim-list.el: $(SUBDIRS) $(WORLD) $(srcdir)/leim-ext.el - $(DEL) leim-list.el - $(RUN_EMACS) -l $(buildlisppath)/international/quail \ + $(RUN_EMACS) -l \ + $(ARGQUOTE)$(buildlisppath)/international/quail$(ARGQUOTE) \ --eval $(ARGQUOTE)(update-leim-list-file $(DQUOTE).$(DQUOTE))$(ARGQUOTE) $(RUN_EMACS) --eval $(ARGQUOTE)(w32-append-code-lines $(DQUOTE)$@$(DQUOTE) $(DQUOTE)$(srcdir)/leim-ext.el$(DQUOTE))$(ARGQUOTE) diff --git a/leim/quail/.arch-inventory b/leim/quail/.arch-inventory deleted file mode 100644 index 8e90362b19d..00000000000 --- a/leim/quail/.arch-inventory +++ /dev/null @@ -1,4 +0,0 @@ -# Auto-generated lisp files, which ignore. -precious ^([A-Z0-9].*|tsang-.*|quick-.*)\.el$ - -# arch-tag: 3d0d3e6b-f7c3-4dce-9135-a72ba7fe095d |