Merge "xena_deadlock: Fix xena2544.exe deadlock"

[vswitchperf.git] / src / ovs / Makefile

diff --git a/src/ovs/Makefile b/src/ovs/Makefile
index a67057f..384d699 100644 (file)
--- a/src/ovs/Makefile
+++ b/src/ovs/Makefile
@@ -72,6 +72,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 +86,15 @@ 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: