Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 Makefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Makefile b/Makefile
index 73fbba0..7b0e2f4 100644
--- a/Makefile
+++ b/Makefile
@@ -429,10 +429,6 @@ dummy := $(call unnest-vars,, \
                 io-obj-y \
                 common-obj-y \
                 common-obj-m \
-                ui-obj-y \
-                ui-obj-m \
-                audio-obj-y \
-                audio-obj-m \
                 trace-obj-y)
 
 include $(SRC_PATH)/tests/Makefile.include
-- 
1.8.3.1

Paolo Bonzini <pbonzini@redhat.com> writes:

> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  Makefile | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 73fbba0..7b0e2f4 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -429,10 +429,6 @@ dummy := $(call unnest-vars,, \
>                  io-obj-y \
>                  common-obj-y \
>                  common-obj-m \
> -                ui-obj-y \
> -                ui-obj-m \
> -                audio-obj-y \
> -                audio-obj-m \
>                  trace-obj-y)
>  
>  include $(SRC_PATH)/tests/Makefile.include

Reviewed-by: Markus Armbruster <armbru@redhat.com>

Markus Armbruster <armbru@redhat.com> writes:

> Paolo Bonzini <pbonzini@redhat.com> writes:
>
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> ---
>>  Makefile | 4 ----
>>  1 file changed, 4 deletions(-)
>>
>> diff --git a/Makefile b/Makefile
>> index 73fbba0..7b0e2f4 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -429,10 +429,6 @@ dummy := $(call unnest-vars,, \
>>                  io-obj-y \
>>                  common-obj-y \
>>                  common-obj-m \
>> -                ui-obj-y \
>> -                ui-obj-m \
>> -                audio-obj-y \
>> -                audio-obj-m \
>>                  trace-obj-y)
>>  
>>  include $(SRC_PATH)/tests/Makefile.include
>
> Reviewed-by: Markus Armbruster <armbru@redhat.com>

Hmm...  the two go back to

commit 08a05b379ac56430cbb748882ff1b48dc9fe8729
Author: Gerd Hoffmann <kraxel@redhat.com>
Date:   Tue Mar 6 08:40:49 2018 +0100

    build: enable audio modules
    
    Add audio/ to common-obj-m variable.
    
    Also run both audio and ui variables through unnest-vars.
    This avoids sdl.mo (exists in both audio/ and ui/) name clashes.
    
    Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
    Message-id: 20180306074053.22856-4-kraxel@redhat.com

Gerd, anything funny going on here, or is Paolo's patch okay?

On Tue, Aug 06, 2019 at 07:48:43AM +0200, Markus Armbruster wrote:
> Markus Armbruster <armbru@redhat.com> writes:
> 
> > Paolo Bonzini <pbonzini@redhat.com> writes:
> >
> >> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> >> ---
> >>  Makefile | 4 ----
> >>  1 file changed, 4 deletions(-)
> >>
> >> diff --git a/Makefile b/Makefile
> >> index 73fbba0..7b0e2f4 100644
> >> --- a/Makefile
> >> +++ b/Makefile
> >> @@ -429,10 +429,6 @@ dummy := $(call unnest-vars,, \
> >>                  io-obj-y \
> >>                  common-obj-y \
> >>                  common-obj-m \
> >> -                ui-obj-y \
> >> -                ui-obj-m \
> >> -                audio-obj-y \
> >> -                audio-obj-m \
> >>                  trace-obj-y)
> >>  
> >>  include $(SRC_PATH)/tests/Makefile.include
> >
> > Reviewed-by: Markus Armbruster <armbru@redhat.com>
> 
> Hmm...  the two go back to
> 
> commit 08a05b379ac56430cbb748882ff1b48dc9fe8729
> Author: Gerd Hoffmann <kraxel@redhat.com>
> Date:   Tue Mar 6 08:40:49 2018 +0100
> 
>     build: enable audio modules
>     
>     Add audio/ to common-obj-m variable.
>     
>     Also run both audio and ui variables through unnest-vars.
>     This avoids sdl.mo (exists in both audio/ and ui/) name clashes.
>     
>     Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
>     Message-id: 20180306074053.22856-4-kraxel@redhat.com
> 
> Gerd, anything funny going on here, or is Paolo's patch okay?

Well, the commit message pretty much says it.  We have sdl.mo in both
ui/ and audio/ (final module names are audio-sdl.so and ui-sdl.so).

This certainly was needed back when I added it.  Possibly it can be
removed now, I don't follow build system changes that closely.  But
it should be build-tested both ui/sdl and audio/sdl enabled.

cheers,
  Gerd

On 06/08/19 08:40, Gerd Hoffmann wrote:
> Well, the commit message pretty much says it.  We have sdl.mo in both
> ui/ and audio/ (final module names are audio-sdl.so and ui-sdl.so).
> 
> This certainly was needed back when I added it.  Possibly it can be
> removed now, I don't follow build system changes that closely.  But
> it should be build-tested both ui/sdl and audio/sdl enabled.

Will do.  However, audio-obj-y has not existed since commit b0b68fc671
("build: move audio/ objects to nested Makefile.objs", 2012-06-07), and
ui-obj-y since 8867aef02e ("build: move ui/ objects to nested
Makefile.objs", 2012-06-07).  audio-obj-m and ui-obj-m has never existed
as far as I can tell.

My understanding is that the two are audio/sdl.mo and ui/sdl.mo, and
even though the sdl.mo-* variables seem to conflict, they are rewritten
to audio/sdl.mo-{cflags,libs,objs} and ui/sdl.mo-{cflags,libs,objs} when
unnest-vars-recursive calls fix-paths.

Paolo