[Emacs-diffs] /srv/bzr/emacs/trunk r108302: * Makefile.in (leim): No need to set PARALLEL.

[Glenn Morris]

------------------------------------------------------------
revno: 108302
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-05-18 23:34:59 -0700
message:
  * Makefile.in (leim): No need to set PARALLEL.
  
  This predates the use of changed.misc etc to serialize the leim build.
  The leim Makefile used to set .NO_PARALLEL/.NOTPARALLEL for the same
  reason, but has not done so for many years.
modified:
  ChangeLog
  Makefile.in
  leim/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-18 23:15:11 +0000
+++ b/ChangeLog 2012-05-19 06:34:59 +0000
@@ -1,3 +1,7 @@
+2012-05-19  Glenn Morris  <address@hidden>
+
+       * Makefile.in (leim): No need to set PARALLEL.
+
 2012-05-18  Glenn Morris  <address@hidden>
 
        * Makefile.in (install-arch-indep, install-info, install-man):

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-05-18 23:15:11 +0000
+++ b/Makefile.in       2012-05-19 06:34:59 +0000
@@ -306,11 +306,8 @@
        ${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h
 
 # For parallel make, src should be built before leim.
-# "export PARALLEL=0" is for SGI's Make, to prevent it from
-# running more than 1 process in the leim directory, especially for
-# the $TIT files there.
 leim:   src Makefile FRC
-       cd leim && PARALLEL=0 $(MAKE) all $(MFLAGS)
+       cd leim && $(MAKE) all $(MFLAGS)
 
 lib-src src: lib
 

=== modified file 'leim/Makefile.in'
--- a/leim/Makefile.in  2012-05-12 01:19:47 +0000
+++ b/leim/Makefile.in  2012-05-19 06:34:59 +0000
@@ -123,8 +123,15 @@
 ${CHINESE_TIT}: changed.tit
        @true
 
-## FIXME remove subdirs if poss - time-stamping.
+## FIXME remove subdirs if possible - time-stamping.
 ## Emacs should make the directory if it does not exist.
+
+## 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.
 changed.tit: ${SUBDIRS} ${TIT_SOURCES}
        ${RUN_EMACS} -l ${buildlisppath}/international/titdic-cnv \
          -f batch-titdic-convert -dir quail ${srcdir}/CXTERM-DIC; \