From: Jan Beulich <jbeulich@suse.com>
To: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
Cc: "Ian Jackson" <iwj@xenproject.org>,
"Andrew Cooper" <andrew.cooper3@citrix.com>,
"Wei Liu" <wl@xen.org>, "Roger Pau Monné" <roger.pau@citrix.com>
Subject: [PATCH v2 2/2] tools/x86: move arch-specific include/xen/ population into arch-specific rule
Date: Thu, 11 Mar 2021 15:40:53 +0100 [thread overview]
Message-ID: <e6bcfa87-aa12-97dd-23f4-d2f085e2e4f6@suse.com> (raw)
In-Reply-To: <1365013b-1e90-aeb2-3c80-7a5c6284c46a@suse.com>
There's no need for the common "xen-dir" rule to have an arch-specific
part when there already is a arch-specific rule where this can be taken
care of (arguably instead of all-y this might better be xendir-y
anyway).
Also change the pattern from *autogen.h to *-autogen.h.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
v2: Insert dash in pattern. Re-base over changed earlier patch.
---
I was tempted to move the "xen-dir" dependency from all-$(CONFIG_X86) to
the general all-y, but perhaps that's less related and hence should
really be a separate change (and there may also be arguments against
that).
--- a/tools/include/Makefile
+++ b/tools/include/Makefile
@@ -29,14 +29,12 @@ xen-dir:
ln -s ../xen-foreign xen/foreign
ln -s $(XEN_ROOT)/xen/include/acpi/platform acpi/
ln -s $(XEN_ROOT)/xen/include/acpi/ac*.h acpi/
-ifeq ($(CONFIG_X86),y)
+
+all-$(CONFIG_X86): xen-dir
ln -s $(XEN_ROOT)/xen/include/asm-x86 xen/asm
mkdir -p xen/lib/x86
- ln -s $(filter-out %autogen.h,$(wildcard $(XEN_ROOT)/xen/include/xen/lib/x86/*.h)) xen/lib/x86/
+ ln -s $(filter-out %-autogen.h,$(wildcard $(XEN_ROOT)/xen/include/xen/lib/x86/*.h)) xen/lib/x86/
ln -s $(XEN_ROOT)/xen/include/xen/lib/x86/Makefile xen/lib/x86/
-endif
-
-all-$(CONFIG_X86): xen-dir
$(MAKE) -C xen/lib/x86 all XEN_ROOT=$(XEN_ROOT) PYTHON=$(PYTHON)
# Not xen/xsm as that clashes with link to
next prev parent reply other threads:[~2021-03-11 14:41 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-11 14:38 [PATCH v2 0/2] tools/x86: adjust populating of tools/include/xen/ Jan Beulich
2021-03-11 14:40 ` [PATCH v2 1/2][4.15] tools/x86: don't rebuild cpuid-autogen.h every time Jan Beulich
2021-03-11 15:29 ` Roger Pau Monné
2021-03-11 16:00 ` Jan Beulich
2021-03-11 16:21 ` Roger Pau Monné
2021-03-12 8:45 ` Jan Beulich
2021-03-12 9:17 ` Roger Pau Monné
2021-03-12 9:22 ` Jan Beulich
2021-03-12 10:22 ` Ian Jackson
2021-03-11 14:40 ` Jan Beulich [this message]
2021-03-12 10:24 ` [PATCH v2 2/2] tools/x86: move arch-specific include/xen/ population into arch-specific rule Ian Jackson
2021-03-12 16:50 ` [PATCH v3][4.15] tools/x86: don't rebuild cpuid-autogen.h every time Jan Beulich
2021-03-12 16:59 ` Ian Jackson
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=e6bcfa87-aa12-97dd-23f4-d2f085e2e4f6@suse.com \
--to=jbeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=iwj@xenproject.org \
--cc=roger.pau@citrix.com \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.