From 378e96065b390d217e2b381a218ccb7bbb5fbe1e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 11 Apr 2012 14:14:16 +0100 Subject: libxl: include <_libxl_paths.h> in libxl_internal.h Ie, we permit general code in libxl direct access to the manifest constants such as XEN_RUN_DIR. This simplifies their use in (eg) format strings. This might be controversial because it will make it difficult to make any of these runtime-configurable later without changing lots of use sites. But I don't think it's likely we'll want to do that. For the moment, leave existing call sites of all the functions in libxl_paths.c unchanged. The simplified use arrangements can be used in new code and when we update call sites for other reasons. Also correct the dependencies in the Makefile so that _libxl_paths.h is generated before anything that uses libxl_internal.h. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Signed-off-by: Roger Pau Monne Committed-by: Ian Jackson --- tools/libxl/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tools/libxl/Makefile') diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index b0143e60cc..9f7e454a55 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -102,11 +102,9 @@ _libxl_list.h: $(XEN_INCLUDE)/xen-external/bsd-sys-queue-h-seddery $(XEN_INCLUDE perl $^ --prefix=libxl >$@.new $(call move-if-changed,$@.new,$@) -libxl_paths.c: _libxl_paths.h - libxl.h: _libxl_types.h libxl_json.h: _libxl_types_json.h -libxl_internal.h: _libxl_types_internal.h +libxl_internal.h: _libxl_types_internal.h _libxl_paths.h libxl_internal_json.h: _libxl_types_internal_json.h $(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS): libxl.h -- cgit v1.2.3