Re: [Qemu-devel] [PATCH 12/24] move fsdev/ objects to nested Makefile

[Blue Swirl]

On Sun, Jun 3, 2012 at 12:25 PM, Paolo Bonzini <address@hidden> wrote:
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
>  Makefile.objs  |    6 +-----
>  fsdev/Makefile |    6 ++++++
>  2 files changed, 7 insertions(+), 5 deletions(-)
>  create mode 100644 fsdev/Makefile
>
> diff --git a/Makefile.objs b/Makefile.objs
> index 8433fad..383d4cc 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -51,11 +51,7 @@ 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.
>  CONFIG_REALLY_VIRTFS=y
> -fsdev-nested-y = qemu-fsdev.o virtio-9p-marshal.o
> -else
> -fsdev-nested-y = qemu-fsdev-dummy.o
>  endif
> -fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y))
>
>  ######################################################################
>  # Target independent part of system emulation. The long term path is to
> @@ -65,7 +61,7 @@ fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, 
> $(fsdev-nested-y))
>  common-obj-y = $(block-obj-y) blockdev.o
>  common-obj-y += net.o net/
>  common-obj-y += qom/
> -common-obj-$(CONFIG_LINUX) += $(fsdev-obj-$(CONFIG_LINUX))
> +common-obj-$(CONFIG_LINUX) += fsdev/
>  common-obj-y += readline.o console.o cursor.o
>  common-obj-y += $(oslib-obj-y)
>  common-obj-$(CONFIG_WIN32) += os-win32.o
> diff --git a/fsdev/Makefile b/fsdev/Makefile
> new file mode 100644
> index 0000000..7f13d86
> --- /dev/null
> +++ b/fsdev/Makefile
> @@ -0,0 +1,6 @@
> +ifeq ($(CONFIG_REALLY_VIRTFS),y)
> +common-obj-y = qemu-fsdev.o virtio-9p-marshal.o
> +else
> +common-obj-y = qemu-fsdev-dummy.o
> +endif
> +

Empty line at the end.

> --
> 1.7.10.1
>
>
>