diff options
author | Martin Klozik <martinx.klozik@intel.com> | 2016-04-29 09:20:22 +0100 |
---|---|---|
committer | Martin Klozik <martinx.klozik@intel.com> | 2016-04-29 09:21:14 +0100 |
commit | cb768e4ea7b3d55c6e0add653b67270eefcdd2b5 (patch) | |
tree | 32f08c1bfe3f46dad64f3bcd16da78c1a3578c9b | |
parent | eca9105cac5d465dfacf162200e09599c8b98c4b (diff) |
makefile: Remove obsolete copy operations
In the past DPDK, OVS and QEMU were copied and compiled for all
three OVS configurations, i.e. Vanilla OVS, OVS+DPDK with vHost Cuse
and OVS+DPK with vHost User. Later compilation of QEMU was triggered
just once and DPDK compilation was removed from OVS Vanilla dir.
However source code was still copied to all directories. Unnecessary
copy operations were removed.
Signed-off-by: Martin Klozik <martinx.klozik@intel.com>
Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Christian Trautman <ctrautma@redhat.com>
Reviewed-by: Brian Castelli <brian.castelli@spirent.com>
-rwxr-xr-x | src/dpdk/Makefile | 4 | ||||
-rwxr-xr-x | src/qemu/Makefile | 8 |
2 files changed, 0 insertions, 12 deletions
diff --git a/src/dpdk/Makefile b/src/dpdk/Makefile index 25ec3f12..e21e7999 100755 --- a/src/dpdk/Makefile +++ b/src/dpdk/Makefile @@ -29,7 +29,6 @@ ifndef VHOST_USER endif WORK_DIR = dpdk TAG_DONE_FLAG = $(WORK_DIR)/.$(DPDK_TAG).tag.done -DPDK_VANILLA = ../../src_vanilla/dpdk DPDK_CUSE = ../../src_cuse/dpdk # the name has been changed from version to version @@ -70,7 +69,6 @@ clean: $(AT)cd $(WORK_DIR) && git clean -xfd *.o clobber: $(AT)rm -rf $(WORK_DIR) - $(AT)rm -rf $(DPDK_VANILLA) $(AT)rm -rf $(DPDK_CUSE) # distclean is for developer who would like to keep the @@ -86,8 +84,6 @@ sanity: $(WORK_DIR): $(AT)git clone $(DPDK_URL) - $(AT)mkdir -p $(DPDK_VANILLA) - $(AT)cp -rf ./* $(DPDK_VANILLA) $(AT)mkdir -p $(DPDK_CUSE) $(AT)cp -rf ./* $(DPDK_CUSE) diff --git a/src/qemu/Makefile b/src/qemu/Makefile index 4603b273..1bf8a8d0 100755 --- a/src/qemu/Makefile +++ b/src/qemu/Makefile @@ -28,8 +28,6 @@ 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 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 @@ -73,10 +69,6 @@ $(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) $(TAG_DONE_FLAG): $(WORK_DIR) $(AT)cd $(WORK_DIR); git checkout $(QEMU_TAG) |