Re: Arch specific/multiple Configure.help files? [PATCH included]

[Giacomo Catenazzi <cate@math.ethz.ch>]

Johan Adolfsson wrote:
> 
> > This change is too big for 2.4 kernel.
> 
> It doesnt look that big to mee, so here it is for everyones consideration
> (the mailprogram probably screws up tabs etc. but you get the idea,
> I apologise if posting patches like this is the wrong way)
> 
> The normal user/developer shouldn't even notice the difference,
> the patch shouldn't break anything, just make it possible to
> use multiple help files.
> 
> linux/Makefile: (linenumber probably a bit off)
> @@ -40,6 +44,10 @@ MODFLAGS = -DMODULE
>  CFLAGS_KERNEL =
>  PERL = perl
> 
> +# Helpfiles used in the config system
> +# (merged to Documentation/Configure.help.generated)
> +HELPFILES       = arch/$(ARCH)/Configure.help Documentation/Configure.help
> +
>  export VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION KERNELRELEASE ARCH \
>   CONFIG_SHELL TOPDIR HPATH HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
>   CPP AR NM STRIP OBJCOPY OBJDUMP MAKE MAKEFILES GENKSYMS MODFLAGS PERL
> @@ -260,19 +270,22 @@ symlinks:
>   @if [ ! -d include/linux/modules ]; then \
>   mkdir include/linux/modules; \
>   fi
> +
> +helpfiles:
> + -cat $(HELPFILES) >Documentation/Configure.help.generated 2>/dev/null
> 
> -oldconfig: symlinks
> +oldconfig: symlinks helpfiles

No!
Documentation/Configure.help.generated: $(HELPFILES)
	-cat $(HELPFILES) >Documentation/Configure.help.generated
2>/dev/null

oldconfig: symlinks Documentation/Configure.help.generated
...

Really you should include the ARCH/COnfigure.help in
$(HELPFILES) only
if it exists (else make will complain)

>   $(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in
> 
> -xconfig: symlinks
> +xconfig: symlinks helpfiles
>   $(MAKE) -C scripts kconfig.tk
>   wish -f scripts/kconfig.tk
> 
> -menuconfig: include/linux/version.h symlinks
> +menuconfig: include/linux/version.h symlinks helpfiles
>   $(MAKE) -C scripts/lxdialog all
>   $(CONFIG_SHELL) scripts/Menuconfig arch/$(ARCH)/config.in
> 
> -config: symlinks
> +config: symlinks helpfiles
>   $(CONFIG_SHELL) scripts/Configure arch/$(ARCH)/config.in
> 

ditto.

>  include/config/MARKER: scripts/split-include include/linux/autoconf.h
> 
> RCS file: /n/cvsroot/os/linux/scripts/Configure,v
> retrieving revision 1.1.1.2
> diff -u -p -r1.1.1.2 Configure
> --- scripts/Configure 2001/01/10 13:28:58 1.1.1.2
> +++ scripts/Configure 2001/04/06 09:57:44

OK!