[Xen-changelog] [linux-2.6.18-xen] Fix Makefile for newer versions of GNUmake.

[Xen patchbot-linux-2.6.18-xen <patchbot@xxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1305903218 -3600
# Node ID dcb88be878d48c60f887a51c8c7c661c6f9b191c
# Parent  211849d9d51115c7b4ed6e3010e10111b5d5db1d
Fix Makefile for newer versions of GNUmake.

Signed-off-by: Keir Fraser <keir@xxxxxxx>
---


diff -r 211849d9d511 -r dcb88be878d4 Makefile
--- a/Makefile  Fri May 20 08:51:36 2011 +0100
+++ b/Makefile  Fri May 20 15:53:38 2011 +0100
@@ -407,7 +407,11 @@
 include $(srctree)/arch/$(ARCH)/Makefile
 export KBUILD_DEFCONFIG
 
-config %config: scripts_basic outputmakefile FORCE
+config: scripts_basic outputmakefile FORCE
+       $(Q)mkdir -p include/linux include/config
+       $(Q)$(MAKE) $(build)=scripts/kconfig $@
+
+%config: scripts_basic outputmakefile FORCE
        $(Q)mkdir -p include/linux include/config
        $(Q)$(MAKE) $(build)=scripts/kconfig $@
 
@@ -1380,7 +1384,10 @@
        $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
 
 # Modules
-/ %/: prepare scripts FORCE
+/: prepare scripts FORCE
+       $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
+       $(build)=$(build-dir)
+%/: prepare scripts FORCE
        $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
        $(build)=$(build-dir)
 %.ko: prepare scripts FORCE
diff -r 211849d9d511 -r dcb88be878d4 scripts/mkmakefile
--- a/scripts/mkmakefile        Fri May 20 08:51:36 2011 +0100
+++ b/scripts/mkmakefile        Fri May 20 15:53:38 2011 +0100
@@ -31,6 +31,8 @@
 
 Makefile:;
 
-\$(filter-out all Makefile,\$(MAKECMDGOALS)) %/:
+\$(filter-out all Makefile,\$(MAKECMDGOALS)):
+       \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@
+%/:
        \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@
 EOF

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