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>

diff --git a/tools/blktap2/daemon/Makefile b/tools/blktap2/daemon/Makefile
index ab974a99520d035ec441d342d82cecfab40a7e70..ca5f81bba961ff6c832ef35fd19f0ea87b245e5a 100644 (file)
--- a/tools/blktap2/daemon/Makefile
+++ b/tools/blktap2/daemon/Makefile
@@ -32,7 +32,7 @@ CFLAGS       += -g
 CFLAGS       += -Wp,-MD,.$(@F).d
 DEPS          = .*.d
 
-all: $(IBIN)
+all: subdirs-all $(IBIN)
 
 LIBS_DEPENDS := lib/libblktap.a lib/libblktap.so
 $(LIBS_DEPENDS):subdirs-all
@@ -41,14 +41,14 @@ blktapctrl: tapdisk-daemon.c $(OBJS) $(LIBS_DEPENDS)
        $(CC) $(CFLAGS) -o blktapctrl tapdisk-daemon.c $(LDFLAGS) $(LIBS) $(OBJS)
 
 install: all
+       $(MAKE) subdirs-install
        $(INSTALL_DIR) -p $(DESTDIR)$(INST_DIR)
        $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(INST_DIR)
 
-clean:
+clean: subdirs-clean
        rm -rf *.o *~ $(IBIN) $(DEPS) xen TAGS
 
 .PHONY: all clean install blktapctrl
-all clean install: %: subdirs-%
 
 -include $(DEPS)
 

diff --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile
index 8b4d7b5ca0494e204bb7e6736d01b4c87818d54e..d456d7d7a5c607a11b74c53497b6816e67fe53c8 100644 (file)
--- a/tools/blktap2/vhd/Makefile
+++ b/tools/blktap2/vhd/Makefile
@@ -28,7 +28,7 @@ LIBS              += -luuid
 CFLAGS            += -Wp,-MD,.$(@F).d
 DEPS               = .*.d
 
-all: build
+all: subdirs-all build
 
 build: $(IBIN)
 
@@ -42,13 +42,13 @@ vhd-update: vhd-update.o $(LIBS_DEPENDS)
        $(CC) $(CFLAGS) -o vhd-update vhd-update.o $(LDFLAGS) $(LIBS)
 
 install: all
+       $(MAKE) subdirs-install
        $(INSTALL_DIR) -p $(DESTDIR)$(INST_DIR)
        $(INSTALL_PROG) $(IBIN) $(DESTDIR)$(INST_DIR)
 
-clean:
+clean: subdirs-clean
        rm -rf *.o *~ $(DEPS) $(IBIN)
 
 .PHONY: all build clean install vhd-util vhd-update
-all clean install: %: subdirs-%
 
 -include $(DEPS)