aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--Makefile.target2
-rwxr-xr-xconfigure3
3 files changed, 3 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 142a21793b..48f2fd4176 100644
--- a/Makefile
+++ b/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
diff --git a/Makefile.target b/Makefile.target
index 6553ecf5b5..94f0cc3c97 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -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
diff --git a/configure b/configure
index 2f27a26fa7..1add80f56e 100755
--- a/configure
+++ b/configure
@@ -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:]'`