($(TIT)): Add $(SUBDIRS) as dependents, instead

of conditional invocation of make.
(TIT-GB, TIT-BIG5, NON-TIT-GB, NON-TIT-BIG5)
(NON-TIT-CNS, JAPANESE, KOREAN, THAI, VIETNAMESE, LAO, INDIAN)
(TIBETAN, LATIN, SLAVIC, GREEK, RUSSIAN, MISC): Rename all .el
files to .elc.
($(TIT)): Adjusted for the above change.
(clean mostlyclean): Likewise.
(.el.elc): New target.

diff --git a/leim/makefile.nt b/leim/makefile.nt
index b173046d62b9e57cbbcadbeab7192b5b923dd983..9d3a1e46637543749124aed5faa540266867a4b4 100644 (file)
--- a/leim/makefile.nt
+++ b/leim/makefile.nt
@@ -47,35 +47,35 @@ SUBDIRS=quail
 
 # Files generated from TIT dictionaries for Chinese GB character set.
 TIT_GB=\
-       quail/CTLau.el          \
-       quail/CCDOSPY.el        \
-       quail/Punct.el          \
-       quail/PY.el             \
-       quail/QJ.el             \
-       quail/SW.el             \
-       quail/TONEPY.el         \
-       quail/ZIRANMA.el
+       quail/CTLau.elc         \
+       quail/CCDOSPY.elc       \
+       quail/Punct.elc         \
+       quail/PY.elc            \
+       quail/QJ.elc            \
+       quail/SW.elc            \
+       quail/TONEPY.elc        \
+       quail/ZIRANMA.elc
 
 # Files generated from TIT dictionaries for Chinese BIG5 character set.
 TIT_BIG5=\
-       quail/4Corner.el        \
-       quail/ARRAY30.el        \
-       quail/CTLauB.el         \
-       quail/ECDICT.el         \
-       quail/ETZY.el           \
-       quail/Punct-b5.el       \
-       quail/PY-b5.el          \
-       quail/QJ-b5.el          \
-       quail/ZOZY.el
+       quail/4Corner.elc       \
+       quail/ARRAY30.elc       \
+       quail/CTLauB.elc        \
+       quail/ECDICT.elc        \
+       quail/ETZY.elc          \
+       quail/Punct-b5.elc      \
+       quail/PY-b5.elc         \
+       quail/QJ-b5.elc         \
+       quail/ZOZY.elc
 
 CHINESE_TIT=$(TIT_GB) $(TIT_BIG5)
 
-NON_TIT_GB=$(srcdir)/quail/py-punct.el
+NON_TIT_GB=$(srcdir)/quail/py-punct.elc
 
-NON_TIT_BIG5=$(srcdir)/quail/quick-b5.el $(srcdir)/quail/tsang-b5.el \
-            $(srcdir)/quail/pypunct-b5.el
+NON_TIT_BIG5=$(srcdir)/quail/quick-b5.elc $(srcdir)/quail/tsang-b5.elc \
+            $(srcdir)/quail/pypunct-b5.elc
 
-NON_TIT_CNS=$(srcdir)/quail/quick-cns.el $(srcdir)/quail/tsang-cns.el
+NON_TIT_CNS=$(srcdir)/quail/quick-cns.elc $(srcdir)/quail/tsang-cns.elc
 
 CHINESE_NON_TIT=$(NON_TIT_GB) $(NON_TIT_BIG5) $(NON_TIT_CNS)
 
@@ -85,38 +85,38 @@ CHINESE_BIG5=$(TIT_BIG5) $(NON_TIT_BIG5)
 
 CHINESE_CNS=$(NON_TIT_CNS) 
 
-JAPANESE=$(srcdir)/quail/japanese.el $(srcdir)/ja-dic/ja-dic.el
+JAPANESE=$(srcdir)/quail/japanese.elc $(srcdir)/ja-dic/ja-dic.elc
 
-KOREAN=        $(srcdir)/quail/hangul.el       \
-       $(srcdir)/quail/hangul3.el      \
-       $(srcdir)/quail/hanja.el        \
-       $(srcdir)/quail/hanja-jis.el    \
-       $(srcdir)/quail/symbol-ksc.el
+KOREAN=        $(srcdir)/quail/hangul.elc      \
+       $(srcdir)/quail/hangul3.elc     \
+       $(srcdir)/quail/hanja.elc       \
+       $(srcdir)/quail/hanja-jis.elc   \
+       $(srcdir)/quail/symbol-ksc.elc
 
