[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 14/29] build: move net/ objects to nested Makefil
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v3 14/29] build: move net/ objects to nested Makefile.objs |
Date: |
Thu, 7 Jun 2012 09:39:59 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile.objs | 17 +----------------
net/Makefile.objs | 12 ++++++++++++
2 files changed, 13 insertions(+), 16 deletions(-)
create mode 100644 net/Makefile.objs
diff --git a/Makefile.objs b/Makefile.objs
index 3285949..f40be38 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -47,21 +47,6 @@ block-obj-$(CONFIG_POSIX) += posix-aio-compat.o
block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o
block-obj-y += block/
-net-obj-y = net.o
-net-nested-y = queue.o checksum.o util.o
-net-nested-y += socket.o
-net-nested-y += dump.o
-net-nested-$(CONFIG_POSIX) += tap.o
-net-nested-$(CONFIG_LINUX) += tap-linux.o
-net-nested-$(CONFIG_WIN32) += tap-win32.o
-net-nested-$(CONFIG_BSD) += tap-bsd.o
-net-nested-$(CONFIG_SOLARIS) += tap-solaris.o
-net-nested-$(CONFIG_AIX) += tap-aix.o
-net-nested-$(CONFIG_HAIKU) += tap-haiku.o
-net-nested-$(CONFIG_SLIRP) += slirp.o
-net-nested-$(CONFIG_VDE) += vde.o
-net-obj-y += $(addprefix net/, $(net-nested-y))
-
ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)
# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.
# only pull in the actual virtio-9p device if we also enabled virtio.
@@ -78,7 +63,7 @@ fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/,
$(fsdev-nested-y))
# single QEMU executable should support all CPUs and machines.
common-obj-y = $(block-obj-y) blockdev.o
-common-obj-y += $(net-obj-y)
+common-obj-y += net.o net/
common-obj-y += qom/
common-obj-$(CONFIG_LINUX) += $(fsdev-obj-$(CONFIG_LINUX))
common-obj-y += readline.o console.o cursor.o
diff --git a/net/Makefile.objs b/net/Makefile.objs
new file mode 100644
index 0000000..72f50bc
--- /dev/null
+++ b/net/Makefile.objs
@@ -0,0 +1,12 @@
+common-obj-y = queue.o checksum.o util.o
+common-obj-y += socket.o
+common-obj-y += dump.o
+common-obj-$(CONFIG_POSIX) += tap.o
+common-obj-$(CONFIG_LINUX) += tap-linux.o
+common-obj-$(CONFIG_WIN32) += tap-win32.o
+common-obj-$(CONFIG_BSD) += tap-bsd.o
+common-obj-$(CONFIG_SOLARIS) += tap-solaris.o
+common-obj-$(CONFIG_AIX) += tap-aix.o
+common-obj-$(CONFIG_HAIKU) += tap-haiku.o
+common-obj-$(CONFIG_SLIRP) += slirp.o
+common-obj-$(CONFIG_VDE) += vde.o
--
1.7.10.1
- [Qemu-devel] [PATCH v3 04/29] build: move *-user/ objects to nested Makefile.objs, (continued)
- [Qemu-devel] [PATCH v3 10/29] build: move other target-*/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 11/29] build: move rules for nesting to Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 13/29] build: move block/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 12/29] build: adapt qom/Makefile and move it to Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 14/29] build: move net/ objects to nested Makefile.objs,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v3 21/29] build: move target-independent hw/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 25/29] build: libcacard Makefile cleanups, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 26/29] build: limit usage of vpath, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 28/29] configure: ensure directory exists when creating symlink, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 15/29] build: move fsdev/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 07/29] dump: do not compile dump.o for user-mode emulation, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 29/29] build: do not create directories at configure time, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 09/29] dump: remove dumping stuff from cpu-all.h, Paolo Bonzini, 2012/06/07
- [Qemu-devel] [PATCH v3 23/29] build: move per-target hw/ objects to nested Makefile.objs, Paolo Bonzini, 2012/06/07