From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ShKf0-00038I-Fa for qemu-devel@nongnu.org; Wed, 20 Jun 2012 09:09:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ShKey-0005to-9m for qemu-devel@nongnu.org; Wed, 20 Jun 2012 09:09:26 -0400 Received: from e35.co.us.ibm.com ([32.97.110.153]:56509) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ShKey-0005sp-1r for qemu-devel@nongnu.org; Wed, 20 Jun 2012 09:09:24 -0400 Received: from /spool/local by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 20 Jun 2012 07:09:13 -0600 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id EC4013E4012F for ; Wed, 20 Jun 2012 13:06:55 +0000 (WET) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q5KD6ZqA144866 for ; Wed, 20 Jun 2012 07:06:38 -0600 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q5KD6VGV001427 for ; Wed, 20 Jun 2012 07:06:31 -0600 Message-ID: <4FE1CAD4.4000203@us.ibm.com> Date: Wed, 20 Jun 2012 08:06:28 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <1339977692-3196-1-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1339977692-3196-1-git-send-email-aliguori@us.ibm.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] make: automatically include dependencies in recursive subdir rules (v2) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Paolo Bonzini , qemu-devel@nongnu.org, Andreas Faerber On 06/17/2012 07:01 PM, Anthony Liguori wrote: > 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 Applied. Regards, Anthony Liguori > --- > 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/ > obj-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o > > obj-y := $(addprefix ../,$(obj-y)) > diff --git a/hw/kvm/Makefile.objs b/hw/kvm/Makefile.objs > new file mode 100644 > index 0000000..226497a > --- /dev/null > +++ b/hw/kvm/Makefile.objs > @@ -0,0 +1 @@ > +obj-$(CONFIG_KVM) += clock.o apic.o i8259.o ioapic.o i8254.o > diff --git a/rules.mak b/rules.mak > index 4bc5e52..60f3e96 100644 > --- a/rules.mak > +++ b/rules.mak > @@ -94,6 +94,7 @@ define unnest-dir > $(foreach var,$(nested-vars),$(call push-var,$(var),$1/)) > $(eval obj := $(obj)/$1) > $(eval include $(SRC_PATH)/$1/Makefile.objs) > +$(eval -include $(wildcard $1/*.d)) > $(eval obj := $(patsubst %/$1,%,$(obj))) > $(foreach var,$(nested-vars),$(call pop-var,$(var),$1/)) > endef