ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Fam Zheng 2017-09-07 16:35:52 +08:00
parent 27ad39ba61
commit e2ad6f16a8
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -2946,8 +2946,6 @@ int main(void)
EOF EOF
if compile_prog "" "$vde_libs" ; then if compile_prog "" "$vde_libs" ; then
vde=yes vde=yes
libs_softmmu="$vde_libs $libs_softmmu"
libs_tools="$vde_libs $libs_tools"
else else
if test "$vde" = "yes" ; then if test "$vde" = "yes" ; then
feature_not_found "vde" "Install vde (Virtual Distributed Ethernet) devel" feature_not_found "vde" "Install vde (Virtual Distributed Ethernet) devel"
@ -5499,6 +5497,7 @@ if test "$slirp" = "yes" ; then
fi fi
if test "$vde" = "yes" ; then if test "$vde" = "yes" ; then
echo "CONFIG_VDE=y" >> $config_host_mak echo "CONFIG_VDE=y" >> $config_host_mak
echo "VDE_LIBS=$vde_libs" >> $config_host_mak
fi fi
if test "$netmap" = "yes" ; then if test "$netmap" = "yes" ; then
echo "CONFIG_NETMAP=y" >> $config_host_mak echo "CONFIG_NETMAP=y" >> $config_host_mak

2
net/Makefile.objs
View File

@ -21,3 +21,5 @@ tap-obj-$(CONFIG_SOLARIS) = tap-solaris.o
tap-obj-y ?= tap-stub.o tap-obj-y ?= tap-stub.o
common-obj-$(CONFIG_POSIX) += tap.o $(tap-obj-y) common-obj-$(CONFIG_POSIX) += tap.o $(tap-obj-y)
common-obj-$(CONFIG_WIN32) += tap-win32.o common-obj-$(CONFIG_WIN32) += tap-win32.o
vde.o-libs = $(VDE_LIBS)