| Message ID | 1338726358-30681-12-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Sun, Jun 3, 2012 at 12:25 PM, Paolo Bonzini <pbonzini@redhat.com> wrote: > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > Makefile.objs | 17 +---------------- > net/Makefile | 13 +++++++++++++ > 2 files changed, 14 insertions(+), 16 deletions(-) > create mode 100644 net/Makefile > > diff --git a/Makefile.objs b/Makefile.objs > index 7c8a997..8433fad 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 b/net/Makefile > new file mode 100644 > index 0000000..e970ec4 > --- /dev/null > +++ b/net/Makefile > @@ -0,0 +1,13 @@ > +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 > + Blank at end. > -- > 1.7.10.1 > > >
diff --git a/Makefile.objs b/Makefile.objs index 7c8a997..8433fad 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 b/net/Makefile new file mode 100644 index 0000000..e970ec4 --- /dev/null +++ b/net/Makefile @@ -0,0 +1,13 @@ +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 +
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- Makefile.objs | 17 +---------------- net/Makefile | 13 +++++++++++++ 2 files changed, 14 insertions(+), 16 deletions(-) create mode 100644 net/Makefile