From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 24 Feb 2009 18:53:34 +0000 (+0100)
Subject: fix parallel builds
X-Git-Tag: v3.0.1~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf3256b273df387583d4f7c83129f611b0ec45d0;p=thirdparty%2Fxfsprogs-dev.git

fix parallel builds

I noticed that xfsprogs-3.0.0 sometimes fails to build in parallel with an
error about fsr not being able to find libhandle.  Looking at the top level
Makefile shows the obvious missing depend (fsr: libhandle).  Playing around
a bit found a few more not so obvious missing depends on the include subdir
so I fixed that too.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Reviewed-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/Makefile b/Makefile
index b45015096..133e4963b 100644
--- a/Makefile
+++ b/Makefile
@@ -15,11 +15,11 @@ LSRCFILES = configure configure.in Makepkgs aclocal.m4 install-sh README VERSION
 LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \
 	Logs/* built .census install.* install-dev.* *.gz
 
-LIB_SUBDIRS = include libxfs libxlog libxcmd libhandle libdisk
+LIB_SUBDIRS = libxfs libxlog libxcmd libhandle libdisk
 TOOL_SUBDIRS = copy db estimate fsck fsr growfs io logprint mkfs quota \
 		mdrestore repair rtcp m4 man doc po debian build
 
-SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
+SUBDIRS = include $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
 
 default: include/builddefs include/platform_defs.h
 ifeq ($(HAVE_BUILDDEFS), no)
@@ -29,9 +29,10 @@ else
 endif
 
 # tool/lib dependencies
-libxcmd: include
+$(LIB_SUBDIRS) $(TOOL_SUBDIRS): include
 copy mdrestore: libxfs
 db logprint: libxfs libxlog
+fsr: libhandle
 growfs: libxfs libxcmd
 io: libxcmd libhandle
 mkfs: libxfs libdisk