Merge "xena_deadlock: Fix xena2544.exe deadlock"

[vswitchperf.git] / src / ovs / Makefile

diff --git a/src/ovs/Makefile b/src/ovs/Makefile
index d4acb9d..384d699 100644 (file)
--- a/src/ovs/Makefile
+++ b/src/ovs/Makefile
@@ -22,30 +22,46 @@
 include ../mk/master.mk
 include ../package-list.mk
 
+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
+# By default, OVS is built with DPDK
+
+# WITH_LINUX is the Linux kernel build directory used for building
+# OVS kernel module as documented in OVS --with-linux switch
+ifneq ($(WITH_LINUX),) # Building with Linux kernel
+CONFIG_CMD += --with-linux=$(WITH_LINUX)
+
+else # Building with DPDK
+
 # DPDK_DIR is the top directory for dpdk source tree
 # it can be passed in from Makefile command
 # if it is not set, try to read it in from environment
 # if it is still not set, then set it using relative path
-
 DPDK_DIR ?= $(shell echo $$DPDK_DIR)
 ifeq ($(DPDK_DIR),)
 DPDK_DIR = ../../dpdk/dpdk
 endif
 
+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
+
 .PHONY: install force_install config force_make
 
 # install depends on make
 force_install: force_make
 
-WORK_DIR = ovs
-TAG_DONE_FLAG = $(WORK_DIR)/.$(OVS_TAG).done
-CONFIG_CMD =
-CONFIG_CMD += ./configure
-CONFIG_CMD += --with-linux=$(LINUX_BUILD)
-CONFIG_CMD += --prefix=$(INSTALL_DIR)/usr
-CONFIG_CMD += --localstatedir=$(INSTALL_DIR)/usr/local
-CONFIG_CMD += --with-dpdk=$(DPDK_DIR)/build
-
 all: force_make
        @echo "Finished making $(WORK_DIR) "
 
@@ -56,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"
 
@@ -67,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:
@@ -92,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)