From: Olaf Hering Subject: [PATCH 15/46] tools/libxl: use buildmakevars2header to create _paths.h Date: Mon, 22 Sep 2014 15:00:04 +0200 Message-ID: <1411390835-7348-16-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 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 --- tools/libxl/Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 9836b44..9d67d0b 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,$@)