Move runtime leim lisp files to lisp/leim directory

This allows us to reuse much of the lisp build and installation machinery,
rather than duplicating it.

* Makefile.in (abs_builddir, leimdir): Remove.
(buildlisppath, SUBDIR, COPYDIR, COPYDESTS): No more leim directory.
(epaths-force-w32): No longer set BLD.
(leim): Remove.
(install-arch-indep): No longer run or install leim.
(mostlyclean, clean): No longer run leim rule.
(bootstrap-clean): Change leim target.
(maintainer-clean): Add leim.
(check-declare): Remove leim.

* README: Update for leim changes.

* configure.ac (leimdir): Remove.
(standardlisppath): No more leimdir.

* make-dist: Update for files from leim/ now being in lisp/leim/.

* doc/lispref/loading.texi (Library Search):
* doc/lispref/os.texi (Startup Summary): No more leim directory.

* leim/Makefile.in (leimdir): New variable.
(TIT_GB, TIT_BIG5, MISC, changed.tit, changed.misc)
(${leimdir}/leim-list.el, ${leimdir}/ja-dic/ja-dic.el):
Generate in $leimdir.
(all): Remove compilation, add ja-dic.
(leim-list.el): Now PHONY.
(setwins, compile-targets, compile-main, clean, mostlyclean)
(extraclean): Remove.
(bootstrap-clean): Delete all generated files.

* leim/README: Update for moved leim/ directory.

* leim/leim-ext.el (ucs-input-activate, hangul-input-method-activate):
Remove manual autoloads; now in loaddefs.el.
Disable byte-compile, version-control, autoloads in the output.

* lisp/Makefile.in (setwins_for_subdirs): Skip leim/ directory.
(compile-main): Depend on lisp/leim rule.
(leim): New rule.

* lisp/loadup.el: Move leim-list.el to leim/ subdirectory.

* lisp/startup.el (normal-top-level): No more leim directory.

* lisp/international/ja-dic-cnv.el (skkdic-convert):
Disable version-control and autoloads in output files.
* lisp/international/titdic-cnv.el (titdic-convert, miscdic-convert):
Disable version-control and autoloads in output files.

* lisp/leim/quail: Move here from ../leim.

* lisp/leim/quail/hangul.el (hangul-input-method-activate):
Add autoload cookie.
(generated-autoload-load-name): Set file-local value.

* lisp/leim/quail/uni-input.el (ucs-input-activate): Add autoload cookie.
(generated-autoload-load-name): Set file-local value.

* nt/README.W32:
* nt/addpm.c (env_vars):
* nt/epaths.nt (PATH_LOADSEARCH, PATH_DUMPLOADSEARCH):
* nt/paths.h (PATH_LOADSEARCH): No more leim directory.

* src/Makefile.in (leimdir): Now in lisp source directory.
($(leimdir)/leim-list.el): Just use ../leim .

* src/epaths.in (PATH_DUMPLOADSEARCH):

* src/lread.c (load_path_default):

* src/nsterm.m (ns_load_path): No more leim directory.

* .bzrignore: Update for relocated leim files.

1 files changed, 50 insertions, 92 deletions

diff --git a/leim/Makefile.in b/leim/Makefile.in
index 5a6f2ff4795..21bea3ca2eb 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -26,8 +26,11 @@ SHELL = @SHELL@
 # Here are the things that we expect ../configure to edit.
 srcdir=@srcdir@
 
+# Where the generated files go.
+leimdir = ${srcdir}/../lisp/leim
+
 # Which Emacs to use to convert TIT files to Emacs Lisp files,
-# byte-compile Emacs Lisp files, and generate the file leim-list.el.
+# and generate the file leim-list.el.
 EMACS = ../src/emacs
 
 # How to run Emacs.
@@ -38,45 +41,39 @@ MKDIR_P = @MKDIR_P@
 
 # Files generated from TIT dictionaries for Chinese GB character set.
 TIT_GB=\
-	quail/CCDOSPY.el	\
-	quail/Punct.el		\
-	quail/QJ.el		\
-	quail/SW.el		\
-	quail/TONEPY.el
+	${leimdir}/quail/CCDOSPY.el	\
+	${leimdir}/quail/Punct.el	\
+	${leimdir}/quail/QJ.el		\
+	${leimdir}/quail/SW.el		\
+	${leimdir}/quail/TONEPY.el
 
 # Files generated from TIT dictionaries for Chinese BIG5 character set.
 TIT_BIG5=\
-	quail/4Corner.el	\
-	quail/ARRAY30.el	\
-	quail/ECDICT.el	\
-	quail/ETZY.el		\
-	quail/Punct-b5.el	\
-	quail/PY-b5.el		\
-	quail/QJ-b5.el		\
-	quail/ZOZY.el
+	${leimdir}/quail/4Corner.el	\
+	${leimdir}/quail/ARRAY30.el	\
+	${leimdir}/quail/ECDICT.el	\
+	${leimdir}/quail/ETZY.el	\
+	${leimdir}/quail/Punct-b5.el	\
+	${leimdir}/quail/PY-b5.el	\
+	${leimdir}/quail/QJ-b5.el	\
+	${leimdir}/quail/ZOZY.el
 
 CHINESE_TIT=${TIT_GB} ${TIT_BIG5}
 
 MISC= \
-	quail/tsang-b5.el	\
-	quail/quick-b5.el	\
-	quail/tsang-cns.el	\
-	quail/quick-cns.el	\
-	quail/PY.el		\
-	quail/ZIRANMA.el	\
-	quail/CTLau.el		\
-	quail/CTLau-b5.el
+	${leimdir}/quail/tsang-b5.el	\
+	${leimdir}/quail/quick-b5.el	\
+	${leimdir}/quail/tsang-cns.el	\
+	${leimdir}/quail/quick-cns.el	\
+	${leimdir}/quail/PY.el		\
+	${leimdir}/quail/ZIRANMA.el	\
+	${leimdir}/quail/CTLau.el	\
+	${leimdir}/quail/CTLau-b5.el
 
 ## The generated .el files.
 TIT_MISC=${CHINESE_TIT} ${MISC}
 
-.SUFFIXES: .elc .el
-
-.el.elc:
-	@echo Compiling $<
-	@${RUN_EMACS} -l international/quail -f batch-byte-compile $<
-
-all: leim-list.el compile-main
+all: ${leimdir}/leim-list.el ${leimdir}/ja-dic/ja-dic.el
 .PHONY: all
 
 TIT_SOURCES= \
@@ -106,10 +103,10 @@ ${CHINESE_TIT}: changed.tit
 ## quail/%.el: CXTERM-DIC/%.tit
 ## It doesn't seem possible to do this with VPATH and suffix rules.
 changed.tit: ${TIT_SOURCES}
-	@${MKDIR_P} quail
+	@${MKDIR_P} ${leimdir}/quail
 	${RUN_EMACS} -l titdic-cnv \
-	  -f batch-titdic-convert -dir quail ${srcdir}/CXTERM-DIC; \
-	  echo "changed" > $@
+	  -f batch-titdic-convert -dir ${leimdir}/quail ${srcdir}/CXTERM-DIC
+	echo "changed" > $@
 
 MISC_SOURCES= \
 	${srcdir}/MISC-DIC/CTLau-b5.html \
@@ -123,75 +120,36 @@ ${MISC}: changed.misc
 	@true
 
 changed.misc: ${MISC_SOURCES}
-	@${MKDIR_P} quail
+	@${MKDIR_P} ${leimdir}/quail
 	${RUN_EMACS} -l titdic-cnv \
