(Note: Patch also attached because the inline version is certain to get line wrapped.)
Splitting of autoconf.h requires that split-include was built before,
and
needs to be-re-done when split-include changes. This dependency was
previously missing. Additionally, since autoconf.h is (suppoosed to
be)
generated as a side effect of executing config targets, include/linux
should be created prior to running the respective sub-make.
Signed-off-by: Jan Beulich <[EMAIL PROTECTED]>
--- /home/jbeulich/tmp/linux-2.6.13/Makefile 2005-08-29
01:41:01.000000000 +0200
+++ 2.6.13/Makefile 2005-08-29 09:50:38.000000000 +0200
@@ -385,6 +385,9 @@ RCS_TAR_IGNORE := --exclude SCCS --exclu
scripts_basic:
$(Q)$(MAKE) $(build)=scripts/basic
+# To avoid any implicit rule to kick in, define an empty command.
+scripts/basic/%: scripts_basic ;
+
.PHONY: outputmakefile
# outputmakefile generate a Makefile to be placed in output directory,
if
# using a seperate output directory. This allows convinient use
@@ -447,9 +450,8 @@ ifeq ($(config-targets),1)
include $(srctree)/arch/$(ARCH)/Makefile
export KBUILD_DEFCONFIG
-config: scripts_basic outputmakefile FORCE
- $(Q)$(MAKE) $(build)=scripts/kconfig $@
-%config: scripts_basic outputmakefile FORCE
+config %config: scripts_basic outputmakefile FORCE
+ $(Q)mkdir -p include/linux
$(Q)$(MAKE) $(build)=scripts/kconfig $@
else
@@ -815,7 +817,7 @@ include/asm:
# Split autoconf.h into include/linux/config/*
-include/config/MARKER: include/linux/autoconf.h
+include/config/MARKER: scripts/basic/split-include
include/linux/autoconf.h
@echo ' SPLIT include/linux/autoconf.h -> include/config/*'
@scripts/basic/split-include include/linux/autoconf.h
include/config
@touch $@
linux-2.6.13-split-include-dep.patch
Description: Binary data
