[Xen-changelog] [xen-unstable] blktap2: fix parallel Make.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1244108724 -3600
# Node ID 2c1d94eb996f6b5d39ebf7183076b03d42cdd676
# Parent  6c24ffb01d6b6cda926032eacb55471b7eb449dd
blktap2: fix parallel Make.

sub make in tools/blktap2/daemon/lib and tools/lvd/lib
can be triggered many times at the same time which results in
weired link error because one target is linking a library while
another target is trying to recreate the library.

This patch makes it invoke submake only once.

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 tools/blktap2/daemon/Makefile |    5 ++++-
 tools/blktap2/vhd/Makefile    |    7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff -r 6c24ffb01d6b -r 2c1d94eb996f tools/blktap2/daemon/Makefile
--- a/tools/blktap2/daemon/Makefile     Thu Jun 04 10:43:44 2009 +0100
+++ b/tools/blktap2/daemon/Makefile     Thu Jun 04 10:45:24 2009 +0100
@@ -34,7 +34,10 @@ DEPS          = .*.d
 
 all: $(IBIN)
 
-blktapctrl: tapdisk-daemon.c $(OBJS) subdir-all-lib
+LIBS_DEPENDS := lib/libblktap.a lib/libblktap.so
+$(LIBS_DEPENDS):subdirs-all
+
+blktapctrl: tapdisk-daemon.c $(OBJS) $(LIBS_DEPENDS)
        $(CC) $(CFLAGS) -o blktapctrl tapdisk-daemon.c $(LDFLAGS) $(LIBS) 
$(OBJS)
 
 install: all
diff -r 6c24ffb01d6b -r 2c1d94eb996f tools/blktap2/vhd/Makefile
--- a/tools/blktap2/vhd/Makefile        Thu Jun 04 10:43:44 2009 +0100
+++ b/tools/blktap2/vhd/Makefile        Thu Jun 04 10:45:24 2009 +0100
@@ -32,10 +32,13 @@ all: build
 
 build: $(IBIN)
 
-vhd-util: vhd-util.o subdir-all-lib
+LIBS_DEPENDS     := lib/libvhd.so lib/vhd.a
+$(LIBS_DEPENDS):subdirs-all
+
+vhd-util: vhd-util.o $(LIBS_DEPENDS)
        $(CC) $(CFLAGS) -o vhd-util vhd-util.o $(LDFLAGS) $(LIBS)
 
-vhd-update: vhd-update.o subdir-all-lib
+vhd-update: vhd-update.o $(LIBS_DEPENDS)
        $(CC) $(CFLAGS) -o vhd-update vhd-update.o $(LDFLAGS) $(LIBS)
 
 install: all

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog