aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile
diff options
context:
space:
mode:
authorRadek Zetik <radekx.zetik@intel.com>2015-10-01 18:13:18 +0100
committerMaryam Tahhan <maryam.tahhan@intel.com>2015-10-07 14:52:16 +0000
commit1550b638fca662c5e68556702ff0316c3fc9562c (patch)
treeb1127cc75b45fd64b216070ed78b57e52db2c30e /src/Makefile
parent46e36fffc36753b0e8e3f79f78dc084f26930a82 (diff)
The 'make' creates all required variants of vSwitch
Currently the VSPERF makefiles make just one variant of vSwitch - OVS with DPDK-vhost-user. To make the other variants the makefile has to be edited. And the make re-run. The fix builds all required versions: DPDK-vhost-user OVS (in src/) Vanilla OVS (in src_vanilla/) DPDK-vhost-cuse OVS (in src_cuse/) HowTo: - git clone vsperf - cd .../src - make JIRA: VSPERF-85 Change-Id: I469baf8432f0b127cde785f35a6c57a2c778f23f Signed-off-by: Radek Zetik <radekx.zetik@intel.com> Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com> Reviewed-by: Brian Castelli <brian.castelli@spirent.com>
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile26
1 files changed, 16 insertions, 10 deletions
diff --git a/src/Makefile b/src/Makefile
index 0b62da3e..81143ae9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -19,22 +19,28 @@
# Contributors:
# Aihua Li, Huawei Technologies.
-include mk/master.mk
+SUBBUILDS = src_cuse src_vanilla
+.PHONY: vhost subbuilds $(SUBBUILDS)
-export VHOST_USER
+all: vhost subbuilds
-# specify upstream package as SUBDIRS - common terms as suggest by gnu-make
+subbuilds: $(SUBBUILDS)
+$(SUBBUILDS): vhost
+ $(AT)mkdir -p ../$@/mk
+ $(AT)cp -rf mk/* ../$@/mk
+ $(AT)cp -rf package-list.mk ../$@/
+ $(AT)cp Makefile.$@ ../$@/Makefile
+ $(AT)$(MAKE) -C ../$@
+
+vhost:
+export VHOST_USER
+include mk/master.mk
SUBDIRS =
SUBDIRS += l2fwd
-ifeq ($(WITH_LINUX),)
SUBDIRS += dpdk
-endif
SUBDIRS += ovs
SUBDIRS += qemu
-
-ifeq ($(WITH_LINUX),)
-# specify package dependency here if needed
ovs: dpdk
-endif
-
+WITH_LINUX =
+VHOST_USER = y
include mk/make-subsys.mk