[Xen-changelog] [xen master] x86/boot: fix reloc.S build dependencies

[patchbot@xxxxxxx]

commit c42070df66c9fcedf477959b8371b85aa4ac4933
Author:     Daniel Kiper <daniel.kiper@xxxxxxxxxx>
AuthorDate: Thu Oct 23 10:21:13 2014 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Oct 23 10:21:13 2014 +0200

    x86/boot: fix reloc.S build dependencies
    
    reloc.S is not rebuild if header included
    in reloc.c is updated. Fix this issue.
    
    Additionally, remove reloc.S build dependency
    on head.S because anything from reloc.S does
    not depend on head.S.
    
    Add reloc.c dependency to reloc.o build rule for consistency.
    
    Signed-off-by: Daniel Kiper <daniel.kiper@xxxxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/arch/x86/boot/Makefile   |    8 ++++----
 xen/arch/x86/boot/build32.mk |    3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile
index 13f4a66..5fdb5ae 100644
--- a/xen/arch/x86/boot/Makefile
+++ b/xen/arch/x86/boot/Makefile
@@ -1,8 +1,8 @@
 obj-bin-y += head.o
 
-head.o: reloc.S
+RELOC_DEPS = $(BASEDIR)/include/asm-x86/config.h 
$(BASEDIR)/include/xen/multiboot.h
 
-%.S: %.c
-       $(MAKE) -f build32.mk $@
+head.o: reloc.S
 
-reloc.S: head.S
+reloc.S: reloc.c $(RELOC_DEPS)
+       $(MAKE) -f build32.mk $@ RELOC_DEPS="$(RELOC_DEPS)"
diff --git a/xen/arch/x86/boot/build32.mk b/xen/arch/x86/boot/build32.mk
index a36f620..c208249 100644
--- a/xen/arch/x86/boot/build32.mk
+++ b/xen/arch/x86/boot/build32.mk
@@ -30,5 +30,6 @@ CFLAGS := $(filter-out -flto,$(CFLAGS))
                        esac; \
                done
 
-reloc.o: $(BASEDIR)/include/asm-x86/config.h
+reloc.o: reloc.c $(RELOC_DEPS)
+
 .PRECIOUS: %.bin %.lnk
--
generated by git-patchbot for /home/xen/git/xen.git#master

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