X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/414559565dd2f9eb568ac7b64e1d298df3b73076..ef3761e3f4407fdd4d7329d296a00f51c66b52ec:/leim/Makefile.in

diff --git a/leim/Makefile.in b/leim/Makefile.in
index 2f707f0f46..56f28b8e89 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for leim subdirectory in GNU Emacs.
 
-# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 #   2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -27,31 +27,19 @@
 SHELL = /bin/sh
 
 # Here are the things that we expect ../configure to edit.
-version=@version@
-prefix=@prefix@
-datarootdir=@datarootdir@
-datadir=@datadir@
 srcdir=@srcdir@
-ns_appresdir=@ns_appresdir@
-
-# Where to install LEIM files.
-INSTALLDIR=$(DESTDIR)${datadir}/emacs/${version}/leim
-
-GZIP_PROG = @GZIP_PROG@
 
 # 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 = ../src/emacs
+EMACS = ../src/emacs
 
 buildlisppath=${srcdir}/../lisp
 
 # How to run Emacs.
 RUN_EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \
-	${BUILT_EMACS} -batch --no-site-file --no-site-lisp
+	${EMACS} -batch --no-site-file --no-site-lisp
 
-# Subdirectories to be made if ${srcdir} is different from the current
-# directory.
-SUBDIRS=quail
+MKDIR_P = @MKDIR_P@
 
 # Files generated from TIT dictionaries for Chinese GB character set.
 TIT_GB=\
@@ -93,16 +81,8 @@ TIT_MISC=${CHINESE_TIT} ${MISC}
 	@echo Compiling $<
 	@${RUN_EMACS} -l ${buildlisppath}/international/quail -f batch-byte-compile $<
 
-all: ${BUILT_EMACS} ${SUBDIRS} leim-list.el compile-main
-
-# To ensure that we can run Emacs.  This target is ignored (never
-# being hit) if a user changes default value of BUILT_EMACS.
-../src/emacs:
-	cd ../src; ${MAKE} ${MFLAGS} emacs
-
-${SUBDIRS}:
-	mkdir $@
-	touch stamp-subdir
+all: leim-list.el compile-main
+.PHONY: all
 
 TIT_SOURCES= \
 	${srcdir}/CXTERM-DIC/4Corner.tit \
@@ -122,9 +102,16 @@ TIT_SOURCES= \
 ${CHINESE_TIT}: changed.tit
 	@true
 
-## FIXME remove subdirs if poss - time-stamping.
-## Emacs should make the directory if it does not exist.
-changed.tit: ${SUBDIRS} ${TIT_SOURCES}
+## The changed.* files act to serialize this part of the build.
+## A single Emacs invocation creates all the CHINESE_TIT files.
+## Otherwise in a parallel build multiple Emacs instances could
+## interfere with each other.  If we used GNU make we could probably
+## parallelize this without the need for an explicit rule for each
+## file.  Something like the pattern rule:
+## 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
 	${RUN_EMACS} -l ${buildlisppath}/international/titdic-cnv \
 	  -f batch-titdic-convert -dir quail ${srcdir}/CXTERM-DIC; \
 	  echo "changed" > $@
@@ -140,14 +127,15 @@ MISC_SOURCES= \
 ${MISC}: changed.misc
 	@true
 
-changed.misc: ${SUBDIRS} ${MISC_SOURCES}
+changed.misc: ${MISC_SOURCES}
+	@${MKDIR_P} quail
 	${RUN_EMACS} -l ${buildlisppath}/international/titdic-cnv \
 	  -f batch-miscdic-convert -dir quail ${srcdir}/MISC-DIC; \
 	  echo "changed" > $@
 
-leim-list.el: ${SUBDIRS} ${TIT_MISC} ${srcdir}/leim-ext.el
+leim-list.el: ${TIT_MISC} ${srcdir}/leim-ext.el
 	rm -f leim-list.el
-	if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \
+	if [ x`cd ${srcdir} && /bin/pwd` = x`/bin/pwd` ] ; then \
 	  ${RUN_EMACS} -l ${buildlisppath}/international/quail \
 	    --eval "(update-leim-list-file \".\")" ; \
 	else \
@@ -167,6 +155,7 @@ 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}
 	@($(setwins); \
 	els=`echo "$$wins " | sed -e 's| |/*.el |g'`; \
@@ -176,55 +165,10 @@ compile-main: ${TIT_MISC}
 	  echo "$${el}c"; \
 	done | xargs echo) | \
 	while read chunk; do \
-	  $(MAKE) $(MFLAGS) compile-targets BUILT_EMACS="$(BUILT_EMACS)" TARGETS="$$chunk"; \
+	  $(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \
 	done
 
-MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done
-
-install: all
-	if [ ! -d ${INSTALLDIR} ] ; then \
-          umask 022; ${srcdir}/../build-aux/install-sh -d ${INSTALLDIR}; \
-	else true; fi
-	if [ x`(cd ${INSTALLDIR} && /bin/pwd)` != x`(/bin/pwd)` ] ; then \
-	  rm -f ${INSTALLDIR}/leim-list.el; \
-	  rm -rf ${INSTALLDIR}/quail ${INSTALLDIR}/ja-dic ; \
-	  echo "Copying leim files to ${INSTALLDIR} ..." ; \
-	  if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \
-	    tar -chf - leim-list.el quail ja-dic \
-		| (cd ${INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\
-	  else \
-	    tar -chf - leim-list.el quail \
-		| (cd ${INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\
-	    cd ${srcdir}; \
-	    tar -chf - quail/* ja-dic \
-		| (cd ${INSTALLDIR}; umask 0; tar -xvf - && cat > /dev/null) ;\
-	  fi; \
-	  rm -f  ${INSTALLDIR}/.gitignore ${INSTALLDIR}/*/.gitignore; \
-	  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
-	-unset CDPATH; \
-	if [ -n "${GZIP_PROG}" ]; \
-	then \
-	   echo "Compressing *.el ..." ; \
-	   (cd ${INSTALLDIR}; for f in `find . -name "*.elc" -print`; do \
-		${GZIP_PROG} -9n `echo $$f|sed 's/.elc$$/.el/'` ; \
-	    done) \
-	else true; fi
-	-chmod -R a+r ${INSTALLDIR}
-	for installuser in $${LOGNAME} $${USERNAME} $${USER} \
-	  `id -un 2> /dev/null`; do \
-	  [ -n "$${installuser}" ] && break ; \
-	done ; \
-	find ${INSTALLDIR} -exec chown $${installuser} '{}' ';'
-	if [ "${ns_appresdir}" != "" ]; then \
-	  ( cd ${ns_appresdir} ; \
-	    if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
-	    rm -fr share ) ; \
-	else true ; fi
+.PHONY: clean mostlyclean bootstrap-clean distclean maintainer-clean extraclean
 
 clean mostlyclean:
 	rm -f ${TIT_MISC} ${TIT_MISC:.el=.elc} \
@@ -237,7 +181,7 @@ bootstrap-clean: clean
 	$(setwins); for w in $$wins; do rm -f $$w/*.elc; done
 
 distclean: clean
-	if test -f stamp-subdir; then rm -rf ${SUBDIRS} stamp-subdir; fi
+	-[ `cd ${srcdir} && /bin/pwd` != `/bin/pwd` ] && rm -rf quail
 	rm -f Makefile
 
 maintainer-clean: distclean bootstrap-clean