Re: [Qemu-devel] [PATCH] make: automatically include dependencies in recursive subdir rules (v2)

[Jan Kiszka]

On 2012-06-18 02:32, Andreas Färber wrote:
> Am 18.06.2012 02:01, schrieb Anthony Liguori:
>> I think I understand enough of what's going on in these rules to ensure this 
>> is
>> right.  But I could certainly use a second or third opinion...
>>
>> Signed-off-by: Anthony Liguori <address@hidden>
>> ---
>> v1 -> v2
>>  - Remove unnecessary includes (Andreas)
>>  - Add a sub makefile for hw/kvm (Andreas)
>> ---
>>  Makefile              |    4 ++--
>>  Makefile.dis          |    2 +-
>>  Makefile.target       |    2 +-
>>  Makefile.user         |    2 +-
>>  hw/i386/Makefile.objs |    2 +-
>>  hw/kvm/Makefile.objs  |    1 +
>>  rules.mak             |    1 +
>>  7 files changed, 8 insertions(+), 6 deletions(-)
>>  create mode 100644 hw/kvm/Makefile.objs
>>
>> diff --git a/Makefile b/Makefile
>> index cce45fb..593bd9b 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -405,5 +405,5 @@ tar:
>>  Makefile: $(GENERATED_HEADERS)
>>  
>>  # Include automatically generated dependency files
>> --include $(wildcard *.d audio/*.d slirp/*.d block/*.d net/*.d ui/*.d 
>> qapi/*.d)
>> --include $(wildcard qga/*.d hw/*.d hw/usb/*.d qom/*.d)
>> +# All subdir dependencies come automatically from our recursive subdir rules
>> +-include $(wildcard *.d)
>> diff --git a/Makefile.dis b/Makefile.dis
>> index 3e1fcaf..09060f0 100644
>> --- a/Makefile.dis
>> +++ b/Makefile.dis
>> @@ -20,4 +20,4 @@ clean:
>>      rm -f *.o *.d *.a *~
>>  
>>  # Include automatically generated dependency files
>> --include $(wildcard *.d */*.d)
>> +-include $(wildcard *.d)
>> diff --git a/Makefile.target b/Makefile.target
>> index 2907aad..550d889 100644
>> --- a/Makefile.target
>> +++ b/Makefile.target
>> @@ -216,4 +216,4 @@ GENERATED_HEADERS += config-target.h
>>  Makefile: $(GENERATED_HEADERS)
>>  
>>  # Include automatically generated dependency files
>> --include $(wildcard *.d */*.d)
>> +-include $(wildcard *.d)
>> diff --git a/Makefile.user b/Makefile.user
>> index b717820..0ffefe8 100644
>> --- a/Makefile.user
>> +++ b/Makefile.user
>> @@ -23,4 +23,4 @@ clean:
>>      done
>>  
>>  # Include automatically generated dependency files
>> --include $(wildcard *.d */*.d)
>> +-include $(wildcard *.d)
>> diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
>> index d43f1df..eb171b7 100644
>> --- a/hw/i386/Makefile.objs
>> +++ b/hw/i386/Makefile.objs
>> @@ -7,7 +7,7 @@ obj-y += debugcon.o multiboot.o
>>  obj-y += pc_piix.o
>>  obj-y += pc_sysfw.o
>>  obj-$(CONFIG_XEN) += xen_platform.o xen_apic.o
>> -obj-$(CONFIG_KVM) += kvm/clock.o kvm/apic.o kvm/i8259.o kvm/ioapic.o 
>> kvm/i8254.o
>> +obj-y += kvm/
> 
> This will work technically but I still feel this is wrong semantically.
> The pre-Paolo and current way is picking specific files from the hw/kvm/
> directory. Your change above implies that in hw/kvm/ only x86 files can
> live, which I dislike. As suggested before, I would prefer if x86-only
> files were moved to an x86-specific location - the place for that
> existing since Paolo's refactoring would be hw/i386/. CC'ing Jan. That
> would match Paolo's reply in the unicore32 thread on future file
> placement. Alternatives would be hw/i386/kvm/ or hw/kvm/i386/; we're
> talking about a handful of files only though, so I don't think they
> require a new subdirectory.

Some per-arch separation is required, at least in the build process.
We'll see power and arm stubs for in-kernel devices soon.

Jan

-- 
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux