From 4ce7f03e2eec4447614847ded51567526e05c9ea Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Thu, 29 Mar 2001 14:24:43 +0000 Subject: [PATCH] (SUBDIR): Remove leim. (all, .RECURSIVE, extraclean): Add leim explicitly. (leim): Provide separate rule which exports PARALLEL=0 into the environment. --- Makefile.in | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index 9fb697b1f15..cfba89724c0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -208,7 +208,8 @@ EMACS = emacs # Subdirectories to make recursively. `lisp' is not included # because the compiled lisp files are part of the distribution # and you cannot remake them without installing Emacs first. -SUBDIR = lib-src src leim +# leim is not included because it needs special handling. +SUBDIR = lib-src src # The makefiles of the directories in $SUBDIR. SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile @@ -222,7 +223,7 @@ SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile src/Makefile oldXMenu/Makefile COPYDIR = ${srcdir}/etc ${srcdir}/lisp COPYDESTS = ${etcdir} ${lispdir} -all: ${SUBDIR} +all: ${SUBDIR} leim removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g' @@ -243,13 +244,19 @@ epaths-force: FRC ${srcdir}/move-if-change epaths.h.$$$$ src/epaths.h # For parallel make, src should be build before leim. -leim: src +# "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 ${SUBDIR_MAKEFILES} FRC + (export PARALLEL; PARALLEL=0; cd $@; $(MAKE) all $(MFLAGS) \ + CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ + LDFLAGS='${LDFLAGS}' MAKE='${MAKE}') src: lib-src FRC lib-src: FRC src/config.stamp -.RECURSIVE: ${SUBDIR} +.RECURSIVE: ${SUBDIR} leim ${SUBDIR}: ${SUBDIR_MAKEFILES} FRC cd $@; $(MAKE) all $(MFLAGS) \ @@ -582,7 +589,7 @@ maintainer-clean: FRC ### the coding standards seem to come from. It's like distclean, but ### it deletes backup and autosave files too. extraclean: - for i in ${SUBDIR}; do (cd $$i; $(MAKE) $(MFLAGS) extraclean); done + for i in ${SUBDIR} leim; do (cd $$i; $(MAKE) $(MFLAGS) extraclean); done ${top_distclean} -rm -f config-tmp-* -rm -f *~ \#* -- 2.39.2