From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:35798) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SgHUS-0007Q9-H8 for qemu-devel@nongnu.org; Sun, 17 Jun 2012 11:34:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SgHUQ-0002HZ-LQ for qemu-devel@nongnu.org; Sun, 17 Jun 2012 11:34:12 -0400 Received: from cantor2.suse.de ([195.135.220.15]:60034 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SgHUQ-0002HK-CU for qemu-devel@nongnu.org; Sun, 17 Jun 2012 11:34:10 -0400 Message-ID: <4FDDF8E6.6050606@suse.de> Date: Sun, 17 Jun 2012 17:33:58 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1339945072-10816-1-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1339945072-10816-1-git-send-email-aliguori@us.ibm.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] make: automatically include dependencies in recursive subdir rules List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Blue Swirl , Paolo Bonzini , qemu-devel@nongnu.org Am 17.06.2012 16:57, 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... >=20 > Signed-off-by: Anthony Liguori > --- > Makefile | 4 ++-- > rules.mak | 1 + > 2 files changed, 3 insertions(+), 2 deletions(-) >=20 > diff --git a/Makefile b/Makefile > index cce45fb..593bd9b 100644 > --- a/Makefile > +++ b/Makefile > @@ -405,5 +405,5 @@ tar: > Makefile: $(GENERATED_HEADERS) > =20 > # Include automatically generated dependency files > --include $(wildcard *.d audio/*.d slirp/*.d block/*.d net/*.d ui/*.d q= api/*.d) > --include $(wildcard qga/*.d hw/*.d hw/usb/*.d qom/*.d) This was based on my QOM Makefile patch and doesn't apply to master. If I understand this patch correctly, we could further apply this diff on top: 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.hw b/Makefile.hw index 2bcbaff..3e794e1 100644 --- a/Makefile.hw +++ b/Makefile.hw @@ -23,4 +23,4 @@ clean: rm -f $(addsuffix /*.d, $(dir $(sort $(hw-obj-y)))) # Include automatically generated dependency files --include $(patsubst %.o, %.d, $(hw-obj-y)) +-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 +=3D 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) /-F > +# All subdir dependencies come automatically from our recursive subdir= rules > +-include $(wildcard *.d) > diff --git a/rules.mak b/rules.mak > index 4bc5e52..8c5ef95 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 :=3D $(obj)/$1) > $(eval include $(SRC_PATH)/$1/Makefile.objs) > +$(eval -include $(wildcard $(SRC_PATH)/$1/*.d)) > $(eval obj :=3D $(patsubst %/$1,%,$(obj))) > $(foreach var,$(nested-vars),$(call pop-var,$(var),$1/)) > endef --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg