ia64/xen-unstable

changeset 19724:2c1d94eb996f

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>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Jun 04 10:45:24 2009 +0100 (2009-06-04)
parents 6c24ffb01d6b
children 265de5701b82
files tools/blktap2/daemon/Makefile tools/blktap2/vhd/Makefile
line diff
     1.1 --- a/tools/blktap2/daemon/Makefile	Thu Jun 04 10:43:44 2009 +0100
     1.2 +++ b/tools/blktap2/daemon/Makefile	Thu Jun 04 10:45:24 2009 +0100
     1.3 @@ -34,7 +34,10 @@ DEPS          = .*.d
     1.4  
     1.5  all: $(IBIN)
     1.6  
     1.7 -blktapctrl: tapdisk-daemon.c $(OBJS) subdir-all-lib
     1.8 +LIBS_DEPENDS := lib/libblktap.a lib/libblktap.so
     1.9 +$(LIBS_DEPENDS):subdirs-all
    1.10 +
    1.11 +blktapctrl: tapdisk-daemon.c $(OBJS) $(LIBS_DEPENDS)
    1.12  	$(CC) $(CFLAGS) -o blktapctrl tapdisk-daemon.c $(LDFLAGS) $(LIBS) $(OBJS)
    1.13  
    1.14  install: all
     2.1 --- a/tools/blktap2/vhd/Makefile	Thu Jun 04 10:43:44 2009 +0100
     2.2 +++ b/tools/blktap2/vhd/Makefile	Thu Jun 04 10:45:24 2009 +0100
     2.3 @@ -32,10 +32,13 @@ all: build
     2.4  
     2.5  build: $(IBIN)
     2.6  
     2.7 -vhd-util: vhd-util.o subdir-all-lib
     2.8 +LIBS_DEPENDS	  := lib/libvhd.so lib/vhd.a
     2.9 +$(LIBS_DEPENDS):subdirs-all
    2.10 +
    2.11 +vhd-util: vhd-util.o $(LIBS_DEPENDS)
    2.12  	$(CC) $(CFLAGS) -o vhd-util vhd-util.o $(LDFLAGS) $(LIBS)
    2.13  
    2.14 -vhd-update: vhd-update.o subdir-all-lib
    2.15 +vhd-update: vhd-update.o $(LIBS_DEPENDS)
    2.16  	$(CC) $(CFLAGS) -o vhd-update vhd-update.o $(LDFLAGS) $(LIBS)
    2.17  
    2.18  install: all