[Xen-devel] [PATCH 2/4] Fix build when Xen is not enabled

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

If Xen isn't enabled then XEN_IMAGE ends up as "no.o", which obviously doesn't
exist. Handle the dependency explicitly.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 Makefile.am |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index ed5acbb..6c2786e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,7 +98,10 @@ all: $(IMAGE) $(XIMAGE)
 
 CLEANFILES = $(IMAGE) boot.o cache.o $(GIC) mmu.o ns.o $(BOOTMETHOD) model.lds 
fdt.dtb
 
-$(IMAGE): boot.o cache.o $(GIC) mmu.o ns.o $(BOOTMETHOD) model.lds fdt.dtb 
$(KERNEL_IMAGE) $(FILESYSTEM) $(XEN_IMAGE)
+if XEN
+XEN_IMAGE_DEP = $(XEN_IMAGE)
+endif
+$(IMAGE): boot.o cache.o $(GIC) mmu.o ns.o $(BOOTMETHOD) model.lds fdt.dtb 
$(KERNEL_IMAGE) $(FILESYSTEM) $(XEN_IMAGE_DEP)
        $(LD) -o $@ --script=model.lds
 
 %.o: %.S Makefile
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel