[xen master] tools/libs/store: don't use symbolic links for external files

[patchbot@xxxxxxx]

commit 9af5e2b31b4e6f3892b4614ecd0a619af5d64d7e
Author:     Juergen Gross <jgross@xxxxxxxx>
AuthorDate: Mon Oct 19 17:27:54 2020 +0200
Commit:     Ian Jackson <iwj@xxxxxxxxxxxxxx>
CommitDate: Fri Oct 23 15:51:06 2020 +0100

    tools/libs/store: don't use symbolic links for external files
    
    Instead of using symbolic links to include files from xenstored use
    the vpath directive and an include path.
    
    Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
    Acked-by: Christian Lindig <christian.lindig@xxxxxxxxxx>
    Tested-by: Bertrand Marquis <bertrand.marquis@xxxxxxx>
    Acked-by: Ian Jackson <iwj@xxxxxxxxxxxxxx>
---
 tools/libs/store/Makefile | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tools/libs/store/Makefile b/tools/libs/store/Makefile
index 930e763de9..bc89b9cd70 100644
--- a/tools/libs/store/Makefile
+++ b/tools/libs/store/Makefile
@@ -21,12 +21,8 @@ CFLAGS += $(CFLAGS_libxentoolcore)
 CFLAGS += -DXEN_LIB_STORED="\"$(XEN_LIB_STORED)\""
 CFLAGS += -DXEN_RUN_STORED="\"$(XEN_RUN_STORED)\""
 
-LINK_FILES = xs_lib.c list.h utils.h
-
-$(LIB_OBJS): $(LINK_FILES)
-
-$(LINK_FILES):
-       ln -sf $(XEN_ROOT)/tools/xenstore/$@ $@
+vpath xs_lib.c $(XEN_ROOT)/tools/xenstore
+CFLAGS += -I $(XEN_ROOT)/tools/xenstore
 
 xs.opic: CFLAGS += -DUSE_PTHREAD
 ifeq ($(CONFIG_Linux),y)
--
generated by git-patchbot for /home/xen/git/xen.git#master