Merge "docs: Update E release notes"

[vswitchperf.git] / src / qemu / Makefile

diff --git a/src/qemu/Makefile b/src/qemu/Makefile
index 4603b27..b105496 100755 (executable)
--- a/src/qemu/Makefile
+++ b/src/qemu/Makefile
@@ -27,9 +27,7 @@ TAG_DONE_FLAG = $(WORK_DIR)/.$(QEMU_TAG).done
 INSTALL_TARGET = force_make force_install
 CONFIG_CMD =
 CONFIG_CMD += ./configure
-CONFIG_CMD += --target-list="x86_64-softmmu"
-QEMU_VANILLA = ../../src_vanilla/qemu
-QEMU_CUSE = ../../src_cuse/qemu
+CONFIG_CMD += --target-list="x86_64-softmmu" --python="/usr/bin/python"
 
 all: force_make
 
@@ -55,8 +53,6 @@ clean:
        $(AT)cd $(WORK_DIR) && git clean -xfd *.o
 clobber:
        $(AT)rm -rf $(WORK_DIR)
-       $(AT)rm -rf $(QEMU_VANILLA)
-       $(AT)rm -rf $(QEMU_CUSE)
 
 # distclean is for developer who would like to keep the
 # clone git repo, saving time to fetch again from url
@@ -72,11 +68,7 @@ sanity:
 $(WORK_DIR)/configure: $(TAG_DONE_FLAG)
 
 $(WORK_DIR):
-       $(AT)git clone $(QEMU_URL)
-       $(AT)mkdir -p $(QEMU_VANILLA)
-       $(AT)cp -rf ./* $(QEMU_VANILLA)
-       $(AT)mkdir -p $(QEMU_CUSE)
-       $(AT)cp -rf ./* $(QEMU_CUSE)
+       $(AT)git clone $(QEMU_URL) qemu
 
 $(TAG_DONE_FLAG): $(WORK_DIR)
        $(AT)cd $(WORK_DIR); git checkout $(QEMU_TAG)