diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2009-06-04 10:45:24 +0100 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2009-06-04 10:45:24 +0100 |
commit | 45cb888069dc48379bf3c272ccb987609604e51a (patch) | |
tree | 99836cb2ea3e45ad9d218aaaf429b7cfffd016b2 /tools/blktap2 | |
parent | 57dde9ed01605556ff473ac349071e159a6480c1 (diff) | |
download | xen-45cb888069dc48379bf3c272ccb987609604e51a.tar.gz xen-45cb888069dc48379bf3c272ccb987609604e51a.tar.bz2 xen-45cb888069dc48379bf3c272ccb987609604e51a.zip |
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@valinux.co.jp>
Diffstat (limited to 'tools/blktap2')
-rw-r--r-- | tools/blktap2/daemon/Makefile | 5 | ||||
-rw-r--r-- | tools/blktap2/vhd/Makefile | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/tools/blktap2/daemon/Makefile b/tools/blktap2/daemon/Makefile index aedef96721..ab974a9952 100644 --- a/tools/blktap2/daemon/Makefile +++ b/tools/blktap2/daemon/Makefile @@ -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 --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile index fc0565e14f..8b4d7b5ca0 100644 --- a/tools/blktap2/vhd/Makefile +++ b/tools/blktap2/vhd/Makefile @@ -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 |