# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1245146050 -3600
# Node ID 465950bbdf46d720d61575f0ce33d18b5e8cc506
# Parent 112680f620bf523ca55a52a5cf52e0793775bbad
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@xxxxxxxxxxxxx>
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxxxxx>
---
tools/blktap2/daemon/Makefile | 6 +++---
tools/blktap2/vhd/Makefile | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff -r 112680f620bf -r 465950bbdf46 tools/blktap2/daemon/Makefile
--- a/tools/blktap2/daemon/Makefile Mon Jun 08 18:23:57 2009 +0100
+++ b/tools/blktap2/daemon/Makefile Tue Jun 16 10:54:10 2009 +0100
@@ -32,7 +32,7 @@ CFLAGS += -Wp,-MD,.$(@F).d
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) $(L
$(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 -r 112680f620bf -r 465950bbdf46 tools/blktap2/vhd/Makefile
--- a/tools/blktap2/vhd/Makefile Mon Jun 08 18:23:57 2009 +0100
+++ b/tools/blktap2/vhd/Makefile Tue Jun 16 10:54:10 2009 +0100
@@ -28,7 +28,7 @@ CFLAGS += -Wp,-MD,.$(@F).d
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)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home