Makefile: Re-order the linux dependencies to pick up on config changes.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/Makefile b/Makefile
index 9f09e9860f0bce06852efc9f4cad069bbbbc7752..e9788e1b9382451fe9fa4f0b69e4c6f7a82c20a1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -85,8 +85,8 @@ linux-DISTRIB_TARGET=dist/common/vmlinuz
 
 NCPUS := $(shell grep processor /proc/cpuinfo | wc -l)
 
-.PHONY:        linux-dist-nodep
-linux-dist-nodep: linux-config
+.PHONY:        linux-kernel
+linux-kernel: linux-config
 ifeq ($(OLDSTYLE),1)
        $(MAKE) -j$$(($(NCPUS) * 2)) -C $(LINUX_SRC) O=$(LINUX_DST) vmlinuz
        $(INSTALL_DIR) dist/common/
@@ -98,7 +98,7 @@ else
 endif
 
 .PHONY: linux-dist
-linux-dist: linux-dist-nodep
+linux-dist: linux-kernel
 
 $(LINUX_DST)/usr/gen_init_cpio:
        $(MAKE) -C $(LINUX_SRC) O=$(LINUX_DST) usr
@@ -116,7 +116,7 @@ $(LINUX_DST)/.config: linux.config
        yes "" | $(MAKE) -C $(LINUX_SRC) O=$(LINUX_DST) oldconfig
 
 .PHONY:        linux-modules
-linux-modules: linux-config
+linux-modules: linux-config linux-kernel
        @mkdir -p $(LINUX_DST)/modulespace
        $(MAKE) -j$$(($(NCPUS) * 2)) -C $(LINUX_SRC) O=$(LINUX_DST) modules
        $(MAKE) -j$$(($(NCPUS) * 2)) -C $(LINUX_SRC) O=$(LINUX_DST) \
@@ -190,7 +190,7 @@ endif
 IOEMU_DIR = ioemu-remote
 
 .PHONY: xen-tools
-xen-tools:
+xen-tools: xen-hypervisor
 #      $(MAKE) -C xen dist-misc -j$$(($(NCPUS) * 2))
        if [ -e xen/tools/firmware/seabios-dir ]; then \
                $(MAKE) -C xen/tools/firmware/seabios-dir defconfig; \
@@ -229,7 +229,6 @@ xen-distclean: xen-clean
 #####################################################################
 
 root_image-DISTRIB_TARGET = dist/common/initramfs.cpio.gz
-DOM0_DEP_LIST = linux-modules
 
 
 .PHONY: root_image-dist-nodep
@@ -239,7 +238,7 @@ root_image-dist-nodep:  $(LINUX_SRC)/usr/gen_init_cpio
        $(INSTALL_DATA) root_image/dist/common/initramfs.cpio.gz dist/common/
 
 .PHONY: root_image-dist xen-dist linux-dist
-root_image-dist: $(DOM0_DEP_LIST)
+root_image-dist: linux-modules
        $(MAKE) root_image-dist-nodep
 
 .PHONY: root_image-clean