Re: [Qemu-devel] [PATCH 2/4] ui: build keymap only with softmmu targets

[Paolo Bonzini]

On 26/03/19 10:04, Laurent Vivier wrote:
> On 26/03/2019 09:44, Paolo Bonzini wrote:
>> On 21/03/19 13:46, Laurent Vivier wrote:
>>> we don't need to generate the files for linux-user or for the tools
>>>
>>> Signed-off-by: Laurent Vivier <address@hidden>
>>> ---
>>>  Makefile | 2 ++
>>>  1 file changed, 2 insertions(+)
>>>
>>> diff --git a/Makefile b/Makefile
>>> index d8dad39c5db1..609fac844637 100644
>>> --- a/Makefile
>>> +++ b/Makefile
>>> @@ -261,6 +261,7 @@ trace-dtrace-root.o: trace-dtrace-root.dtrace
>>>  KEYCODEMAP_GEN = $(SRC_PATH)/ui/keycodemapdb/tools/keymap-gen
>>>  KEYCODEMAP_CSV = $(SRC_PATH)/ui/keycodemapdb/data/keymaps.csv
>>>  
>>> +ifdef CONFIG_SOFTMMU
>>>  KEYCODEMAP_FILES = \
>>>              ui/input-keymap-atset1-to-qcode.c \
>>>              ui/input-keymap-linux-to-qcode.c \
>>> @@ -295,6 +296,7 @@ ui/input-keymap-%.c: $(KEYCODEMAP_GEN) 
>>> $(KEYCODEMAP_CSV) $(SRC_PATH)/ui/Makefile
>>>  
>>>  $(KEYCODEMAP_GEN): .git-submodule-status
>>>  $(KEYCODEMAP_CSV): .git-submodule-status
>>> +endif
>>
>> I think all you need is
>>
>> if CONFIG_SOFTMMU
>> GENERATED_FILES += $(KEYCODEMAP_FILES)
>> endif
> 
> I agree the result is the same.
> The idea was to disable all the block related to the input kaymap
> generation.

As long as the rules are not invoked, larger "if"s only add complexity.
 In fact, perhaps we could also change GENERATED_FILES to
generated-files-y and use generated-files-$(CONFIG_SOFTMMU) here.

Paolo