-	  -f batch-miscdic-convert -dir quail ${srcdir}/MISC-DIC; \
-	  echo "changed" > $@
-
-leim-list.el: ${TIT_MISC} ${srcdir}/leim-ext.el
-	rm -f leim-list.el
-	if [ "`cd ${srcdir} && /bin/pwd`" = "`/bin/pwd`" ] ; then \
-	  ${RUN_EMACS} -l international/quail \
-	    --eval "(update-leim-list-file \".\")" ; \
-	else \
-	  ${RUN_EMACS} -l international/quail \
-	    --eval "(update-leim-list-file \".\" (unmsys--file-name \"${srcdir}\"))" ; \
-	fi
+	  -f batch-miscdic-convert -dir ${leimdir}/quail ${srcdir}/MISC-DIC
+	echo "changed" > $@
+
+.PHONY: leim-list.el
+leim-list.el: ${leimdir}/leim-list.el
+
+${leimdir}/leim-list.el: ${TIT_MISC} ${srcdir}/leim-ext.el
+	rm -f $@
+	${RUN_EMACS} -l international/quail \
+	  --eval "(update-leim-list-file (unmsys--file-name \"${leimdir}\"))"
 	sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@
 
-$(srcdir)/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L
-	@$(MKDIR_P) $(srcdir)/ja-dic
+${leimdir}/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L
+	@$(MKDIR_P) $(leimdir)/ja-dic
 	$(RUN_EMACS) -batch -l ja-dic-cnv \
-	  -f batch-skkdic-convert -dir "$(srcdir)/ja-dic" \
+	  -f batch-skkdic-convert -dir "$(leimdir)/ja-dic" \
 	  "$(srcdir)/SKK-DIC/SKK-JISYO.L"
 
-## Following adapted from lisp/Makefile.in.
-setwins=wins="${srcdir}/ja-dic quail"; \
-	[ "`cd ${srcdir} && /bin/pwd`" != "`/bin/pwd`" ] && \
-	wins="$$wins ${srcdir}/quail"
-
-.PHONY: compile-targets
-# TARGETS is set dynamically in the recursive call from `compile-main'.
-compile-targets: $(TARGETS)
-
-# Compile all the Elisp files that need it.  Beware: it approximates
-# `no-byte-compile', so watch out for false-positives!
-.PHONY: compile-main
-compile-main: ${TIT_MISC} $(srcdir)/ja-dic/ja-dic.el
-	@($(setwins); \
-	els=`echo "$$wins " | sed -e 's| |/*.el |g'`; \
-	for el in $$els; do \
-	  test -f $$el || continue; \
-	  test ! -f $${el}c && GREP_OPTIONS= grep '^;.*no-byte-compile: t' $$el > /dev/null && continue; \
-	  echo "$${el}c"; \
-	done | xargs echo) | \
-	while read chunk; do \
-	  $(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \
-	done
-
-.PHONY: clean mostlyclean bootstrap-clean distclean maintainer-clean extraclean
-
-clean mostlyclean:
-	rm -f ${TIT_MISC} ${TIT_MISC:.el=.elc} \
-		leim-list.el changed.tit changed.misc
+.PHONY: bootstrap-clean distclean maintainer-clean
 
-# The following target is needed because the `clean' target only removes
-# TIT-generated files and doesn't touch compiled Quail packages.  But
-# bootstrapping should not leave non-fresh .elc files behind.
-bootstrap-clean: clean
-	$(setwins); for w in $$wins; do rm -f $$w/*.elc; done
+bootstrap-clean:
+	rm -f ${TIT_MISC} ${TIT_MISC:.el=.elc} \
+	  ${leimdir}/leim-list.el changed.tit changed.misc
+	rm -rf ${leimdir}/ja-dic
 
-distclean: clean
-	-[ "`cd ${srcdir} && /bin/pwd`" != "`/bin/pwd`" ] && rm -rf quail
+distclean:
 	rm -f Makefile
 
 maintainer-clean: distclean bootstrap-clean
 
-extraclean: maintainer-clean
-	-rm -f *~ \#* */*~ */\#*
-
-.PHONY: check-declare
-
-check-declare:
-	$(RUN_EMACS) -l check-declare \
-	  --eval '(check-declare-directory (unmsys--file-name "$(srcdir)"))'
+### Makefile.in ends here