From: Maryam Tahhan <maryam.tahhan@intel.com>
Date: Wed, 12 Aug 2015 10:57:13 +0000 (+0000)
Subject: Merge "src: Add QEMU makefile"
X-Git-Tag: brahmaputra.1.0~117
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0eff3e49f89c98f7332cae91cdac296ac5e0ac4b;p=vswitchperf.git

Merge "src: Add QEMU makefile"
---

0eff3e49f89c98f7332cae91cdac296ac5e0ac4b
diff --cc src/Makefile
index 20e78906,496b717b..0b62da3e
--- a/src/Makefile
+++ b/src/Makefile
@@@ -26,14 -24,11 +26,15 @@@ export VHOST_USE
  # specify upstream package as SUBDIRS - common terms as suggest by gnu-make
  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
  
  include mk/make-subsys.mk