[Groff-commit] groff ChangeLog Makefile.in

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     12/01/03 06:37:43

Modified files:
        .              : ChangeLog Makefile.in 

Log message:
        Improve parallel builds.
        
        Some hdtbl and mom examples want PostScript formatting which
        requires the `DESC' file to be ready; however, the top-level
        `Makefile.in' doesn't currently enforce the proper order of building
        of `font/dev' before `contrib/hdtbl', `contrib/mom', and so on.
        
        Given that `font/dev' and the contrib examples are in different
        child processes of the recursive make system, it doesn't seem
        possible to solve this using clean Makefile dependencies.  We now
        enforce the order by splitting the shell command invoking recursive
        make in the top level `Makefile.in'.
        
        * Makefile.in (ALLDIRS): Remove `OTHERDIRS'.
        (`$(TARGETS)'): Handle `OTHERDIRS' separately.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1318&r2=1.1319
http://cvs.savannah.gnu.org/viewcvs/groff/Makefile.in?cvsroot=groff&r1=1.118&r2=1.119

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1318
retrieving revision 1.1319
diff -u -b -r1.1318 -r1.1319
--- ChangeLog   3 Jan 2012 06:23:44 -0000       1.1318
+++ ChangeLog   3 Jan 2012 06:37:36 -0000       1.1319
@@ -1,3 +1,21 @@
+2012-01-03  Ingo Schwarze  <address@hidden>
+
+       Improve parallel builds.
+
+       Some hdtbl and mom examples want PostScript formatting which
+       requires the `DESC' file to be ready; however, the top-level
+       `Makefile.in' doesn't currently enforce the proper order of building
+       of `font/dev' before `contrib/hdtbl', `contrib/mom', and so on.
+
+       Given that `font/dev' and the contrib examples are in different
+       child processes of the recursive make system, it doesn't seem
+       possible to solve this using clean Makefile dependencies.  We now
+       enforce the order by splitting the shell command invoking recursive
+       make in the top level `Makefile.in'.
+
+       * Makefile.in (ALLDIRS): Remove `OTHERDIRS'.
+       (`$(TARGETS)'): Handle `OTHERDIRS' separately.
+
 2012-01-03  Kristaps Dzonsons  <address@hidden>
 
        [mdoc] Add `-isoC-2011'.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/groff/groff/Makefile.in,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- Makefile.in 10 Aug 2011 18:22:59 -0000      1.118
+++ Makefile.in 3 Jan 2012 06:37:39 -0000       1.119
@@ -1,4 +1,4 @@
-# Copyright (C) 1989-2006, 2009-2011
+# Copyright (C) 1989-2006, 2009-2012
 #   Free Software Foundation, Inc.
 #      Written by James Clark (address@hidden)
 # 
@@ -617,6 +617,8 @@
   font/devpdf \
   contrib/gdiffmk
   
+# OTHERDIRS is handled specially in the `$(TARGETS)' rule to avoid
+# dependency problems with parallel builds.
 ALLDIRS=\
   $(INCDIRS) \
   $(LIBDIRS) \
@@ -624,8 +626,8 @@
   $(DEVDIRS) \
   $(XDEVDIRS) \
   $(OTHERDEVDIRS) \
-  $(TTYDEVDIRS) \
-  $(OTHERDIRS)
+  $(TTYDEVDIRS)
+# $(OTHERDIRS)
 EXTRADIRS=\
   font/devps/generate \
   font/devdvi/generate \
@@ -686,13 +688,14 @@
        fi
 
 do=all
-dodirs=$(ALLDIRS) dot
+dodirs=$(ALLDIRS) $(OTHERDIRS) dot
 # Default target for subdir_Makefile
 subdir=src/roff/troff
 
 
 $(TARGETS):
-       @$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) do=$@ $(dodirs)
+       @$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) do=$@ $(ALLDIRS)
+       @$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) do=$@ $(OTHERDIRS) dot
 
 dot: FORCE
        @$(ENVSETUP); \