Re: [Qemu-devel] [PATCH 14/24] move audio/ 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  |   18 ++----------------
>  audio/Makefile |   15 +++++++++++++++
>  2 files changed, 17 insertions(+), 16 deletions(-)
>  create mode 100644 audio/Makefile
>
> diff --git a/Makefile.objs b/Makefile.objs
> index b0fa446..f1be02a 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -108,23 +108,9 @@ common-obj-$(CONFIG_BRLAPI) += baum.o
>  common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o 
> migration-fd.o
>  common-obj-$(CONFIG_WIN32) += version.o
>
> -
> -audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o
> -audio-obj-$(CONFIG_SDL) += sdlaudio.o
> -audio-obj-$(CONFIG_OSS) += ossaudio.o
> -audio-obj-$(CONFIG_SPICE) += spiceaudio.o
> -audio-obj-$(CONFIG_COREAUDIO) += coreaudio.o
> -audio-obj-$(CONFIG_ALSA) += alsaaudio.o
> -audio-obj-$(CONFIG_DSOUND) += dsoundaudio.o
> -audio-obj-$(CONFIG_FMOD) += fmodaudio.o
> -audio-obj-$(CONFIG_ESD) += esdaudio.o
> -audio-obj-$(CONFIG_PA) += paaudio.o
> -audio-obj-$(CONFIG_WINWAVE) += winwaveaudio.o
> -audio-obj-$(CONFIG_AUDIO_PT_INT) += audio_pt_int.o
> -audio-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o
> -audio-obj-y += wavcapture.o
> -common-obj-y += $(addprefix audio/, $(audio-obj-y))
>  common-obj-$(CONFIG_SPICE) += spice-qemu-char.o
> +
> +common-obj-y += audio/
>  common-obj-y += ui/
>
>  common-obj-y += iov.o acl.o
> diff --git a/audio/Makefile b/audio/Makefile
> new file mode 100644
> index 0000000..a54f7ae
> --- /dev/null
> +++ b/audio/Makefile
> @@ -0,0 +1,15 @@
> +common-obj-y = audio.o noaudio.o wavaudio.o mixeng.o
> +common-obj-$(CONFIG_SDL) += sdlaudio.o
> +common-obj-$(CONFIG_OSS) += ossaudio.o
> +common-obj-$(CONFIG_SPICE) += spiceaudio.o
> +common-obj-$(CONFIG_COREAUDIO) += coreaudio.o
> +common-obj-$(CONFIG_ALSA) += alsaaudio.o
> +common-obj-$(CONFIG_DSOUND) += dsoundaudio.o
> +common-obj-$(CONFIG_FMOD) += fmodaudio.o
> +common-obj-$(CONFIG_ESD) += esdaudio.o
> +common-obj-$(CONFIG_PA) += paaudio.o
> +common-obj-$(CONFIG_WINWAVE) += winwaveaudio.o
> +common-obj-$(CONFIG_AUDIO_PT_INT) += audio_pt_int.o
> +common-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o
> +common-obj-y += wavcapture.o
> +

Also here.

> --
> 1.7.10.1
>
>
>