From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51221) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNHbL-0002Sg-2F for qemu-devel@nongnu.org; Thu, 06 Aug 2015 05:36:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZNHbE-0002Mf-Tk for qemu-devel@nongnu.org; Thu, 06 Aug 2015 05:36:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40773) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNHbE-0002MZ-Lt for qemu-devel@nongnu.org; Thu, 06 Aug 2015 05:36:32 -0400 Date: Thu, 6 Aug 2015 12:02:22 +0300 From: "Michael S. Tsirkin" Message-ID: <20150806115950-mutt-send-email-mst@redhat.com> References: <1438795570-3930-1-git-send-email-victork@redhat.com> <1438795570-3930-2-git-send-email-victork@redhat.com> <87vbcskd5s.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <87vbcskd5s.fsf@linaro.org> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 1/2] make: fix where dependency *.d are stored. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex =?iso-8859-1?Q?Benn=E9e?= Cc: Peter Maydell , Victor Kaplansky , Eduardo Habkost , Stefan Weil , qemu-devel@nongnu.org, Paolo Bonzini , Igor Mammedov , Richard Henderson On Thu, Aug 06, 2015 at 09:57:03AM +0100, Alex Benn=E9e wrote: >=20 > Victor Kaplansky writes: >=20 > > In rules like "bar/%.o: %.c" there is a difference between $(*D) and > > $(@D). It is cleaner to generate *.d next to appropriate *.o, because= it > > allows precise including of dependency info from .d files. >=20 > It might be worth putting the example in the comment as most people are > not familiar with the esoteric symbolic of GNU Make. AIUI in your > example $(@D) resolves to "bar" instead of "bar/%" >=20 > > > > As a hack, we also touch two sources for generated *.hex files. This = is > > to ensure *.hex rebuild, when old revision is switched to the new one= . >=20 > While I'm sure this was useful for testing do we really want to include > such a hack in the git history? This is the hint for why it's needed there: "This is to ensure *.hex rebuild, when old revision is switched to the new one." Maybe add this, making this more explicit: Without this hack, anyone doing "git pull; make" will not get *.hex rebu= ilt correctly since the dependency file would be missing. > > > > Signed-off-by: Victor Kaplansky > > --- > > hw/i386/acpi-dsdt.dsl | 1 - > > hw/i386/q35-acpi-dsdt.dsl | 1 + > > rules.mak | 2 +- > > 3 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/hw/i386/acpi-dsdt.dsl b/hw/i386/acpi-dsdt.dsl > > index a2d84ec..8dba096 100644 > > --- a/hw/i386/acpi-dsdt.dsl > > +++ b/hw/i386/acpi-dsdt.dsl > > @@ -43,7 +43,6 @@ DefinitionBlock ( > > =20 > > #include "acpi-dsdt-hpet.dsl" > > =20 > > - > > /**************************************************************** > > * PIIX4 PM > > ****************************************************************/ > > diff --git a/hw/i386/q35-acpi-dsdt.dsl b/hw/i386/q35-acpi-dsdt.dsl > > index 16eaca3..7be7b37 100644 > > --- a/hw/i386/q35-acpi-dsdt.dsl > > +++ b/hw/i386/q35-acpi-dsdt.dsl > > @@ -22,6 +22,7 @@ > > * Based on acpi-dsdt.dsl, but heavily modified for q35 chipset. > > */ > > =20 > > + > > ACPI_EXTRACT_ALL_CODE Q35AcpiDsdtAmlCode > > =20 > > DefinitionBlock ( > > diff --git a/rules.mak b/rules.mak > > index aec27f8..6e35c36 100644 > > --- a/rules.mak > > +++ b/rules.mak > > @@ -17,7 +17,7 @@ MAKEFLAGS +=3D -rR > > QEMU_CXXFLAGS =3D -D__STDC_LIMIT_MACROS $(filter-out -Wstrict-protot= ypes -Wmissing-prototypes -Wnested-externs -Wold-style-declaration -Wold-= style-definition -Wredundant-decls, $(QEMU_CFLAGS)) > > =20 > > # Flags for dependency generation > > -QEMU_DGFLAGS +=3D -MMD -MP -MT $@ -MF $(*D)/$(*F).d > > +QEMU_DGFLAGS +=3D -MMD -MP -MT $@ -MF $(@D)/$(*F).d > > =20 > > # Same as -I$(SRC_PATH) -I., but for the nested source/object direct= ories > > QEMU_INCLUDES +=3D -I$(=20 > --=20 > Alex Benn=E9e