Re: [Xen-devel] [PATCH 8/9] tools/libxc: provide variable paths to libxc

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Thu, 2014-04-17 at 16:13 +0200, Olaf Hering wrote:
> In preparation to removal of 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 <olaf@xxxxxxxxx>
> ---
>  tools/libxc/Makefile     | 13 ++++++++++++-
>  tools/libxc/xc_private.h |  1 +
>  2 files changed, 13 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
> index a74b19e..1bb6825 100644
> --- a/tools/libxc/Makefile
> +++ b/tools/libxc/Makefile
> @@ -118,11 +118,21 @@ ifneq ($(stubdom),y)
>  LIB += xenctrl_osdep_ENOSYS.so
>  endif
>  
> +genpath-target = $(call buildmakevars2file,_paths.h.tmp)
> +$(eval $(genpath-target))
> +
> +_paths.h: genpath
> +     sed -e "s/\([^=]*\)=\(.*\)/#define \1 \2/g" $@.tmp >$@.2.tmp
> +     rm -f $@.tmp
> +     $(call move-if-changed,$@.2.tmp,$@)

libxl has the exact same thing. Can we make it a common
genpath-include-target or something please.

I'm not sure why this isn't handled vi autoconf and tools/config.h.in.

> +
> +xc_private.h: _paths.h
> +
>  .PHONY: all
>  all: build
>  
>  .PHONY: build
> -build:
> +build: xc_private.h

This might be better as:
$(CTRL_LIB_OBJS) $(XXX_OTHER_OBJS): xc_private.h

>       $(MAKE) libs
>  
>  .PHONY: libs
> @@ -150,6 +160,7 @@ TAGS:
>  .PHONY: clean
>  clean:
>       rm -rf *.rpm $(LIB) *~ $(DEPS) \
> +         _paths.h \

Whitespace oddity.

Ian.


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel