From: Keir Fraser <keir@xen.org>
Date: Fri, 20 May 2011 14:53:38 +0000 (+0100)
Subject: Fix Makefile for newer versions of GNUmake.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=29457534278719d979933b8f624c49900b1e8472;p=legacy%2Flinux-2.6.18-xen.git

Fix Makefile for newer versions of GNUmake.

Signed-off-by: Keir Fraser <keir@xen.org>
---

diff --git a/Makefile b/Makefile
index 2ff33d3a..468727e5 100644
--- a/Makefile
+++ b/Makefile
@@ -407,7 +407,11 @@ ifeq ($(config-targets),1)
 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 @@ endif
 	$(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 --git a/scripts/mkmakefile b/scripts/mkmakefile
index 7f9d544f..63ab0430 100644
--- a/scripts/mkmakefile
+++ b/scripts/mkmakefile
@@ -31,6 +31,8 @@ all:
 
 Makefile:;
 
-\$(filter-out all Makefile,\$(MAKECMDGOALS)) %/:
+\$(filter-out all Makefile,\$(MAKECMDGOALS)):
+	\$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@
+%/:
 	\$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@
 EOF