[Xen-changelog] [xen master] libxl: test programs: Fix Makefile race re headers

[patchbot@xxxxxxx]

commit 4950037bf276921171652a8e8f21ab34a27dfe97
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Thu Feb 6 18:41:24 2014 +0000
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Thu Feb 6 19:18:34 2014 +0000

    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 <olaf@xxxxxxxxx>
    Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
    Cc: Olaf Hering <olaf@xxxxxxxxx>
    Cc: Ian Campbell <Ian.Campbell@xxxxxxxxxx>
---
 tools/libxl/Makefile |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index 66f3f3f..4af9033 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
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog