From: Olaf Hering Date: Mon, 22 Sep 2014 13:00:04 +0000 (+0200) Subject: tools/libxl: use buildmakevars2header to create _paths.h X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4363 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a25968b19bba2f1856efdfe09d4aba9f0511282f;p=xen.git tools/libxl: use buildmakevars2header to create _paths.h Replace usage of buildmakevars2file with buildmakevars2header. The macro generates a C header file, so remove code which converts shell variables into C defines. Also update the dependency, the macro itself creates a dependency for _paths.h. A temporary file is not needed anymore. Signed-off-by: Olaf Hering Acked-by: Ian Campbell --- diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 9836b44ab5..9d67d0b47d 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -150,7 +150,7 @@ $(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS) $(SAVE_HELPER_OBJS) \ @rm -f $*.[ch] $(FLEX) --header-file=$*.h --outfile=$*.c $< -genpath-target = $(call buildmakevars2file,_paths.h.tmp) +genpath-target = $(call buildmakevars2header,_paths.h) $(eval $(genpath-target)) libxl.api-ok: check-libxl-api-rules _libxl.api-for-check @@ -163,11 +163,6 @@ _%.api-for-check: %.h $(AUTOINCS) >$@.new mv -f $@.new $@ -_paths.h: _paths.h.tmp - sed -e "s/\([^=]*\)=\(.*\)/#define \1 \2/g" $@.tmp >$@.2.tmp - rm -f $@.tmp - $(call move-if-changed,$@.2.tmp,$@) - _libxl_list.h: $(XEN_INCLUDE)/xen-external/bsd-sys-queue-h-seddery $(XEN_INCLUDE)/xen-external/bsd-sys-queue.h $(PERL) $^ --prefix=libxl >$@.new $(call move-if-changed,$@.new,$@)