From 85512739f7e22aacbca07f6dae877b3c7d3efe12 Mon Sep 17 00:00:00 2001
From: giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>
Date: Wed, 22 Sep 2010 06:21:26 +0000
Subject: Fix parallel make

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1297 9d0c8265-081b-0410-96cb-a4ca84ce46f8
---
 GNUmakefile | 8 +++++++-
 doc/HISTORY | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/GNUmakefile b/GNUmakefile
index cc90672c..d6745eaf 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -98,8 +98,14 @@ nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
 # make works for 'make all' in the top directory, but it may still fail
 # for the aforementioned reason for other invocations.
 
-$(SUBDIRS:%=%/all): pm_config.h inttypes_netpbm.h version.h
+$(SUBDIRS:%=%/all) lib/util/all: pm_config.h inttypes_netpbm.h version.h
 $(PROG_SUBDIRS:%=%/all): lib/all $(SUPPORT_SUBDIRS:%=%/all)
+lib/all: lib/util/all
+
+.PHONY: lib/util/all
+lib/util/all:
+	$(MAKE) -C lib/util -f $(SRCDIR)/lib/util/Makefile \
+	    SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) all
 
 OMIT_CONFIG_RULE = 1
 OMIT_VERSION_H_RULE = 1
diff --git a/doc/HISTORY b/doc/HISTORY
index 923d1612..23659bf3 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -26,6 +26,9 @@ not yet  BJH  Release 10.52.00
               ppmtompeg: fix crash with free of unallocated memory.
               Broken after 10.18, not later than 10.26.
 
+              Build: fix parallel make - multiple simultaneous attempts to
+              build lib/util/importinc.
+
               Build: don't fail due to SIGRTMIN, SIGRTMAX being undefined.
 
               Build: don't expect snprintf() to exist.
-- 
cgit 1.4.1