From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Laurent Vivier" <laurent@vivier.eu>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Richard Henderson" <rth@twiddle.net>
Subject: [PATCH 3/4] Makefile: Restrict system emulation and tools objects
Date: Thu, 9 Jan 2020 16:39:38 +0100 [thread overview]
Message-ID: <20200109153939.27173-4-philmd@redhat.com> (raw)
In-Reply-To: <20200109153939.27173-1-philmd@redhat.com>
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.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Makefile.objs | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index 5aae561984..395dd1e670 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -4,16 +4,15 @@ stub-obj-y = stubs/
util-obj-y = crypto/ util/ qobject/ qapi/
qom-obj-y = qom/
+#######################################################################
+# code used by both qemu system emulation and qemu-img
+
+ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y)
+
chardev-obj-y = chardev/
-#######################################################################
-# authz-obj-y is code used by both qemu system emulation and qemu-img
-
authz-obj-y = authz/
-#######################################################################
-# block-obj-y is code used by both qemu system emulation and qemu-img
-
block-obj-y = nbd/
block-obj-y += block.o blockjob.o job.o
block-obj-y += block/ scsi/
@@ -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
--
2.21.1
next prev parent reply other threads:[~2020-01-09 15:43 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-09 15:39 [PATCH 0/4] buildsys: Build quicker (mostly tools and linux-user) Philippe Mathieu-Daudé
2020-01-09 15:39 ` [PATCH 1/4] configure: Do not build libfdt is not required Philippe Mathieu-Daudé
2020-01-09 16:33 ` Thomas Huth
2020-01-10 10:04 ` Alistair Francis
2020-01-09 15:39 ` [PATCH 2/4] Makefile: Clarify all the codebase requires qom/ objects Philippe Mathieu-Daudé
2020-01-10 8:13 ` Thomas Huth
2020-01-09 15:39 ` Philippe Mathieu-Daudé [this message]
2020-01-10 8:14 ` [PATCH 3/4] Makefile: Restrict system emulation and tools objects Thomas Huth
2020-01-10 8:25 ` Philippe Mathieu-Daudé
2020-01-10 8:34 ` Thomas Huth
2020-01-09 15:39 ` [PATCH 4/4] Makefile: Remove unhelpful comment Philippe Mathieu-Daudé
2020-01-10 8:15 ` Thomas Huth
2020-01-10 8:35 ` [PATCH 0/4] buildsys: Build quicker (mostly tools and linux-user) Laurent Vivier
2020-01-10 9:17 ` Philippe Mathieu-Daudé
2020-01-10 14:03 ` Laurent Vivier
2020-01-10 16:41 ` Philippe Mathieu-Daudé
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=20200109153939.27173-4-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=laurent@vivier.eu \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=thuth@redhat.com \
/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).