make: Make *-dir-force-update depend on *-dir-find

Make the targets depend on the "-find" targets, so that if the
subtrees are cloned if they haven't been cloned already.

Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/tools/Makefile b/tools/Makefile
index 0c4e49c1d3851c06a8a2ce94305942a42706800f..b6476c909ec4285c656494b5ac5d74b28ddd89bb 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -134,7 +134,7 @@ qemu-xen-dir-find:
        fi
 
 .PHONY: qemu-xen-traditional-dir-force-update
-qemu-xen-traditional-dir-force-update:
+qemu-xen-traditional-dir-force-update: qemu-xen-traditional-dir-find
        set -ex; \
        if [ "$(QEMU_TRADITIONAL_REVISION)" ]; then \
                cd qemu-xen-traditional-dir-remote; \
@@ -164,7 +164,7 @@ subdir-clean-qemu-xen-traditional-dir:
        fi
 
 .PHONY: qemu-xen-dir-force-update
-qemu-xen-dir-force-update:
+qemu-xen-dir-force-update: qemu-xen-dir-find
        set -ex; \
        if [ "$(QEMU_UPSTREAM_REVISION)" ]; then \
                cd qemu-xen-dir-remote; \

diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
index 2c2ed34e2f52a659007ff2f94edad1fc3083c0e7..660bacbb730751a6f093afd758dd24ba9702b8a8 100644 (file)
--- a/tools/firmware/Makefile
+++ b/tools/firmware/Makefile
@@ -62,7 +62,7 @@ subdir-distclean-seabios-dir: .phony
        rm -rf seabios-dir seabios-dir-remote
 
 .PHONY: ovmf-dir-force-update
-ovmf-dir-force-update:
+ovmf-dir-force-update: ovmf-dir
        set -ex; \
        if [ "$(OVMF_UPSTREAM_REVISION)" ]; then \
                cd ovmf-dir-remote; \
@@ -76,7 +76,7 @@ subdir-clean-ovmf:
        fi
 
 .PHONY: seabios-dir-force-update
-seabios-dir-force-update:
+seabios-dir-force-update: seabios-dir
        set -ex; \
        if [ "$(SEABIOS_UPSTREAM_REVISION)" ]; then \
                cd seabios-dir-remote; \