From 4950037bf276921171652a8e8f21ab34a27dfe97 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 6 Feb 2014 18:41:24 +0000 Subject: [PATCH] libxl: test programs: Fix Makefile race re headers We need to include the new TEST_PROG_OBJS and LIBXL_TEST_OBJS in the appropriate dependencies. Otherwise we risk trying to build the test program before gentypes is run. Reported-by: Olaf Hering Signed-off-by: Ian Jackson Cc: Olaf Hering Cc: Ian Campbell --- tools/libxl/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 66f3f3f7f1..4af90339eb 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -130,7 +130,7 @@ all: $(CLIENTS) $(TEST_PROGS) \ $(AUTOSRCS) $(AUTOINCS) $(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS) $(SAVE_HELPER_OBJS) \ - $(LIBXL_TEST_OBJS): \ + $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS): \ $(AUTOINCS) libxl.api-ok %.c %.h:: %.y @@ -175,8 +175,9 @@ libxl_internal.h: _libxl_types_internal.h _paths.h libxl_internal_json.h: _libxl_types_internal_json.h xl.h: _paths.h -$(LIBXL_OBJS) $(LIBXLU_OBJS) $(XL_OBJS) $(SAVE_HELPER_OBJS): libxl.h -$(LIBXL_OBJS): libxl_internal.h +$(LIBXL_OBJS) $(LIBXL_TEST_OBJS) $(LIBXLU_OBJS) \ + $(XL_OBJS) $(TEST_PROG_OBJS) $(SAVE_HELPER_OBJS): libxl.h +$(LIBXL_OBJS) $(LIBXL_TEST_OBJS): libxl_internal.h _libxl_type%.h _libxl_type%_json.h _libxl_type%.c: libxl_type%.idl gentypes.py idl.py $(PYTHON) gentypes.py libxl_type$*.idl __libxl_type$*.h __libxl_type$*_json.h __libxl_type$*.c -- 2.39.5