[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 76/81] VDE libs are used both by tools and softmmu
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 76/81] VDE libs are used both by tools and softmmu |
Date: |
Mon, 3 Aug 2009 14:47:07 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile | 2 --
Makefile.target | 2 +-
configure | 3 ++-
3 files changed, 3 insertions(+), 4 deletions(-)
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:]'`
--
1.6.2.5
- [Qemu-devel] [PATCH 69/81] CONFIG_POSIX makes more sense that not CONFIG_WIN32, (continued)
[Qemu-devel] [PATCH 71/81] Consolidate audio flags in configure, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 73/81] use TARGET_<arch name> for selection, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 72/81] We also need TARGET_<arechname> in Makefiles, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 74/81] Disable aio in mingw32, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 76/81] VDE libs are used both by tools and softmmu,
Juan Quintela <=
[Qemu-devel] [PATCH 75/81] Add libs_tools support, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 77/81] CURL libs are used both by tools and softmmu, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 79/81] convert gprof flags to style of rest of Makefile, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 78/81] Add cocoa libs at Darwin selection time, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 80/81] Move libsunpath to use the same style than everything else, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 81/81] rename aio/CONFIG_AIO to posix_aio/CONFIG_POSIX_AIO, Juan Quintela, 2009/08/03