Commit 559b90fbbff137c8cbfc9a9c28da4f484f1c094f
1 parent
9118e7f0
Move the things that aren't target specific to libqemu_common.a.
This will improve the build time. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5699 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
3 changed files
with
8 additions
and
16 deletions
Makefile
| ... | ... | @@ -78,6 +78,8 @@ OBJS+=usb.o usb-hub.o usb-linux.o usb-hid.o usb-msd.o usb-wacom.o |
| 78 | 78 | OBJS+=usb-serial.o usb-net.o |
| 79 | 79 | OBJS+=sd.o ssi-sd.o |
| 80 | 80 | OBJS+=bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o |
| 81 | +OBJS+=buffered_file.o migration.o migration-tcp.o net.o qemu-sockets.o | |
| 82 | +OBJS+=qemu-char.o aio.o net-checksum.o | |
| 81 | 83 | |
| 82 | 84 | ifdef CONFIG_BRLAPI |
| 83 | 85 | OBJS+= baum.o |
| ... | ... | @@ -86,6 +88,8 @@ endif |
| 86 | 88 | |
| 87 | 89 | ifdef CONFIG_WIN32 |
| 88 | 90 | OBJS+=tap-win32.o |
| 91 | +else | |
| 92 | +OBJS+=migration-exec.o | |
| 89 | 93 | endif |
| 90 | 94 | |
| 91 | 95 | AUDIO_OBJS = audio.o noaudio.o wavaudio.o mixeng.o | ... | ... |
Makefile.target
| ... | ... | @@ -587,16 +587,15 @@ endif #CONFIG_BSD_USER |
| 587 | 587 | # System emulator target |
| 588 | 588 | ifndef CONFIG_USER_ONLY |
| 589 | 589 | |
| 590 | -OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o net-checksum.o | |
| 591 | -OBJS+=fw_cfg.o aio.o buffered_file.o migration.o migration-tcp.o qemu-char.o | |
| 592 | -OBJS+=net.o qemu-sockets.o | |
| 590 | +OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o | |
| 591 | +OBJS+=fw_cfg.o | |
| 593 | 592 | ifdef CONFIG_KVM |
| 594 | 593 | OBJS+=kvm.o kvm-all.o |
| 595 | 594 | endif |
| 596 | 595 | ifdef CONFIG_WIN32 |
| 597 | 596 | OBJS+=block-raw-win32.o |
| 598 | 597 | else |
| 599 | -OBJS+=block-raw-posix.o migration-exec.o | |
| 598 | +OBJS+=block-raw-posix.o | |
| 600 | 599 | endif |
| 601 | 600 | |
| 602 | 601 | LIBS+=-lz | ... | ... |
net.c
| ... | ... | @@ -21,24 +21,13 @@ |
| 21 | 21 | * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
| 22 | 22 | * THE SOFTWARE. |
| 23 | 23 | */ |
| 24 | -#include "hw/hw.h" | |
| 25 | -#include "hw/boards.h" | |
| 26 | -#include "hw/usb.h" | |
| 27 | -#include "hw/pcmcia.h" | |
| 28 | -#include "hw/pc.h" | |
| 29 | -#include "hw/audiodev.h" | |
| 30 | -#include "hw/isa.h" | |
| 31 | -#include "hw/baum.h" | |
| 32 | -#include "hw/bt.h" | |
| 24 | +#include "qemu-common.h" | |
| 33 | 25 | #include "net.h" |
| 34 | 26 | #include "console.h" |
| 35 | 27 | #include "sysemu.h" |
| 36 | -#include "gdbstub.h" | |
| 37 | 28 | #include "qemu-timer.h" |
| 38 | 29 | #include "qemu-char.h" |
| 39 | -#include "block.h" | |
| 40 | 30 | #include "audio/audio.h" |
| 41 | -#include "migration.h" | |
| 42 | 31 | |
| 43 | 32 | #include <unistd.h> |
| 44 | 33 | #include <fcntl.h> | ... | ... |