ia64/xen-unstable

changeset 19741:465950bbdf46

blktap2/vhd, daemon: serialize subdirs-all and subdirs-install

make install in vhd and daemon, subdirs-all and subdirs-install
are invoked parallel causing nasty error.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Keir Fraser <keir.fraser@eu.citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Jun 16 10:54:10 2009 +0100 (2009-06-16)
parents 112680f620bf
children 376c0749586e
files tools/blktap2/daemon/Makefile tools/blktap2/vhd/Makefile
line diff
     1.1 --- a/tools/blktap2/daemon/Makefile	Mon Jun 08 18:23:57 2009 +0100
     1.2 +++ b/tools/blktap2/daemon/Makefile	Tue Jun 16 10:54:10 2009 +0100
     1.3 @@ -32,7 +32,7 @@ CFLAGS       += -g
     1.4  CFLAGS       += -Wp,-MD,.$(@F).d
     1.5  DEPS          = .*.d
     1.6  
     1.7 -all: $(IBIN)
     1.8 +all: subdirs-all $(IBIN)
     1.9  
    1.10  LIBS_DEPENDS := lib/libblktap.a lib/libblktap.so
    1.11  $(LIBS_DEPENDS):subdirs-all
    1.12 @@ -41,14 +41,14 @@ blktapctrl: tapdisk-daemon.c $(OBJS) $(L
    1.13  	$(CC) $(CFLAGS) -o blktapctrl tapdisk-daemon.c $(LDFLAGS) $(LIBS) $(OBJS)
    1.14  
    1.15  install: all
    1.16 +	$(MAKE) subdirs-install
    1.17  	$(INSTALL_DIR) -p $(DESTDIR)$(INST_DIR)
    1.18  	$(INSTALL_PROG) $(IBIN) $(DESTDIR)$(INST_DIR)
    1.19  
    1.20 -clean:
    1.21 +clean: subdirs-clean
    1.22  	rm -rf *.o *~ $(IBIN) $(DEPS) xen TAGS
    1.23  
    1.24  .PHONY: all clean install blktapctrl
    1.25 -all clean install: %: subdirs-%
    1.26  
    1.27  -include $(DEPS)
    1.28  
     2.1 --- a/tools/blktap2/vhd/Makefile	Mon Jun 08 18:23:57 2009 +0100
     2.2 +++ b/tools/blktap2/vhd/Makefile	Tue Jun 16 10:54:10 2009 +0100
     2.3 @@ -28,7 +28,7 @@ LIBS              += -luuid
     2.4  CFLAGS            += -Wp,-MD,.$(@F).d
     2.5  DEPS               = .*.d
     2.6  
     2.7 -all: build
     2.8 +all: subdirs-all build
     2.9  
    2.10  build: $(IBIN)
    2.11  
    2.12 @@ -42,13 +42,13 @@ vhd-update: vhd-update.o $(LIBS_DEPENDS)
    2.13  	$(CC) $(CFLAGS) -o vhd-update vhd-update.o $(LDFLAGS) $(LIBS)
    2.14  
    2.15  install: all
    2.16 +	$(MAKE) subdirs-install
    2.17  	$(INSTALL_DIR) -p $(DESTDIR)$(INST_DIR)
    2.18  	$(INSTALL_PROG) $(IBIN) $(DESTDIR)$(INST_DIR)
    2.19  
    2.20 -clean:
    2.21 +clean: subdirs-clean
    2.22  	rm -rf *.o *~ $(DEPS) $(IBIN)
    2.23  
    2.24  .PHONY: all build clean install vhd-util vhd-update
    2.25 -all clean install: %: subdirs-%
    2.26  
    2.27  -include $(DEPS)