-THAI=$(srcdir)/quail/thai.el
+THAI=$(srcdir)/quail/thai.elc
 
-VIETNAMESE=$(srcdir)/quail/viqr.el
+VIETNAMESE=$(srcdir)/quail/viqr.elc
 
-LAO=$(srcdir)/quail/lao.el $(srcdir)/quail/lrt.el
+LAO=$(srcdir)/quail/lao.elc $(srcdir)/quail/lrt.elc
 
-INDIAN=$(srcdir)/quail/devanagari.el
+INDIAN=$(srcdir)/quail/devanagari.elc
 
-TIBETAN=$(srcdir)/quail/tibetan.el
+TIBETAN=$(srcdir)/quail/tibetan.elc
 
-LATIN=$(srcdir)/quail/latin-pre.el $(srcdir)/quail/latin-post.el
+LATIN=$(srcdir)/quail/latin-pre.elc $(srcdir)/quail/latin-post.elc
 
 SLAVIC= \
-       $(srcdir)/quail/czech.el \
-       $(srcdir)/quail/slovak.el
+       $(srcdir)/quail/czech.elc \
+       $(srcdir)/quail/slovak.elc
 
-GREEK=$(srcdir)/quail/greek.el
+GREEK=$(srcdir)/quail/greek.elc
 
-RUSSIAN=$(srcdir)/quail/cyrillic.el $(srcdir)/quail/cyril-jis.el
+RUSSIAN=$(srcdir)/quail/cyrillic.elc $(srcdir)/quail/cyril-jis.elc
 
 MISC= \
-       $(srcdir)/quail/ethiopic.el \
-       $(srcdir)/quail/ipa.el \
-       $(srcdir)/quail/hebrew.el
+       $(srcdir)/quail/ethiopic.elc \
+       $(srcdir)/quail/ipa.elc \
+       $(srcdir)/quail/hebrew.elc
 
 CHINESE=$(CHINESE_GB) $(CHINESE_BIG5) $(CHINESE_CNS)
 EASTASIA=$(CHINESE) $(JAPANESE) $(KOREAN)
@@ -137,18 +137,19 @@ $(dot)$(dot)/src/emacs:
 $(SUBDIRS):
        mkdir $@
        echo stamp>stamp-subdir
-#      echo (if (fboundp 'normal-top-level-add-subdirs-to-load-path) >subdirs.el
-#      echo     (normal-top-level-add-subdirs-to-load-path)) >>subdirs.el
 
 # Rule to generate quail/*.el from CXTERM-DIC/*.tit.
-$(TIT):
-       if not exist quail $(MAKE) -f makefile.nt quail
+$(TIT): $(SUBDIRS)
        set EMACSLOADPATH=$(buildlisppath)
        $(RUN_EMACS) -l $(buildlisppath)/international/titdic-cnv \
            --eval "(batch-titdic-convert t)" -dir quail $(srcdir)/CXTERM-DIC
        $(RUN_EMACS)  -l $(buildlisppath)/international/quail \
            -f batch-byte-compile $(TIT)
 
+.el.elc:
+       set EMACSLOADPATH=$(buildlisppath)
+       $(RUN_EMACS) -f batch-byte-compile $<
+
 leim-list.el: $(SUBDIRS) $(WORLD)
        set EMACSLOADPATH=$(buildlisppath)
        $(RUN_EMACS) -l $(buildlisppath)/international/quail \
@@ -160,7 +161,6 @@ install: all
        - $(DEL) $(INSTALLDIR)\same-dir.tst
        echo SameDirTest > $(INSTALLDIR)\same-dir.tst
        if not exist same-dir.tst $(CP) leim-list.el $(INSTALLDIR)
-#      if not exist same-dir.tst $(CP) subdirs.el $(INSTALLDIR)
        if not exist same-dir.tst $(CP_DIR) quail $(INSTALLDIR)\quail
        if not exist same-dir.tst $(CP_DIR) ja-dic $(INSTALLDIR)\ja-dic
        - $(DEL) $(INSTALLDIR)\same-dir.tst

diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in
index b2d1424a09cadf24f0104f90c1146f288d67e8ff..2cdf38f07402b0f5eacdf41866c26cbca9bb427a 100644 (file)
--- a/leim/makefile.w32-in
+++ b/leim/makefile.w32-in
@@ -42,35 +42,35 @@ SUBDIRS=quail
 \r
 # Files generated from TIT dictionaries for Chinese GB character set.\r
 TIT_GB=\\r
-       quail/CTLau.el          \\r
-       quail/CCDOSPY.el        \\r
-       quail/Punct.el          \\r
-       quail/PY.el             \\r
-       quail/QJ.el             \\r
-       quail/SW.el             \\r
-       quail/TONEPY.el         \\r
-       quail/ZIRANMA.el\r
+       quail/CTLau.elc         \\r
+       quail/CCDOSPY.elc       \\r
+       quail/Punct.elc         \\r
+       quail/PY.elc            \\r
+       quail/QJ.elc            \\r
+       quail/SW.elc            \\r
+       quail/TONEPY.elc        \\r
+       quail/ZIRANMA.elc\r
 \r
 # Files generated from TIT dictionaries for Chinese BIG5 character set.\r
 TIT_BIG5=\\r
-       quail/4Corner.el        \\r
-       quail/ARRAY30.el        \\r
-       quail/CTLauB.el         \\r
-       quail/ECDICT.el         \\r
-       quail/ETZY.el           \\r
-       quail/Punct-b5.el       \\r
-       quail/PY-b5.el          \\r
-       quail/QJ-b5.el          \\r
-       quail/ZOZY.el\r
+       quail/4Corner.elc       \\r
+       quail/ARRAY30.elc       \\r
+       quail/CTLauB.elc        \\r
+       quail/ECDICT.elc        \\r
+       quail/ETZY.elc          \\r
+       quail/Punct-b5.elc      \\r
+       quail/PY-b5.elc         \\r
+       quail/QJ-b5.elc         \\r
+       quail/ZOZY.elc\r
 \r
 CHINESE_TIT=$(TIT_GB) $(TIT_BIG5)\r
 \r
-NON_TIT_GB=$(srcdir)/quail/py-punct.el\r
+NON_TIT_GB=$(srcdir)/quail/py-punct.elc\r
 \r
-NON_TIT_BIG5=$(srcdir)/quail/quick-b5.el $(srcdir)/quail/tsang-b5.el \\r
-            $(srcdir)/quail/pypunct-b5.el\r
+NON_TIT_BIG5=$(srcdir)/quail/quick-b5.elc $(srcdir)/quail/tsang-b5.elc \\r
+            $(srcdir)/quail/pypunct-b5.elc\r
 \r
-NON_TIT_CNS=$(srcdir)/quail/quick-cns.el $(srcdir)/quail/tsang-cns.el\r
+NON_TIT_CNS=$(srcdir)/quail/quick-cns.elc $(srcdir)/quail/tsang-cns.elc\r
 \r
 CHINESE_NON_TIT=$(NON_TIT_GB) $(NON_TIT_BIG5) $(NON_TIT_CNS)\r
 \r
@@ -80,38 +80,38 @@ CHINESE_BIG5=$(TIT_BIG5) $(NON_TIT_BIG5)
 \r
 CHINESE_CNS=$(NON_TIT_CNS) \r
 \r
-JAPANESE=$(srcdir)/quail/japanese.el $(srcdir)/ja-dic/ja-dic.el\r
+JAPANESE=$(srcdir)/quail/japanese.elc $(srcdir)/ja-dic/ja-dic.elc\r
 \r
-KOREAN=        $(srcdir)/quail/hangul.el       \\r
-       $(srcdir)/quail/hangul3.el      \\r
-       $(srcdir)/quail/hanja.el        \\r
-       $(srcdir)/quail/hanja-jis.el    \\r
-       $(srcdir)/quail/symbol-ksc.el\r
+KOREAN=        $(srcdir)/quail/hangul.elc      \\r
+       $(srcdir)/quail/hangul3.elc     \\r
+       $(srcdir)/quail/hanja.elc       \\r
+       $(srcdir)/quail/hanja-jis.elc   \\r
+       $(srcdir)/quail/symbol-ksc.elc\r
 \r
-THAI=$(srcdir)/quail/thai.el\r
+THAI=$(srcdir)/quail/thai.elc\r
 \r
