[PATCH] fix parallel builds
Mike Frysinger
vapier at gentoo.org
Tue Feb 24 08:57:17 CST 2009
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 at gentoo.org>
---
Makefile | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index b450150..133e496 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
--
1.6.1.3
More information about the xfs
mailing list