[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/59] Makefile: Restrict system emulation and tools objects
From: |
Paolo Bonzini |
Subject: |
[PULL 14/59] Makefile: Restrict system emulation and tools objects |
Date: |
Thu, 23 Jan 2020 14:48:17 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
Restrict all the system emulation and tools objects with a
Makefile IF (CONFIG_SOFTMMU OR CONFIG_TOOLS) check.
Using the same description over and over is not very helpful.
Use it once, just before the if() block.
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile.objs | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index 5aae561..395dd1e 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -4,15 +4,14 @@ stub-obj-y = stubs/
util-obj-y = crypto/ util/ qobject/ qapi/
qom-obj-y = qom/
-chardev-obj-y = chardev/
-
#######################################################################
-# authz-obj-y is code used by both qemu system emulation and qemu-img
+# code used by both qemu system emulation and qemu-img
-authz-obj-y = authz/
+ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y)
-#######################################################################
-# block-obj-y is code used by both qemu system emulation and qemu-img
+chardev-obj-y = chardev/
+
+authz-obj-y = authz/
block-obj-y = nbd/
block-obj-y += block.o blockjob.o job.o
@@ -22,16 +21,12 @@ block-obj-$(CONFIG_REPLICATION) += replication.o
block-obj-m = block/
-#######################################################################
-# crypto-obj-y is code used by both qemu system emulation and qemu-img
-
crypto-obj-y = crypto/
-#######################################################################
-# io-obj-y is code used by both qemu system emulation and qemu-img
-
io-obj-y = io/
+endif # CONFIG_SOFTMMU or CONFIG_TOOLS
+
######################################################################
# Target independent part of system emulation. The long term path is to
# suppress *all* target specific code in case of system emulation, i.e. a
--
1.8.3.1
- [PULL 06/59] audio/audio: Add missing fall through comment, (continued)
- [PULL 06/59] audio/audio: Add missing fall through comment, Paolo Bonzini, 2020/01/23
- [PULL 07/59] hw/display/tcx: Add missing fall through comments, Paolo Bonzini, 2020/01/23
- [PULL 04/59] pvpanic: implement crashloaded event handling, Paolo Bonzini, 2020/01/23
- [PULL 10/59] hw/net/imx_fec: Remove unuseful FALLTHROUGH comments, Paolo Bonzini, 2020/01/23
- [PULL 05/59] qom/object: Display more helpful message when an interface is missing, Paolo Bonzini, 2020/01/23
- [PULL 08/59] hw/timer/aspeed_timer: Add a fall through comment, Paolo Bonzini, 2020/01/23
- [PULL 09/59] hw/net/imx_fec: Rewrite fall through comments, Paolo Bonzini, 2020/01/23
- [PULL 11/59] hw/pci-host/designware: Remove unuseful FALLTHROUGH comment, Paolo Bonzini, 2020/01/23
- [PULL 12/59] configure: Do not build libfdt if not required, Paolo Bonzini, 2020/01/23
- [PULL 13/59] Makefile: Clarify all the codebase requires qom/ objects, Paolo Bonzini, 2020/01/23
- [PULL 14/59] Makefile: Restrict system emulation and tools objects,
Paolo Bonzini <=
- [PULL 15/59] Makefile: Remove unhelpful comment, Paolo Bonzini, 2020/01/23
- [PULL 16/59] hw/core: Restrict reset handlers API to system-mode, Paolo Bonzini, 2020/01/23
- [PULL 17/59] hw/core/Makefile: Group generic objects versus system-mode objects, Paolo Bonzini, 2020/01/23
- [PULL 18/59] target/i386: kvm: initialize feature MSRs very early, Paolo Bonzini, 2020/01/23
- [PULL 20/59] target/i386: kvm: initialize microcode revision from KVM, Paolo Bonzini, 2020/01/23
- [PULL 21/59] virtio-scsi: delete vqs in unrealize to avoid memleaks, Paolo Bonzini, 2020/01/23
- [PULL 19/59] target/i386: add a ucode-rev property, Paolo Bonzini, 2020/01/23
- [PULL 22/59] virtio-scsi: convert to new virtio_delete_queue, Paolo Bonzini, 2020/01/23
- [PULL 23/59] hw/ppc/spapr_rtas: Use local MachineState variable, Paolo Bonzini, 2020/01/23
- [PULL 24/59] hw/ppc/spapr_rtas: Access MachineState via SpaprMachineState argument, Paolo Bonzini, 2020/01/23