X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fovs%2FMakefile;h=e3adc2f86459d96a1a8153bc19c932a7fedc8411;hb=f765c92fe25c6c3cf035f633367c50ed4f96dda8;hp=a67057f5e99f65ddc2a370863245bd40a7ec2632;hpb=d8e69f9d31492faf685bd92944cc3f4e76c4b1d1;p=vswitchperf.git

diff --git a/src/ovs/Makefile b/src/ovs/Makefile
index a67057f5..e3adc2f8 100644
--- a/src/ovs/Makefile
+++ b/src/ovs/Makefile
@@ -27,7 +27,6 @@ TAG_DONE_FLAG = $(WORK_DIR)/.$(OVS_TAG).done
 CONFIG_CMD =
 CONFIG_CMD += ./configure
 OVS_VANILLA = ../../src_vanilla/ovs
-OVS_CUSE = ../../src_cuse/ovs
 
 # If WITH_LINUX is defined, OVS is built without DPDK but with kernel
 # module
@@ -72,6 +71,8 @@ config $(WORK_DIR)/Makefile: $(WORK_DIR)/configure
 INSTALL_TARGET = force_install force_make
 
 force_make: $(WORK_DIR)/Makefile
+	$(AT)cd $(WORK_DIR) && git pull $(OVS_URL) $(OVS_TAG)
+	@echo "git pull done"
 	$(AT)echo "WITH_LINUX = $(WITH_LINUX)"
 	$(AT)$(MAKE) -C $(WORK_DIR) $(MORE_MAKE_FLAGS)
 	@echo "Make done"
@@ -84,14 +85,14 @@ install: $(INSTALL_TARGET)
 
 # hard way to clean and clobber
 clean:
+	$(AT)cd $(WORK_DIR) && git clean -xfd *.o
 clobber:
 	$(AT)rm -rf $(WORK_DIR)
 	$(AT)rm -rf $(OVS_VANILLA)
-	$(AT)rm -rf $(OVS_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:
@@ -110,11 +111,9 @@ boot $(WORK_DIR)/configure:
 boot $(WORK_DIR)/configure: $(TAG_DONE_FLAG)
 
 $(WORK_DIR):
-	$(AT)git clone $(OVS_URL)
+	$(AT)git clone $(OVS_URL) ovs
 	$(AT)mkdir -p $(OVS_VANILLA)
 	$(AT)cp -rf ./* $(OVS_VANILLA)
-	$(AT)mkdir -p $(OVS_CUSE)
-	$(AT)cp -rf ./* $(OVS_CUSE)
 
 $(TAG_DONE_FLAG): $(WORK_DIR)
 	$(AT)cd ovs; git checkout $(OVS_TAG)