From: Olaf Hering Subject: [PATCH 16/46] tools/libxc: provide variable paths to libxc Date: Mon, 22 Sep 2014 15:00:05 +0200 Message-ID: <1411390835-7348-17-git-send-email-olaf@aepfle.de> References: <1411390835-7348-1-git-send-email-olaf@aepfle.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1411390835-7348-1-git-send-email-olaf@aepfle.de> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Olaf Hering , Keir Fraser , David Scott , Stefano Stabellini , George Dunlap , Tim Deegan , Ian Jackson , Jan Beulich , Samuel Thibault , Ian Campbell List-Id: xen-devel@lists.xenproject.org In preparation to remove hardcoded /var/run/xen paths, provide XEN_RUN_DIR and related directories to xc_private.h. Similar code exists already for libxl, stubdom and other parts. Signed-off-by: Olaf Hering Acked-by: Ian Campbell --- .gitignore | 1 + tools/libxc/Makefile | 9 +++++++++ tools/libxc/xc_private.h | 1 + 3 files changed, 11 insertions(+) diff --git a/.gitignore b/.gitignore index 8e34b85..0b10c94 100644 --- a/.gitignore +++ b/.gitignore @@ -307,6 +307,7 @@ tools/include/xen-foreign/arm64.h .git tools/misc/xen-hptool tools/misc/xen-mfndump +tools/libxc/_*.[ch] tools/libxl/_*.[ch] tools/libxl/testidl tools/libxl/testidl.c diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 3b04027..3c390f8 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -122,6 +122,14 @@ ifneq ($(nosharedlibs),y) LIB += xenctrl_osdep_ENOSYS.so endif +genpath-target = $(call buildmakevars2header,_paths.h) +$(eval $(genpath-target)) + +xc_private.h: _paths.h + +$(CTRL_LIB_OBJS) $(GUEST_LIB_OBJS) $(OSDEP_LIB_OBJS) \ +$(CTRL_PIC_OBJS) $(GUEST_PIC_OBJS) $(OSDEP_PIC_OBJS): xc_private.h + .PHONY: all all: build @@ -154,6 +162,7 @@ TAGS: .PHONY: clean clean: rm -rf *.rpm $(LIB) *~ $(DEPS) \ + _paths.h \ $(CTRL_LIB_OBJS) $(CTRL_PIC_OBJS) \ $(GUEST_LIB_OBJS) $(GUEST_PIC_OBJS) \ $(OSDEP_LIB_OBJS) $(OSDEP_PIC_OBJS) diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index 94df688..010e00f 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -29,6 +29,7 @@ #include #include +#include "_paths.h" #include "xenctrl.h" #include "xenctrlosdep.h"