Re: [Xen-devel] [XEN PATCH v3 07/23] xen/build: Use obj-y += subdir/ instead of subdir-y

[Jan Beulich <jbeulich@xxxxxxxx>]

On 27.02.2020 10:43, Jan Beulich wrote:
> On 26.02.2020 12:33, Anthony PERARD wrote:
>> --- a/xen/Rules.mk
>> +++ b/xen/Rules.mk
>> @@ -111,17 +111,14 @@ define gendep
>>  endef
>>  $(foreach o,$(filter-out %/,$(obj-y) $(obj-bin-y) $(extra-y)),$(eval $(call 
>> gendep,$(o))))
>>  
>> -# Ensure each subdirectory has exactly one trailing slash.
>> -subdir-n := $(patsubst %,%/,$(patsubst %/,%,$(subdir-n) $(subdir-)))
>> -subdir-y := $(patsubst %,%/,$(patsubst %/,%,$(subdir-y)))
>> -
>> -# Add explicitly declared subdirectories to the object lists.
>> -obj-y += $(patsubst %/,%/built_in.o,$(subdir-y))
>> -
>> -# Add implicitly declared subdirectories (in the object lists) to the
>> -# subdirectory list, and rewrite the object-list entry.
>> -subdir-y += $(filter %/,$(obj-y))
>> -obj-y    := $(patsubst %/,%/built-in.o,$(obj-y))
>> +# Handle objects in subdirs
>> +# 
>> ---------------------------------------------------------------------------
>> +# o if we encounter foo/ in $(obj-y), replace it by foo/built_in.o
>> +#   and add the directory to the list of dirs to descend into: $(subdir-y)
>> +subdir-y := $(subdir-y) $(filter %/, $(obj-y))
>> +obj-y    := $(patsubst %/, %/built_in.o, $(obj-y))
>> +
>> +subdir-n   := $(subdir-n) $(subdir-) $(filter %/, $(obj-n) $(obj-))
> 
> I'm slightly puzzled by the mismatch in blank padding on the three
> lines above. I assume the last one is to match ...
> 
>>  subdir-all := $(subdir-y) $(subdir-n)
> 
> ... this, but I think it would be better for all of them to match,
> or as the 2nd best option, for subdir-n to match subdir-y. Easy
> enough to do while committing I guess, but this would want your
> consent.

Oh, these two lines go away again in patch 9. No need for any
adjustment then.

Jan

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel