[v2] tools: avoid creating symbolic links during make

[PATCH v2 3/3] tools/libs/store: don't use symbolic links for external files

Juergen Gross posted 3 patches 5 years, 3 months ago

Diff against v1
Download mbox

Maintainers: Samuel Thibault <samuel.thibault@ens-lyon.org>, Jan Beulich <jbeulich@suse.com>, Stefano Stabellini <sstabellini@kernel.org>, Christian Lindig <christian.lindig@citrix.com>, Julien Grall <julien@xen.org>, Wei Liu <wl@xen.org>, Andrew Cooper <andrew.cooper3@citrix.com>, Ian Jackson <iwj@xenproject.org>, George Dunlap <george.dunlap@citrix.com>, David Scott <dave@recoil.org>

Expand all Fold all

[PATCH v2 3/3] tools/libs/store: don't use symbolic links for external files

Posted by Juergen Gross 5 years, 3 months ago

Instead of using symbolic links to include files from xenstored use
the vpath directive and an include path.

Signed-off-by: Juergen Gross <jgross@suse.com>
Acked-by: Christian Lindig <christian.lindig@citrix.com>
Tested-by: Bertrand Marquis <bertrand.marquis@arm.com>
---
 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)
-- 
2.26.2

[PATCH v2 1/3] tools/libs: move official headers to common directory
[PATCH v2 2/3] tools/libs/guest: don't use symbolic links for xenctrl headers
[PATCH v2 3/3] tools/libs/store: don't use symbolic links for external files