summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFam Zheng <famz@redhat.com>2017-09-07 16:35:52 +0800
committerFam Zheng <famz@redhat.com>2017-09-22 10:20:34 +0800
commite2ad6f16a88031cb85c5409fb158e15dac966f80 (patch)
tree7322144dc29cae4d0c4427ea88fce35ba1861623
parent27ad39ba6182625dbd56cf8949c13631a347775b (diff)
downloadqemu-e2ad6f16a88031cb85c5409fb158e15dac966f80.tar.gz
buildsys: Move vde libs to per object
Signed-off-by: Fam Zheng <famz@redhat.com> Message-Id: <20170907083552.17725-3-famz@redhat.com> Reviewed-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Fam Zheng <famz@redhat.com>
-rwxr-xr-xconfigure3
-rw-r--r--net/Makefile.objs2
2 files changed, 3 insertions, 2 deletions
diff --git a/configure b/configure
index cb0f7ed0ab..956ab367dc 100755
--- a/configure
+++ b/configure
@@ -2946,8 +2946,6 @@ int main(void)
EOF
if compile_prog "" "$vde_libs" ; then
vde=yes
- libs_softmmu="$vde_libs $libs_softmmu"
- libs_tools="$vde_libs $libs_tools"
else
if test "$vde" = "yes" ; then
feature_not_found "vde" "Install vde (Virtual Distributed Ethernet) devel"
@@ -5499,6 +5497,7 @@ if test "$slirp" = "yes" ; then
fi
if test "$vde" = "yes" ; then
echo "CONFIG_VDE=y" >> $config_host_mak
+ echo "VDE_LIBS=$vde_libs" >> $config_host_mak
fi
if test "$netmap" = "yes" ; then
echo "CONFIG_NETMAP=y" >> $config_host_mak
diff --git a/net/Makefile.objs b/net/Makefile.objs
index 67ba5e26fb..64adf32f40 100644
--- a/net/Makefile.objs
+++ b/net/Makefile.objs
@@ -21,3 +21,5 @@ tap-obj-$(CONFIG_SOLARIS) = tap-solaris.o
tap-obj-y ?= tap-stub.o
common-obj-$(CONFIG_POSIX) += tap.o $(tap-obj-y)
common-obj-$(CONFIG_WIN32) += tap-win32.o
+
+vde.o-libs = $(VDE_LIBS)