VDE libs are used both by tools and softmmu
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Message-Id:
This commit is contained in:
parent
3e2e0e6ba8
commit
8e02e54cc4
2
Makefile
2
Makefile
@ -124,8 +124,6 @@ slirp-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o
|
||||
slirp-obj-y += tcp_subr.o tcp_timer.o udp.o bootp.o tftp.o
|
||||
obj-$(CONFIG_SLIRP) += $(addprefix slirp/, $(slirp-obj-y))
|
||||
|
||||
LIBS+=$(VDE_LIBS)
|
||||
|
||||
# xen backend driver support
|
||||
obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o
|
||||
obj-$(CONFIG_XEN) += xen_console.o xenfb.o xen_disk.o xen_nic.o
|
||||
|
@ -300,7 +300,7 @@ vl.o: qemu-options.h
|
||||
|
||||
monitor.o: qemu-monitor.h
|
||||
|
||||
LIBS += $(COCOA_LIBS) $(VDE_LIBS) $(CURL_LIBS)
|
||||
LIBS += $(COCOA_LIBS) $(CURL_LIBS)
|
||||
ARLIBS=../libqemu_common.a libqemu.a $(HWLIB)
|
||||
|
||||
endif # CONFIG_SOFTMMU
|
||||
|
3
configure
vendored
3
configure
vendored
@ -962,6 +962,8 @@ int main(void)
|
||||
EOF
|
||||
if compile_prog "" "$vde_libs" ; then
|
||||
vde=yes
|
||||
libs_softmmu="$vde_libs $libs_softmmu"
|
||||
libs_tools="$vde_libs $libs_tools"
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -1613,7 +1615,6 @@ 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
|
||||
for card in $audio_card_list; do
|
||||
def=CONFIG_`echo $card | tr '[:lower:]' '[:upper:]'`
|
||||
|
Loading…
Reference in New Issue
Block a user