From 559b90fbbff137c8cbfc9a9c28da4f484f1c094f Mon Sep 17 00:00:00 2001 From: aliguori Date: Tue, 11 Nov 2008 21:20:14 +0000 Subject: Move the things that aren't target specific to libqemu_common.a. This will improve the build time. Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5699 c046a42c-6fe2-441c-8c8c-71466251a162 --- Makefile | 4 ++++ Makefile.target | 7 +++---- net.c | 13 +------------ 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 36b36cd..325e04d 100644 --- a/Makefile +++ b/Makefile @@ -78,6 +78,8 @@ OBJS+=usb.o usb-hub.o usb-linux.o usb-hid.o usb-msd.o usb-wacom.o OBJS+=usb-serial.o usb-net.o OBJS+=sd.o ssi-sd.o OBJS+=bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o +OBJS+=buffered_file.o migration.o migration-tcp.o net.o qemu-sockets.o +OBJS+=qemu-char.o aio.o net-checksum.o ifdef CONFIG_BRLAPI OBJS+= baum.o @@ -86,6 +88,8 @@ endif ifdef CONFIG_WIN32 OBJS+=tap-win32.o +else +OBJS+=migration-exec.o endif AUDIO_OBJS = audio.o noaudio.o wavaudio.o mixeng.o diff --git a/Makefile.target b/Makefile.target index 291b3a6..a15cbe0 100644 --- a/Makefile.target +++ b/Makefile.target @@ -587,16 +587,15 @@ endif #CONFIG_BSD_USER # System emulator target ifndef CONFIG_USER_ONLY -OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o net-checksum.o -OBJS+=fw_cfg.o aio.o buffered_file.o migration.o migration-tcp.o qemu-char.o -OBJS+=net.o qemu-sockets.o +OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o +OBJS+=fw_cfg.o ifdef CONFIG_KVM OBJS+=kvm.o kvm-all.o endif ifdef CONFIG_WIN32 OBJS+=block-raw-win32.o else -OBJS+=block-raw-posix.o migration-exec.o +OBJS+=block-raw-posix.o endif LIBS+=-lz diff --git a/net.c b/net.c index 35aeb1e..f94ff1b 100644 --- a/net.c +++ b/net.c @@ -21,24 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw/hw.h" -#include "hw/boards.h" -#include "hw/usb.h" -#include "hw/pcmcia.h" -#include "hw/pc.h" -#include "hw/audiodev.h" -#include "hw/isa.h" -#include "hw/baum.h" -#include "hw/bt.h" +#include "qemu-common.h" #include "net.h" #include "console.h" #include "sysemu.h" -#include "gdbstub.h" #include "qemu-timer.h" #include "qemu-char.h" -#include "block.h" #include "audio/audio.h" -#include "migration.h" #include #include -- cgit v1.1