[Xen-changelog] [xen staging] tools: fix linking hypervisor includes to tools include directory

[patchbot@xxxxxxx]

commit 8d8d7d6b3dc11883fc1ee15574490566b395bf1a
Author:     Juergen Gross <jgross@xxxxxxxx>
AuthorDate: Wed Sep 11 07:02:03 2019 +0100
Commit:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
CommitDate: Fri Sep 20 12:17:49 2019 +0100

    tools: fix linking hypervisor includes to tools include directory
    
    An incremental build of tools/include won't pickup new hypervisor
    headers in tools/include/xen. Fix that.
    
    Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 tools/include/Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/include/Makefile b/tools/include/Makefile
index 71538e1ce2..3d0192fbad 100644
--- a/tools/include/Makefile
+++ b/tools/include/Makefile
@@ -12,11 +12,14 @@ all-y:
 xen-foreign:
        $(MAKE) -C xen-foreign
 
-xen/.dir:
+XEN_PUBLIC_INCLUDES = $(wildcard $(XEN_ROOT)/xen/include/public/*.h)
+XEN_LIB_X86_INCLUDES = $(filter-out %autogen.h, 
$(XEN_ROOT)/xen/include/xen/lib/x86/Makefile $(wildcard 
$(XEN_ROOT)/xen/include/xen/lib/x86/*.h))
+
+xen/.dir: $(XEN_PUBLIC_INCLUDES) $(XEN_LIB_X86_INCLUDES)
        @rm -rf xen
        mkdir -p xen/libelf
        ln -sf $(XEN_ROOT)/xen/include/public/COPYING xen
-       ln -sf $(wildcard $(XEN_ROOT)/xen/include/public/*.h) xen
+       ln -sf $(XEN_PUBLIC_INCLUDES) xen
        ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-x86 arch-arm 
hvm io xsm) xen
        ln -sf ../xen-sys/$(XEN_OS) xen/sys
        ln -sf $(addprefix $(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) 
xen/libelf/
@@ -25,7 +28,7 @@ xen/.dir:
 ifeq ($(CONFIG_X86),y)
        ln -sf $(XEN_ROOT)/xen/include/asm-x86 xen/asm
        mkdir -p xen/lib/x86
-       for f in $(filter-out %autogen.h,$(patsubst 
$(XEN_ROOT)/xen/include/xen/lib/x86/%,%,Makefile $(wildcard 
$(XEN_ROOT)/xen/include/xen/lib/x86/*.h))); do \
+       for f in $(patsubst 
$(XEN_ROOT)/xen/include/xen/lib/x86/%,%,$(XEN_LIB_X86_INCLUDES)); do \
                ln -sf $(XEN_ROOT)/xen/include/xen/lib/x86/$$f xen/lib/x86/$$f; 
\
        done
 endif
--
generated by git-patchbot for /home/xen/git/xen.git#staging

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog