lkml.org 
[lkml]   [2005]   [Sep]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 4/7] kbuild: fix split-include dependency
    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 <jbeulich@novell.com>
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

    ---

    Makefile | 10 ++++++----
    1 files changed, 6 insertions(+), 4 deletions(-)

    cd05e6bdc6001ac6e8ab13720693b7e1302d9848
    diff --git a/Makefile b/Makefile
    --- a/Makefile
    +++ b/Makefile
    @@ -382,6 +382,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
    @@ -444,9 +447,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
    @@ -854,7 +856,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 $@
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-09-10 22:37    [W:0.020 / U:30.040 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site