-VIETNAMESE=$(srcdir)/quail/viqr.el\r
+VIETNAMESE=$(srcdir)/quail/viqr.elc\r
 \r
-LAO=$(srcdir)/quail/lao.el $(srcdir)/quail/lrt.el\r
+LAO=$(srcdir)/quail/lao.elc $(srcdir)/quail/lrt.elc\r
 \r
-INDIAN=$(srcdir)/quail/devanagari.el\r
+INDIAN=$(srcdir)/quail/devanagari.elc\r
 \r
-TIBETAN=$(srcdir)/quail/tibetan.el\r
+TIBETAN=$(srcdir)/quail/tibetan.elc\r
 \r
-LATIN=$(srcdir)/quail/latin-pre.el $(srcdir)/quail/latin-post.el\r
+LATIN=$(srcdir)/quail/latin-pre.elc $(srcdir)/quail/latin-post.elc\r
 \r
 SLAVIC= \\r
-       $(srcdir)/quail/czech.el \\r
-       $(srcdir)/quail/slovak.el\r
+       $(srcdir)/quail/czech.elc \\r
+       $(srcdir)/quail/slovak.elc\r
 \r
-GREEK=$(srcdir)/quail/greek.el\r
+GREEK=$(srcdir)/quail/greek.elc\r
 \r
-RUSSIAN=$(srcdir)/quail/cyrillic.el $(srcdir)/quail/cyril-jis.el\r
+RUSSIAN=$(srcdir)/quail/cyrillic.elc $(srcdir)/quail/cyril-jis.elc\r
 \r
 MISC= \\r
-       $(srcdir)/quail/ethiopic.el \\r
-       $(srcdir)/quail/ipa.el \\r
-       $(srcdir)/quail/hebrew.el\r
+       $(srcdir)/quail/ethiopic.elc \\r
+       $(srcdir)/quail/ipa.elc \\r
+       $(srcdir)/quail/hebrew.elc\r
 \r
 CHINESE=$(CHINESE_GB) $(CHINESE_BIG5) $(CHINESE_CNS)\r
 EASTASIA=$(CHINESE) $(JAPANESE) $(KOREAN)\r
@@ -134,17 +134,18 @@ $(SUBDIRS):
        echo stamp>stamp-subdir\r
 \r
 # Rule to generate quail/*.el from CXTERM-DIC/*.tit.\r
-$(TIT):\r
-#      if not exist quail $(MAKE) quail\r
-       set emacs_dir=$(INSTALL_DIR)\r
+$(TIT):        $(SUBDIRS)\r
        set EMACSLOADPATH=$(buildlisppath)\r
        $(SETLOADPATH) $(RUN_EMACS) -l $(buildlisppath)/international/titdic-cnv \\r
            --eval $(ARGQUOTE)(batch-titdic-convert t)$(ARGQUOTE) -dir quail $(srcdir)/CXTERM-DIC\r
        $(SETLOADPATH) $(RUN_EMACS)  -l $(buildlisppath)/international/quail \\r
-           -f batch-byte-compile $(TIT)\r
+           -f batch-byte-compile $(TIT:.elc=.el)\r
+\r
+.el.elc:\r
+       set EMACSLOADPATH=$(buildlisppath)\r
+       $(SETLOADPATH) $(RUN_EMACS) -f batch-byte-compile $<\r
 \r
 leim-list.el: $(SUBDIRS) $(WORLD)\r
-       set emacs_dir=$(INSTALL_DIR)\r
        set EMACSLOADPATH=$(buildlisppath)\r
        $(SETLOADPATH) $(RUN_EMACS) -l $(buildlisppath)/international/quail \\r
            --eval $(ARGQUOTE)(update-leim-list-file $(DQUOTE).$(DQUOTE))$(ARGQUOTE)\r
@@ -160,8 +161,8 @@ install: all
        - $(DEL) $(INSTALL_DIR)/same-dir.tst\r
 \r
 clean mostlyclean:\r
-       - $(FOREACH) $(TIT) $(FORDO) $(DEL) $(FORVAR)c $(ENDFOR)\r
        - $(FOREACH) $(TIT) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)\r
+       - $(FOREACH) $(TIT:.elc=.el) $(FORDO) $(DEL) $(FORVAR) $(ENDFOR)\r
        - $(DEL) leim-list.el\r
 \r
 distclean maintainer-clean:\r