From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:37272)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1SgLY3-0004iy-8X
	for qemu-devel@nongnu.org; Sun, 17 Jun 2012 15:54:12 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1SgLY1-0000Iw-5j
	for qemu-devel@nongnu.org; Sun, 17 Jun 2012 15:54:10 -0400
Received: from cantor2.suse.de ([195.135.220.15]:45359 helo=mx2.suse.de)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1SgLY0-0000Iq-Si
	for qemu-devel@nongnu.org; Sun, 17 Jun 2012 15:54:09 -0400
Message-ID: <4FDE35D4.2050109@suse.de>
Date: Sun, 17 Jun 2012 21:53:56 +0200
From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= <afaerber@suse.de>
MIME-Version: 1.0
References: <1339945072-10816-1-git-send-email-aliguori@us.ibm.com>
	<CAAu8pHss3=TRaWgD=V0-uO1GO9Rph8SdY3Yj2BsdJHMYecA0Cw@mail.gmail.com>
	<4FDE046E.3090407@suse.de> <4FDE0D1E.7030308@suse.de>
	<4FDE261F.60502@codemonkey.ws>
In-Reply-To: <4FDE261F.60502@codemonkey.ws>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH] make: automatically include dependencies
 in recursive subdir rules
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Anthony Liguori <anthony@codemonkey.ws>
Cc: Blue Swirl <blauwirbel@gmail.com>, Paolo Bonzini <pbonzini@redhat.com>, qemu-devel@nongnu.org

Am 17.06.2012 20:46, schrieb Anthony Liguori:
> On 06/17/2012 12:00 PM, Andreas F=C3=A4rber wrote:
>> Am 17.06.2012 18:23, schrieb Andreas F=C3=A4rber:
>>> I've tested with just
>>> +$(eval -include $(wildcard $1/*.d))
>>> and did
>>> $ touch include/qemu/object.h
>>>
>>>  From what I see, using Anthony's original patch plus the modificatio=
n
>>> above (not the other ones), {i386,x86_64}-softmmu/hw/kvm/apic.o is st=
ill
>>> not getting rebuilt despite its included hw/apic_internal.h depending=
 on
>>> sysbus.h ->  qdev.h ->  qemu/object.h.
>>>
>>> They're being added via obj-$(CONFIG_KVM) +=3D kvm/filename.o, not vi=
a the
>>> recursive directory rule, so are not caught by Anthony's rule.
>>>
>>> Maybe fix by some explicit Makefile-specific rule such as this?
>>>
>>> diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
>>> index d43f1df..1e8423a 100644
>>> --- a/hw/i386/Makefile.objs
>>> +++ b/hw/i386/Makefile.objs
>>> @@ -11,3 +11,5 @@ obj-$(CONFIG_KVM) +=3D kvm/clock.o kvm/apic.o
>>> kvm/i8259.o kvm/ioapic.o kvm/i8254.o
>>>   obj-$(CONFIG_SPICE) +=3D qxl.o qxl-logger.o qxl-render.o
>>>
>>>   obj-y :=3D $(addprefix ../,$(obj-y))
>>> +
>>> +-include $(wildcard ../kvm/*.d)
>>
>> If using hw/kvm/*.d instead, it actually works. ;)
>=20
> We can also just add a hw/kvm/Makefile.objs and then add kvm/ to the
> subdir rules.  Seems to fix the problem you identified.

No, that would be wrong wrt ppc/s390/arm. But we could move the files
from hw/kvm/ to hw/i386/.

Andreas

--=20
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=BC=
rnberg