[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/24] make: load only required dependency files.
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 02/24] make: load only required dependency files. |
Date: |
Thu, 13 Aug 2015 15:14:42 +0300 |
From: Victor Kaplansky <address@hidden>
The old rules.mak loads dependency .d files using include directive
with file glob pattern "*.d". This breaks the build when build tree has
left-over *.d files from another build.
This patch fixes this by
- loading precise list of .d files made from *.o and *.mo.
- specifying explicit list of required dependency info files for
*.hex autogenerated sources.
Note that Makefile still includes some .d in root directory by including
"*.d".
Signed-off-by: Victor Kaplansky <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/i386/Makefile.objs | 8 +++++++-
rules.mak | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index bd4f147..ecdb400 100644
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@@ -7,8 +7,14 @@ obj-$(CONFIG_XEN) += ../xenpv/ xen/
obj-y += kvmvapic.o
obj-y += acpi-build.o
+
+gen-hex-y += hw/i386/acpi-dsdt.hex
+gen-hex-y += hw/i386/q35-acpi-dsdt.hex
+
hw/i386/acpi-build.o: hw/i386/acpi-build.c \
- hw/i386/acpi-dsdt.hex hw/i386/q35-acpi-dsdt.hex
+ $(gen-hex-y)
+
+-include $(gen-hex-y:.hex=.d)
iasl-option=$(shell if test -z "`$(1) $(2) 2>&1 > /dev/null`" \
; then echo "$(2)"; else echo "$(3)"; fi ;)
diff --git a/rules.mak b/rules.mak
index 6e35c36..4551b9e 100644
--- a/rules.mak
+++ b/rules.mak
@@ -368,6 +368,6 @@ define unnest-vars
$(error $o added in $v but $o-objs is not set)))
$(shell mkdir -p ./ $(sort $(dir $($v))))
# Include all the .d files
- $(eval -include $(addsuffix *.d, $(sort $(dir $($v)))))
+ $(eval -include $(patsubst %.o,%.d,$(patsubst %.mo,%.d,$($v))))
$(eval $v := $(filter-out %/,$($v))))
endef
--
MST
- [Qemu-devel] [PULL 00/24] virtio,pc,acpi fixes, cleanups, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 01/24] make: fix where dependency *.d are stored., Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 02/24] make: load only required dependency files.,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 03/24] piix: Document coreboot-specific RAM size config register, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 04/24] pc: Use PC_COMPAT_* for CPUID feature compatibility, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 05/24] target-i386: Remove x86_cpu_compat_set_features(), Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 06/24] pc: Use error_abort when registering properties, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 07/24] pc: Rename pc_machine variables to pcms, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 09/24] pc: Eliminate pc_common_machine_options(), Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 08/24] pc: Move PCMachineClass, PCMachineState to qemu/typedefs.h, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 10/24] pc: Eliminate pc_default_machine_options(), Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 12/24] pc: Use PCMachineState for pc_memory_init() argument, Michael S. Tsirkin, 2015/08/13
- [Qemu-devel] [PULL 11/24] pc: Use PCMachineState for pc_cmos_init() argument, Michael S. Tsirkin, 2015/08/13