aboutsummaryrefslogtreecommitdiffstats
path: root/tools/blktap2/vhd
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2009-06-16 10:54:10 +0100
committerKeir Fraser <keir.fraser@citrix.com>2009-06-16 10:54:10 +0100
commit71489b7cd269717e0b6f3531aec51a07d3c94ebb (patch)
tree607d06b34dff1a92d4f6e7a4241f7aaffeafe197 /tools/blktap2/vhd
parentb8d155220b71b27f03b978029cbdcfb36a96c4b4 (diff)
downloadxen-71489b7cd269717e0b6f3531aec51a07d3c94ebb.tar.gz
xen-71489b7cd269717e0b6f3531aec51a07d3c94ebb.tar.bz2
xen-71489b7cd269717e0b6f3531aec51a07d3c94ebb.zip
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>
Diffstat (limited to 'tools/blktap2/vhd')
-rw-r--r--tools/blktap2/vhd/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/blktap2/vhd/Makefile b/tools/blktap2/vhd/Makefile
index 8b4d7b5ca0..d456d7d7a5 100644
--- 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)