diff options
| author |   Radek Zetik <radekx.zetik@intel.com> | 2015-10-21 06:45:20 +0100 |
|---|---|---|
| committer |   Maryam Tahhan <maryam.tahhan@intel.com> | 2015-10-29 11:32:19 +0000 |
| commit | 4bdcd58361959541d9d3572373cabd60c0929851 (patch) | |
| tree | dcefd96a5411545484ddeda095ae742f1de9241b /src/dpdk | |
| parent | 67b0760d2b123ee834f8552057aed0e68a282257 (diff) | |
Fix Make, Make clean and when the src directories are cloned
Update the rules for Make clean and distclean.
Update make not to clone the repositories if they are already
cloned, simply pull, checkout the tags and build.
Changes in this patch:
1. QEMU is built just once in .../src directory.
.../src_vanilla and .../src_cuse don't contain qemu anymore
2. 'make clean' deletes all built *.o files
3. 'make distclean' deletes all built and generated files
(distclean is used instead of cleanse now)
4. 'make' calls 'git pull' when repository is cloned already
JIRA: VSPERF-94
Change-Id: I80f9a135580b450fb4606cf947661049ff509548
Signed-off-by: Radek Zetik <radekx.zetik@intel.com>
Reviewed-by: Billy O Mahony <billy.o.mahony@intel.com>
Reviewed-by: Gene Snider <eugene.snider@huawei.com>
Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com>
Diffstat (limited to 'src/dpdk')
| -rwxr-xr-x | src/dpdk/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/dpdk/Makefile b/src/dpdk/Makefile index af743732..030e4ba9 100755 --- a/src/dpdk/Makefile +++ b/src/dpdk/Makefile @@ -48,6 +48,7 @@ INSTALL_TARGET = force_make # modify CONFIG_FILE to enable VHOST_USER build and restore original CONFIG_FILE after the build force_make: $(TAG_DONE_FLAG) + $(AT)cd $(WORK_DIR) && git pull $(DPDK_URL) $(DPDK_TAG) $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_USER=.\+/CONFIG_RTE_LIBRTE_VHOST_USER=$(VHOST_USER)/g' $(CONFIG_FILE) $(AT)sed -i -e 's/CONFIG_RTE_BUILD_COMBINE_LIBS=./CONFIG_RTE_BUILD_COMBINE_LIBS=y/g' $(CONFIG_FILE) $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST=./CONFIG_RTE_LIBRTE_VHOST=y/g' $(CONFIG_FILE) @@ -65,15 +66,16 @@ install: $(INSTALL_TARGET) @echo "install done" # hard way to clean and clobber -clean: cleanse +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) -# cleanse is for developer who would like to keep the +# distclean is for developer who would like to keep the # clone git repo, saving time to fetch again from url -cleanse: +distclean: $(AT)cd $(WORK_DIR) && git clean -xfd && git checkout -f test: |