From 71489b7cd269717e0b6f3531aec51a07d3c94ebb Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 16 Jun 2009 10:54:10 +0100 Subject: [PATCH] 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 Signed-off-by: Keir Fraser --- tools/blktap2/daemon/Makefile | 6 +++--- tools/blktap2/vhd/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/blktap2/daemon/Makefile b/tools/blktap2/daemon/Makefile index ab974a9952..ca5f81bba9 100644 --- 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 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) -- 2.30.2