Merge "xena_deadlock: Fix xena2544.exe deadlock"

[vswitchperf.git] / src / ovs / Makefile

diff --git a/src/ovs/Makefile b/src/ovs/Makefile
old mode 100755 (executable)
new mode 100644 (file)
index 223d2dc..384d699
--- a/src/ovs/Makefile
+++ b/src/ovs/Makefile
@@ -26,6 +26,8 @@ WORK_DIR = ovs
 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
@@ -51,6 +53,7 @@ ifeq ($(DPDK_TARGET),)
 DPDK_TARGET = x86_64-native-linuxapp-gcc
 endif
 CONFIG_CMD += --with-dpdk=$(DPDK_DIR)/$(DPDK_TARGET)
+CONFIG_CMD += CFLAGS="-g -O2 -Wno-cast-align"
 
 endif # Kernel vs. DPDK
 
@@ -69,6 +72,9 @@ 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"
 
@@ -80,12 +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:
@@ -105,6 +114,10 @@ boot $(WORK_DIR)/configure: $(TAG_DONE_FLAG)
 
 $(WORK_DIR):
        $(AT)git clone $(OVS_URL)
+       $(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)