From c8c9bc1a1f663d76ef1fa85fc351b2cd6e876972 Mon Sep 17 00:00:00 2001
From: Albert Hopkins <marduk@python.net>
Date: Sat, 28 Feb 2015 22:30:01 +0000
Subject: [PATCH] Make the other image/ targets depend on $(RAW_IMAGE).

Instead of "image" so that if the raw image is built and up-to-date then it
need not be rebuilt to satisfy the other image targets.  This excludes the
stage4 "image" which of course is necessary to build the $(RAW_IMAGE)
target.
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index a138f8a..1f36f7c 100644
--- a/Makefile
+++ b/Makefile
@@ -287,14 +287,14 @@ endif
 	rm -f partitions device-map
 	mv $(RAW_IMAGE).tmp $(RAW_IMAGE)
 
-$(QCOW_IMAGE): image
+$(QCOW_IMAGE): $(RAW_IMAGE)
 	@scripts/echo Creating $(QCOW_IMAGE)
 	qemu-img convert -f raw -O qcow2 -c $(RAW_IMAGE) $(QCOW_IMAGE).tmp
 	mv $(QCOW_IMAGE).tmp $(QCOW_IMAGE)
 
 qcow: $(QCOW_IMAGE)
 
-$(XVA_IMAGE): image
+$(XVA_IMAGE): $(RAW_IMAGE)
 	@scripts/echo Creating $(XVA_IMAGE)
 	xva.py --disk=$(RAW_IMAGE) --is-hvm --memory=256 --vcpus=1 --name=$(APPLIANCE) \
 		--filename=$(XVA_IMAGE).tmp
@@ -303,7 +303,7 @@ $(XVA_IMAGE): image
 xva: $(XVA_IMAGE)
 
 
-$(VMDK_IMAGE): image
+$(VMDK_IMAGE): $(RAW_IMAGE)
 	@scripts/echo Creating $(VMDK_IMAGE)
 	qemu-img convert -f raw -O vmdk $(RAW_IMAGE) $(VMDK_IMAGE).tmp
 	mv $(VMDK_IMAGE).tmp $(VMDK_IMAGE)