X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/afdc8040e4bba4f88a1e067dc34b904898bcc967..9495add8c6b3d6dc29cab3b3750b788ad9f045d9:/leim/Makefile.in?ds=sidebyside

diff --git a/leim/Makefile.in b/leim/Makefile.in
index 5b39166709..7d550fa759 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -1,6 +1,11 @@
 # Makefile for leim subdirectory in GNU Emacs.
-# Copyright (C) 1997 Electrotechnical Laboratory, JAPAN.
-# Licensed to the Free Software Foundation.
+# Copyright (C) 1997,98,1999,2000,2001 Electrotechnical Laboratory, JAPAN.
+#   Licensed to the Free Software Foundation.
+# Copyright (C) 1997,98,1999,2000,01,02,03,2004
+#   Free Software Foundation, Inc.
+# Copyright (C) 2001,02,03,2004
+#   National Institute of Advanced Industrial Science and Technology (AIST)
+#   Registration Number H14PRO021
 
 # This file is part of GNU Emacs.
 
@@ -16,8 +21,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # Avoid trouble on systems where the `SHELL' variable might be
 # inherited from the environment.
@@ -78,7 +83,7 @@ CHINESE-NON-TIT=${NON-TIT-GB} ${NON-TIT-BIG5}
 
 CHINESE-GB=${TIT-GB} ${NON-TIT-GB}
 
-CHINESE-BIG5=${TIT-BIG5} ${NON-TIT-BIG5} 
+CHINESE-BIG5=${TIT-BIG5} ${NON-TIT-BIG5}
 
 JAPANESE=${srcdir}/quail/japanese.elc ${srcdir}/ja-dic/ja-dic.elc
 
@@ -91,7 +96,7 @@ KOREAN=	${srcdir}/quail/hangul.elc	\
 
 THAI=${srcdir}/quail/thai.elc
 
-VIETNAMESE=${srcdir}/quail/viqr.elc
+VIETNAMESE=${srcdir}/quail/viqr.elc ${srcdir}/quail/vntelex.elc
 
 LAO=${srcdir}/quail/lao.elc ${srcdir}/quail/lrt.elc
 
@@ -110,19 +115,21 @@ UNICODE=${srcdir}/quail/sgml-input.elc ${srcdir}/quail/rfc1345.elc \
 
 SLAVIC= \
 	${srcdir}/quail/czech.elc \
+	${srcdir}/quail/croatian.elc \
 	${srcdir}/quail/slovak.elc
 
 GREEK=${srcdir}/quail/greek.elc
 
 RUSSIAN=${srcdir}/quail/cyrillic.elc ${srcdir}/quail/cyril-jis.elc
 
-MISC= \
+OTHERS= \
 	${srcdir}/quail/ethiopic.elc \
 	${srcdir}/quail/ipa.elc \
 	${srcdir}/quail/hebrew.elc \
-	${srcdir}/quail/georgian.elc
+	${srcdir}/quail/georgian.elc \
+	${srcdir}/quail/sisheng.elc
 
-MISC-DIC=\
+MISC= \
 	quail/tsang-b5.elc	\
 	quail/quick-b5.elc	\
 	quail/tsang-cns.elc	\
@@ -136,17 +143,17 @@ CHINESE=${CHINESE-GB} ${CHINESE-BIG5}
 EASTASIA=${CHINESE} ${JAPANESE} ${KOREAN}
 ASIA=${EASTASIA} ${THAI} ${VIETNAMESE} ${LAO} ${INDIAN} ${TIBETAN}
 EUROPEAN=${LATIN} ${SLAVIC} ${GREEK} ${RUSSIAN}
-WORLD=${ASIA} ${EUROPEAN} ${MISC} ${MISC-DIC} ${UNICODE}
+WORLD=${ASIA} ${EUROPEAN} ${OTHERS} ${MISC} ${UNICODE}
 
-TIT=${CHINESE-TIT}
-NON-TIT=${CHINESE-NON-TIT} ${JAPANESE} ${KOREAN} ${EUROPEAN} ${MISC}
+TIT-MISC=${CHINESE-TIT} ${MISC}
+NON-TIT-MISC=${CHINESE-NON-TIT} ${JAPANESE} ${KOREAN} ${EUROPEAN} ${OTHERS}
 
 .SUFFIXES: .elc .el
 
 .el.elc:
 	${RUN-EMACS} -f batch-byte-compile $<
 
-all: ${BUILT-EMACS} ${SUBDIRS} ${TIT} ${MISC-DIC} leim-list.el
+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.
@@ -157,38 +164,48 @@ ${SUBDIRS}:
 	mkdir $@
 	touch stamp-subdir
 
-# The rules which generate ${TIT} and ${MISC-DIC} files create them all
-# in one go.  So we need to prevent parallel execution for that target,
-# otherwise Emacs complains about files being locked.  .NOTPARALLEL is
-# for GNU Make, .NO_PARALLEL is for other Make's.
-.NOTPARALLEL: ${TIT} ${MISC-DIC}
-
-.NO_PARALLEL: ${TIT} ${MISC-DIC}
-
-# Rule to generate quail/*.el from CXTERM-DIC/*.tit.
-# The "if [ -f $@ ]; then true; " part prevents parallel Make's
-# which don't honor .NOTPARALLEL, such as SGI's Make, from running
-# this rule many times, one each for every file it creates.
-${TIT}:
-	if [ -d quail ]; then true; else make quail; fi
-	if [ -f $@ ]; then true; else \
-	 ${RUN-EMACS} -l ${buildlisppath}/international/titdic-cnv \
-	  --eval '(batch-titdic-convert t)' -dir quail ${srcdir}/CXTERM-DIC; fi
-	if [ -f $@ ]; then true; else \
-	 ${RUN-EMACS}  -l ${buildlisppath}/international/quail \
-	  -f batch-byte-compile ${TIT:.elc=.el}; fi
-
-# Rule to generate quail/*.el from MISC-DIC/*.
-${MISC-DIC}:
-	if [ -d quail ]; then true; else make quail; fi
-	if [ -f $@ ]; then true; else \
-	 ${RUN-EMACS} -l ${buildlisppath}/international/titdic-cnv \
-	    -f batch-miscdic-convert -dir quail ${srcdir}/MISC-DIC; fi
-	if [ -f $@ ]; then true; else \
-	 ${RUN-EMACS} -l ${buildlisppath}/international/quail \
-	  -f batch-byte-compile ${MISC-DIC:.elc=.el}; fi
-
-leim-list.el: ${SUBDIRS} ${WORLD}
+TIT-SOURCES= \
+	${srcdir}/CXTERM-DIC/4Corner.tit \
+	${srcdir}/CXTERM-DIC/ARRAY30.tit \
+	${srcdir}/CXTERM-DIC/CCDOSPY.tit \
+	${srcdir}/CXTERM-DIC/ECDICT.tit \
+	${srcdir}/CXTERM-DIC/ETZY.tit \
+	${srcdir}/CXTERM-DIC/PY-b5.tit \
+	${srcdir}/CXTERM-DIC/Punct-b5.tit \
+	${srcdir}/CXTERM-DIC/Punct.tit \
+	${srcdir}/CXTERM-DIC/QJ-b5.tit \
+	${srcdir}/CXTERM-DIC/QJ.tit \
+	${srcdir}/CXTERM-DIC/SW.tit \
+	${srcdir}/CXTERM-DIC/TONEPY.tit \
+	${srcdir}/CXTERM-DIC/ZOZY.tit
+
+${CHINESE-TIT:.elc=.el}: changed.tit
+	@true
+
+changed.tit: ${TIT-SOURCES}
+	${RUN-EMACS} -l ${buildlisppath}/international/titdic-cnv \
+	  -f batch-titdic-convert -dir quail ${srcdir}/CXTERM-DIC; \
+	  echo "changed" > $@
+
+MISC-SOURCES= \
+	${srcdir}/MISC-DIC/CTLau-b5.html \
+	${srcdir}/MISC-DIC/CTLau.html \
+	${srcdir}/MISC-DIC/cangjie-table.b5 \
+	${srcdir}/MISC-DIC/cangjie-table.cns \
+	${srcdir}/MISC-DIC/pinyin.map \
+	${srcdir}/MISC-DIC/ziranma.cin
+
+${MISC:.elc=.el}: changed.misc
+	@true
+
+changed.misc: ${MISC-SOURCES}
+	${RUN-EMACS} -l ${buildlisppath}/international/titdic-cnv \
+	  -f batch-miscdic-convert -dir quail ${srcdir}/MISC-DIC; \
+	  echo "changed" > $@
+
+leim-list.el: ${SUBDIRS} ${NON-TIT-MISC} changed.tit changed.misc ${srcdir}/leim-ext.el
+	${RUN-EMACS}  -l ${buildlisppath}/international/quail \
+	  -f batch-byte-compile-if-not-done ${TIT-MISC:.elc=.el}
 	if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \
 	  ${RUN-EMACS} -l ${buildlisppath}/international/quail \
 	    --eval "(update-leim-list-file \".\")" ; \
@@ -196,6 +213,7 @@ leim-list.el: ${SUBDIRS} ${WORLD}
 	  ${RUN-EMACS} -l ${buildlisppath}/international/quail \
 	    --eval "(update-leim-list-file \".\" \"${srcdir}\")" ; \
 	fi
+	sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@
 
 install: all
 	if [ x`(cd ${INSTALLDIR} && /bin/pwd)` != x`(/bin/pwd)` ] ; then \
@@ -203,26 +221,35 @@ install: all
 	  rm -rf ${INSTALLDIR}/quail ${INSTALLDIR}/ja-dic ; \
 	  echo "Copying leim files to ${INSTALLDIR} ..." ; \
 	  if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \
-	    tar -cf - leim-list.el quail ja-dic \
+	    tar -chf - leim-list.el quail ja-dic \
 		| (cd ${INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\
 	  else \
-	    tar -cf - leim-list.el quail \
+	    tar -chf - leim-list.el quail \
 		| (cd ${INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\
 	    cd ${srcdir}; \
-	    tar -cf - quail/* ja-dic \
+	    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}/.arch-inventory ${INSTALLDIR}/*/.arch-inventory; \
+	  rm -f  ${INSTALLDIR}/\#*        ${INSTALLDIR}/*/\#* ; \
+	  rm -f  ${INSTALLDIR}/.\#*       ${INSTALLDIR}/*/.\#* ; \
+	  rm -f  ${INSTALLDIR}/*~         ${INSTALLDIR}/*/*~ ; \
+	  rm -f  ${INSTALLDIR}/*.orig     ${INSTALLDIR}/*/*.orig ; \
 	else true; fi
-	-rm -f ${INSTALLDIR}/.cvsignore ${INSTALLDIR}/*/.cvsignore
 	-chmod -R a+r ${INSTALLDIR}
 
 clean mostlyclean:
-	rm -f ${TIT} ${NON-TIT} ${WORLD} ${TIT:.elc=.el} \
-	  ${MISC-DIC} ${MISC-DIC:.elc=.el} leim-list.el
+	rm -f ${TIT-MISC} ${TIT-MISC:.elc=.el} \
+		leim-list.el changed.tit changed.misc
 
-distclean maintainer-clean:
+distclean: clean
 	if test -f stamp-subdir; then rm -rf ${SUBDIRS} stamp-subdir; fi
 	rm -f Makefile
 
-extraclean: distclean
+maintainer-clean: distclean
+	rm -f ${WORLD}
+
+extraclean: maintainer-clean
 	-rm -f *~ \#* m/?*~ s/?*~