diff mbox

[76/81] VDE libs are used both by tools and softmmu

Message ID 27169c18420c8fa993a8f5c94acab0dd29098df9.1249301360.git.quintela@redhat.com
State Superseded
Headers show

Commit Message

Juan Quintela Aug. 3, 2009, 12:47 p.m. UTC 
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile        |    2 --
 Makefile.target |    2 +-
 configure       |    3 ++-
 3 files changed, 3 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/Makefile b/Makefile
index d466c38..7fe36c4 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 2e49e73..01275f8 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 1a91c86..1da827b 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:]'`