From: Victor Kaplansky <victork@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Eduardo Habkost <ehabkost@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Stefan Weil <sw@weilnetz.de>, Igor Mammedov <imammedo@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Richard Henderson <rth@twiddle.net>
Subject: [Qemu-devel] [PATCH v2 1/2] make: fix where dependency *.d are stored.
Date: Wed, 5 Aug 2015 20:28:47 +0300 [thread overview]
Message-ID: <1438795570-3930-2-git-send-email-victork@redhat.com> (raw)
In-Reply-To: <1438795570-3930-1-git-send-email-victork@redhat.com>
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.
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.
Signed-off-by: Victor Kaplansky <victork@redhat.com>
---
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 (
#include "acpi-dsdt-hpet.dsl"
-
/****************************************************************
* 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.
*/
+
ACPI_EXTRACT_ALL_CODE Q35AcpiDsdtAmlCode
DefinitionBlock (
diff --git a/rules.mak b/rules.mak
index aec27f8..6e35c36 100644
--- a/rules.mak
+++ b/rules.mak
@@ -17,7 +17,7 @@ MAKEFLAGS += -rR
QEMU_CXXFLAGS = -D__STDC_LIMIT_MACROS $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wold-style-declaration -Wold-style-definition -Wredundant-decls, $(QEMU_CFLAGS))
# Flags for dependency generation
-QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d
+QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(@D)/$(*F).d
# Same as -I$(SRC_PATH) -I., but for the nested source/object directories
QEMU_INCLUDES += -I$(<D) -I$(@D)
--
--Victor
next prev parent reply other threads:[~2015-08-05 17:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-05 17:27 [Qemu-devel] [PATCH v2 0/2] make: Cleanup and fix of loading of dependency info Victor Kaplansky
2015-08-05 17:28 ` Victor Kaplansky [this message]
2015-08-06 8:57 ` [Qemu-devel] [PATCH v2 1/2] make: fix where dependency *.d are stored Alex Bennée
2015-08-06 9:02 ` Michael S. Tsirkin
2015-08-06 15:55 ` Alex Bennée
2015-08-05 17:29 ` [Qemu-devel] [PATCH v2 2/2] make: load only required dependency files Victor Kaplansky
2015-08-05 17:40 ` Paolo Bonzini
2015-08-05 18:22 ` Victor kaplansky
2015-08-06 7:05 ` Markus Armbruster
2015-08-05 18:32 ` Michael S. Tsirkin
2015-08-05 18:51 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1438795570-3930-2-git-send-email-victork@redhat.com \
--to=victork@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=sw@weilnetz.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).